Ros-diffs

ros-diffs@reactos.org

81390 discussions

[peterw] 25378: - Remove the error check after calling system(), it causes a problem if the build fails.
by peterw＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: peterw Date: Mon Jan 8 16:00:17 2007 New Revision: 25378 URL: http://svn.reactos.org/svn/reactos?rev=25378&view=rev Log: - Remove the error check after calling system(), it causes a problem if the build fails. Modified: trunk/tools/RosBE/RosBE.nsi trunk/tools/RosBE/Tools/buildtime.c Modified: trunk/tools/RosBE/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE.nsi?rev=25378&r1… ============================================================================== --- trunk/tools/RosBE/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE.nsi Mon Jan 8 16:00:17 2007 @@ -18,7 +18,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "0.0.0.11" +VIAddVersionKey /LANG=1033 "FileVersion" "0.0.0.12" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" Modified: trunk/tools/RosBE/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/buildtime.c?rev=… ============================================================================== --- trunk/tools/RosBE/Tools/buildtime.c (original) +++ trunk/tools/RosBE/Tools/buildtime.c Mon Jan 8 16:00:17 2007 @@ -10,7 +10,6 @@ time_t StartTime, FinishTime; float TotalTime; int Hour, Minute, Second; - int Status; // // If nothing is on the command-line exit @@ -44,13 +43,7 @@ // // Run the program (Status is 1 on failure). // - Status = system(CommandLineBuffer); - if (Status) - { - printf("Unable to execute program. Exiting.\n"); - free(CommandLineBuffer); - return 1; - } + system(CommandLineBuffer); // // Grab the finishing timestamp.

1 0

[arty] 25377: Update address of hal before performing imports, add page.c
by arty＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: arty Date: Mon Jan 8 13:12:22 2007 New Revision: 25377 URL: http://svn.reactos.org/svn/reactos?rev=25377&view=rev Log: Update address of hal before performing imports, add page.c Modified: branches/powerpc/reactos/ntoskrnl/ke/freeldr.c branches/powerpc/reactos/ntoskrnl/ldr/loader.c branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild Modified: branches/powerpc/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/fre… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/freeldr.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/freeldr.c Mon Jan 8 13:12:22 2007 @@ -295,6 +295,11 @@ BootPath = LoaderBlock->LoadOptions; do {if (*BootPath == '/') *BootPath = ' ';} while (*BootPath++); } + +VOID +INIT_FUNCTION +NTAPI +LdrpSettleHal(PVOID NewHalBase); VOID FASTCALL @@ -467,18 +472,9 @@ (PVOID)KeLoaderModules[0].ModStart, &DriverSize); - // - // - // HACK HACK HACK WHEN WILL YOU PEOPLE FIX FREELDR?!?!?! - // FREELDR SENDS US AN ***INVALID*** HAL PE HEADER!!! - // WE READ IT IN LdrInitModuleManagement ABOVE!!! - // WE SET .SizeOfImage TO A *GARBAGE* VALUE!!! - // - // This dirty hack fixes it, and should make symbol lookup work too. - // - HalModuleObject.SizeOfImage = RtlImageNtHeader((PVOID)HalModuleObject. - DllBase)-> - OptionalHeader.SizeOfImage; +#ifdef _M_PPC + LdrpSettleHal((PVOID)DriverBase); +#endif /* Increase the last kernel address with the size of HAL */ MmFreeLdrLastKernelAddress += PAGE_ROUND_UP(DriverSize); Modified: branches/powerpc/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ldr/lo… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ldr/loader.c (original) +++ branches/powerpc/reactos/ntoskrnl/ldr/loader.c Mon Jan 8 13:12:22 2007 @@ -26,7 +26,7 @@ #endif /* __GNUC__ */ #endif -#if 0 +#if 1 #undef ps #define ps(args...) DPRINT1(args) #endif @@ -102,6 +102,14 @@ { /* Hook for KDB on initialization of the loader. */ KDB_LOADERINIT_HOOK(&NtoskrnlModuleObject, &HalModuleObject); +} + +VOID +INIT_FUNCTION +NTAPI +LdrpSettleHal (PVOID NewHalBase) +{ + HalModuleObject.DllBase = (PVOID) NewHalBase; } VOID @@ -994,9 +1002,9 @@ // Copy current section into current offset of virtual section if (Section->SizeOfRawData) { - // ps("PESectionHeaders[Idx].VirtualAddress (%X) + DriverBase %x\n", - // PESectionHeaders[Idx].VirtualAddress, PESectionHeaders[Idx].VirtualAddress + DriverBase); - memcpy(Section->VirtualAddress + (char*)DriverBase, + ps("PESectionHeaders[Idx].VirtualAddress (%X) + DriverBase %x\n", + PESectionHeaders[Idx].VirtualAddress, PESectionHeaders[Idx].VirtualAddress + DriverBase); + memmove(Section->VirtualAddress + (char*)DriverBase, Section->PointerToRawData + (char*)ModuleLoadBase, Section->Misc.VirtualSize > Section->SizeOfRawData ? Section->SizeOfRawData : Section->Misc.VirtualSize); } @@ -1010,6 +1018,17 @@ PENtHeaders->OptionalHeader.SectionAlignment); } + /* Perform relocation fixups */ + Status = LdrRelocateImageWithBias(DriverBase, 0, "", STATUS_SUCCESS, + STATUS_CONFLICTING_ADDRESSES, STATUS_INVALID_IMAGE_FORMAT); + + if (!NT_SUCCESS(Status)) + { + return NULL; + } + } + else if(ModuleLoadBase != (PVOID)PENtHeaders->OptionalHeader.ImageBase) + { /* Perform relocation fixups */ Status = LdrRelocateImageWithBias(DriverBase, 0, "", STATUS_SUCCESS, STATUS_CONFLICTING_ADDRESSES, STATUS_INVALID_IMAGE_FORMAT); @@ -1392,6 +1411,7 @@ DPRINT1("Failed to import %s from %wZ\n", pe_name->Name, &ImportedModule->FullDllName); return STATUS_UNSUCCESSFUL; } + DbgPrint("Function %08x: %s\n", *ImportAddressList, pe_name->Name); } ImportAddressList++; FunctionNameList++; Modified: branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ntoskr… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild Mon Jan 8 13:12:22 2007 @@ -253,6 +253,11 @@ <file>pfault.c</file> </directory> </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>page.c</file> + </directory> + </if> <file>anonmem.c</file> <file>aspace.c</file> <file>balance.c</file>

1 0

[arty] 25376: HAL display implementation based on openfirmware framebuffer.
by arty＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: arty Date: Mon Jan 8 12:30:17 2007 New Revision: 25376 URL: http://svn.reactos.org/svn/reactos?rev=25376&view=rev Log: HAL display implementation based on openfirmware framebuffer. Modified: branches/powerpc/reactos/hal/halppc/generic/display.c branches/powerpc/reactos/hal/halppc/generic/generic.rbuild Modified: branches/powerpc/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/display.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/display.c Mon Jan 8 12:30:17 2007 @@ -122,58 +122,15 @@ */ #include <hal.h> +#include <ppcboot.h> #define NDEBUG #include <debug.h> +#include "font.h" +boot_infos_t PpcEarlybootInfo; +BOOLEAN PPCGetEEBit(); #define SCREEN_SYNCHRONIZATION - -#define VGA_GRAPH_MEM 0xa0000 -#define VGA_CHAR_MEM 0xb8000 -#define VGA_END_MEM 0xbffff - -#define VGA_AC_INDEX 0x3c0 -#define VGA_AC_READ 0x3c1 -#define VGA_AC_WRITE 0x3c0 - -#define VGA_MISC_WRITE 0x3c2 - -#define VGA_SEQ_INDEX 0x3c4 -#define VGA_SEQ_DATA 0x3c5 - -#define VGA_DAC_MASK 0x3c6 -#define VGA_DAC_READ_INDEX 0x3c7 -#define VGA_DAC_WRITE_INDEX 0x3c8 -#define VGA_DAC_DATA 0x3c9 -#define VGA_FEATURE_READ 0x3ca -#define VGA_MISC_READ 0x3cc - -#define VGA_GC_INDEX 0x3ce -#define VGA_GC_DATA 0x3cf - -#define VGA_CRTC_INDEX 0x3d4 -#define VGA_CRTC_DATA 0x3d5 - -#define VGA_INSTAT_READ 0x3da - -#define VGA_SEQ_NUM_REGISTERS 5 -#define VGA_CRTC_NUM_REGISTERS 25 -#define VGA_GC_NUM_REGISTERS 9 -#define VGA_AC_NUM_REGISTERS 21 - -#define CRTC_COLUMNS 0x01 -#define CRTC_OVERFLOW 0x07 -#define CRTC_ROWS 0x12 -#define CRTC_SCANLINES 0x09 - -#define CRTC_CURHI 0x0e -#define CRTC_CURLO 0x0f - - -#define CHAR_ATTRIBUTE_BLACK 0x00 /* black on black */ -#define CHAR_ATTRIBUTE 0x17 /* grey on blue */ - -#define FONT_AMOUNT (8*8192) /* VARIABLES ****************************************************************/ @@ -184,34 +141,27 @@ static BOOLEAN DisplayInitialized = FALSE; static BOOLEAN HalOwnsDisplay = TRUE; - -static PUSHORT VideoBuffer = NULL; -static PUCHAR GraphVideoBuffer = NULL; - +static ULONG GraphVideoBuffer = 0; static PHAL_RESET_DISPLAY_PARAMETERS HalResetDisplayParameters = NULL; -static UCHAR SavedTextPalette[768]; -static UCHAR SavedTextMiscOutReg; -static UCHAR SavedTextCrtcReg[VGA_CRTC_NUM_REGISTERS]; -static UCHAR SavedTextAcReg[VGA_AC_NUM_REGISTERS]; -static UCHAR SavedTextGcReg[VGA_GC_NUM_REGISTERS]; -static UCHAR SavedTextSeqReg[VGA_SEQ_NUM_REGISTERS]; -static UCHAR SavedTextFont[2][FONT_AMOUNT]; -static BOOLEAN TextPaletteEnabled = FALSE; +extern UCHAR XboxFont8x16[]; +extern void SetPhys( ULONG Addr, ULONG Data ); +extern void SetPhysByte( ULONG Addr, ULONG Data ); /* PRIVATE FUNCTIONS *********************************************************/ VOID FASTCALL HalClearDisplay (UCHAR CharAttribute) { - WORD *ptr = (WORD*)VideoBuffer; ULONG i; - - for (i = 0; i < SizeX * SizeY; i++, ptr++) - *ptr = ((CharAttribute << 8) + ' '); - - CursorX = 0; - CursorY = 0; + ULONG deviceSize = + PpcEarlybootInfo.dispDeviceRowBytes * PpcEarlybootInfo.dispDeviceDepth * + PpcEarlybootInfo.dispDeviceRect[3]; + for(i = 0; i < deviceSize; i += sizeof(int) ) + SetPhys(GraphVideoBuffer + i, CharAttribute); + + CursorX = 0; + CursorY = 0; } @@ -220,352 +170,38 @@ VOID STATIC HalScrollDisplay (VOID) { - PUSHORT ptr; - int i; - - ptr = VideoBuffer + SizeX; - RtlMoveMemory(VideoBuffer, - ptr, - SizeX * (SizeY - 1) * 2); - - ptr = VideoBuffer + (SizeX * (SizeY - 1)); - for (i = 0; i < (int)SizeX; i++, ptr++) + PULONG Dest = (PULONG)GraphVideoBuffer, + Src = (PULONG)(GraphVideoBuffer + (16 * PpcEarlybootInfo.dispDeviceRowBytes)); + PULONG End = (PULONG) + GraphVideoBuffer + + (PpcEarlybootInfo.dispDeviceRowBytes * PpcEarlybootInfo.dispDeviceDepth * + PpcEarlybootInfo.dispDeviceRect[3]); + + for( ; Src < End; Src += sizeof(int) ) { - *ptr = (CHAR_ATTRIBUTE << 8) + ' '; + *Dest++ = *Src++; } } VOID STATIC FASTCALL HalPutCharacter (CHAR Character) { - PUSHORT ptr; - - ptr = VideoBuffer + ((CursorY * SizeX) + CursorX); - *ptr = (CHAR_ATTRIBUTE << 8) + Character; -} - -VOID STATIC -HalDisablePalette(VOID) -{ - (VOID)READ_PORT_UCHAR((PUCHAR)VGA_INSTAT_READ); - WRITE_PORT_UCHAR((PUCHAR)VGA_AC_INDEX, 0x20); - TextPaletteEnabled = FALSE; -} - -VOID STATIC -HalEnablePalette(VOID) -{ - (VOID)READ_PORT_UCHAR((PUCHAR)VGA_INSTAT_READ); - WRITE_PORT_UCHAR((PUCHAR)VGA_AC_INDEX, 0x00); - TextPaletteEnabled = TRUE; -} - -UCHAR STATIC FASTCALL -HalReadGc(ULONG Index) -{ - WRITE_PORT_UCHAR((PUCHAR)VGA_GC_INDEX, (UCHAR)Index); - return(READ_PORT_UCHAR((PUCHAR)VGA_GC_DATA)); -} - -VOID STATIC FASTCALL -HalWriteGc(ULONG Index, UCHAR Value) -{ - WRITE_PORT_UCHAR((PUCHAR)VGA_GC_INDEX, (UCHAR)Index); - WRITE_PORT_UCHAR((PUCHAR)VGA_GC_DATA, Value); -} - -UCHAR STATIC FASTCALL -HalReadSeq(ULONG Index) -{ - WRITE_PORT_UCHAR((PUCHAR)VGA_SEQ_INDEX, (UCHAR)Index); - return(READ_PORT_UCHAR((PUCHAR)VGA_SEQ_DATA)); -} - -VOID STATIC FASTCALL -HalWriteSeq(ULONG Index, UCHAR Value) -{ - WRITE_PORT_UCHAR((PUCHAR)VGA_SEQ_INDEX, (UCHAR)Index); - WRITE_PORT_UCHAR((PUCHAR)VGA_SEQ_DATA, Value); -} - -VOID STATIC FASTCALL -HalWriteAc(ULONG Index, UCHAR Value) -{ - if (TextPaletteEnabled) - { - Index &= ~0x20; - } - else - { - Index |= 0x20; - } - (VOID)READ_PORT_UCHAR((PUCHAR)VGA_INSTAT_READ); - WRITE_PORT_UCHAR((PUCHAR)VGA_AC_INDEX, (UCHAR)Index); - WRITE_PORT_UCHAR((PUCHAR)VGA_AC_WRITE, Value); -} - -UCHAR STATIC FASTCALL -HalReadAc(ULONG Index) -{ - if (TextPaletteEnabled) - { - Index &= ~0x20; - } - else - { - Index |= 0x20; - } - (VOID)READ_PORT_UCHAR((PUCHAR)VGA_INSTAT_READ); - WRITE_PORT_UCHAR((PUCHAR)VGA_AC_INDEX, (UCHAR)Index); - return(READ_PORT_UCHAR((PUCHAR)VGA_AC_READ)); -} - -VOID STATIC FASTCALL -HalWriteCrtc(ULONG Index, UCHAR Value) -{ - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, (UCHAR)Index); - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA, Value); -} - -UCHAR STATIC FASTCALL -HalReadCrtc(ULONG Index) -{ - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, (UCHAR)Index); - return(READ_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA)); -} - -VOID STATIC FASTCALL -HalResetSeq(BOOLEAN Start) -{ - if (Start) - { - HalWriteSeq(0x00, 0x01); - } - else - { - HalWriteSeq(0x00, 0x03); - } -} - -VOID STATIC FASTCALL -HalBlankScreen(BOOLEAN On) -{ - UCHAR Scrn; - - Scrn = HalReadSeq(0x01); - - if (On) - { - Scrn &= ~0x20; - } - else - { - Scrn |= 0x20; - } - - HalResetSeq(TRUE); - HalWriteSeq(0x01, Scrn); - HalResetSeq(FALSE); -} - -VOID STATIC -HalSaveFont(VOID) -{ - UCHAR Attr10; - UCHAR MiscOut, Gc4, Gc5, Gc6, Seq2, Seq4; - ULONG i; - - /* Check if we are already in graphics mode. */ - Attr10 = HalReadAc(0x10); - if (Attr10 & 0x01) - { - return; - } - - /* Save registers. */ - MiscOut = READ_PORT_UCHAR((PUCHAR)VGA_MISC_READ); - Gc4 = HalReadGc(0x04); - Gc5 = HalReadGc(0x05); - Gc6 = HalReadGc(0x06); - Seq2 = HalReadSeq(0x02); - Seq4 = HalReadSeq(0x04); - - /* Force colour mode. */ - WRITE_PORT_UCHAR((PUCHAR)VGA_MISC_WRITE, (UCHAR)(MiscOut | 0x01)); - - HalBlankScreen(FALSE); - - for (i = 0; i < 2; i++) - { - /* Save font 1 */ - HalWriteSeq(0x02, (UCHAR)(0x04 << i)); /* Write to plane 2 or 3 */ - HalWriteSeq(0x04, 0x06); /* Enable plane graphics. */ - HalWriteGc(0x04, (UCHAR)(0x02 + i)); /* Read plane 2 or 3 */ - HalWriteGc(0x05, 0x00); /* Write mode 0; read mode 0 */ - HalWriteGc(0x06, 0x05); /* Set graphics. */ - memcpy(SavedTextFont[i], GraphVideoBuffer, FONT_AMOUNT); - } - - /* Restore registers. */ - HalWriteAc(0x10, Attr10); - HalWriteSeq(0x02, Seq2); - HalWriteSeq(0x04, Seq4); - HalWriteGc(0x04, Gc4); - HalWriteGc(0x05, Gc5); - HalWriteGc(0x06, Gc6); - WRITE_PORT_UCHAR((PUCHAR)VGA_MISC_WRITE, MiscOut); - - HalBlankScreen(TRUE); -} - -VOID STATIC -HalSaveMode(VOID) -{ - ULONG i; - - SavedTextMiscOutReg = READ_PORT_UCHAR((PUCHAR)VGA_MISC_READ); - - for (i = 0; i < VGA_CRTC_NUM_REGISTERS; i++) - { - SavedTextCrtcReg[i] = HalReadCrtc(i); - } - - HalEnablePalette(); - for (i = 0; i < VGA_AC_NUM_REGISTERS; i++) - { - SavedTextAcReg[i] = HalReadAc(i); - } - HalDisablePalette(); - - for (i = 0; i < VGA_GC_NUM_REGISTERS; i++) - { - SavedTextGcReg[i] = HalReadGc(i); - } - - for (i = 0; i < VGA_SEQ_NUM_REGISTERS; i++) - { - SavedTextSeqReg[i] = HalReadSeq(i); - } -} - -VOID STATIC -HalDacDelay(VOID) -{ - (VOID)READ_PORT_UCHAR((PUCHAR)VGA_INSTAT_READ); - (VOID)READ_PORT_UCHAR((PUCHAR)VGA_INSTAT_READ); -} - -VOID STATIC -HalSavePalette(VOID) -{ - ULONG i; - WRITE_PORT_UCHAR((PUCHAR)VGA_DAC_MASK, 0xFF); - WRITE_PORT_UCHAR((PUCHAR)VGA_DAC_READ_INDEX, 0x00); - for (i = 0; i < 768; i++) - { - SavedTextPalette[i] = READ_PORT_UCHAR((PUCHAR)VGA_DAC_DATA); - HalDacDelay(); - } -} - -VOID STATIC -HalRestoreFont(VOID) -{ - UCHAR MiscOut, Attr10, Gc1, Gc3, Gc4, Gc5, Gc6, Gc8; - UCHAR Seq2, Seq4; - ULONG i; - - /* Save registers. */ - MiscOut = READ_PORT_UCHAR((PUCHAR)VGA_MISC_READ); - Attr10 = HalReadAc(0x10); - Gc1 = HalReadGc(0x01); - Gc3 = HalReadGc(0x03); - Gc4 = HalReadGc(0x04); - Gc5 = HalReadGc(0x05); - Gc6 = HalReadGc(0x06); - Gc8 = HalReadGc(0x08); - Seq2 = HalReadSeq(0x02); - Seq4 = HalReadSeq(0x04); - - /* Force into colour mode. */ - WRITE_PORT_UCHAR((PUCHAR)VGA_MISC_WRITE, (UCHAR)(MiscOut | 0x10)); - - HalBlankScreen(FALSE); - - HalWriteGc(0x03, 0x00); /* Don't rotate; write unmodified. */ - HalWriteGc(0x08, 0xFF); /* Write all bits. */ - HalWriteGc(0x01, 0x00); /* All planes from CPU. */ - - for (i = 0; i < 2; i++) - { - HalWriteSeq(0x02, (UCHAR)(0x04 << i)); /* Write to plane 2 or 3 */ - HalWriteSeq(0x04, 0x06); /* Enable plane graphics. */ - HalWriteGc(0x04, (UCHAR)(0x02 + i)); /* Read plane 2 or 3 */ - HalWriteGc(0x05, 0x00); /* Write mode 0; read mode 0. */ - HalWriteGc(0x06, 0x05); /* Set graphics. */ - memcpy(GraphVideoBuffer, SavedTextFont[i], FONT_AMOUNT); - } - - HalBlankScreen(TRUE); - - /* Restore registers. */ - WRITE_PORT_UCHAR((PUCHAR)VGA_MISC_WRITE, MiscOut); - HalWriteAc(0x10, Attr10); - HalWriteGc(0x01, Gc1); - HalWriteGc(0x03, Gc3); - HalWriteGc(0x04, Gc4); - HalWriteGc(0x05, Gc5); - HalWriteGc(0x06, Gc6); - HalWriteGc(0x08, Gc8); - HalWriteSeq(0x02, Seq2); - HalWriteSeq(0x04, Seq4); -} - -VOID STATIC -HalRestoreMode(VOID) -{ - ULONG i; - - WRITE_PORT_UCHAR((PUCHAR)VGA_MISC_WRITE, SavedTextMiscOutReg); - - for (i = 1; i < VGA_SEQ_NUM_REGISTERS; i++) - { - HalWriteSeq(i, SavedTextSeqReg[i]); - } - - /* Unlock CRTC registers 0-7 */ - HalWriteCrtc(17, (UCHAR)(SavedTextCrtcReg[17] & ~0x80)); - - for (i = 0; i < VGA_CRTC_NUM_REGISTERS; i++) - { - HalWriteCrtc(i, SavedTextCrtcReg[i]); - } - - for (i = 0; i < VGA_GC_NUM_REGISTERS; i++) - { - HalWriteGc(i, SavedTextGcReg[i]); - } - - HalEnablePalette(); - for (i = 0; i < VGA_AC_NUM_REGISTERS; i++) - { - HalWriteAc(i, SavedTextAcReg[i]); - } - HalDisablePalette(); -} - -VOID STATIC -HalRestorePalette(VOID) -{ - ULONG i; - WRITE_PORT_UCHAR((PUCHAR)VGA_DAC_MASK, 0xFF); - WRITE_PORT_UCHAR((PUCHAR)VGA_DAC_WRITE_INDEX, 0x00); - for (i = 0; i < 768; i++) - { - WRITE_PORT_UCHAR((PUCHAR)VGA_DAC_DATA, SavedTextPalette[i]); - HalDacDelay(); - } - HalDisablePalette(); + int i,j,k; + PCHAR Dest = (PCHAR) + (GraphVideoBuffer + + (16 * PpcEarlybootInfo.dispDeviceRowBytes * CursorY) + + ((PpcEarlybootInfo.dispDeviceDepth / 8) * CursorX)); + + for( i = 0; i < 16; i++ ) { + for( j = 0; j < 8; j++ ) { + for( k = 0; k < PpcEarlybootInfo.dispDeviceDepth / 8; k++ ) { + SetPhysByte + ((ULONG)(Dest + (j * PpcEarlybootInfo.dispDeviceDepth) + k), + ((1 << j) & (XboxFont8x16[(16 * Character) + i]) ? 0xff : 1)); + } + } + Dest += PpcEarlybootInfo.dispDeviceRowBytes; + } } /* PRIVATE FUNCTIONS ********************************************************/ @@ -578,55 +214,27 @@ * InitParameters = Parameters setup by the boot loader */ { - PHYSICAL_ADDRESS PhysBuffer; + __asm__("mr 20, %0\n\t" + "mr 21, %0\n\t" + "nop" : + : + "r" (DisplayInitialized), + "r" (&GraphVideoBuffer) : + "r20", "r21"); if (! DisplayInitialized) { - ULONG ScanLines; - ULONG Data; - - PhysBuffer.u.HighPart = 0; - PhysBuffer.u.LowPart = VGA_GRAPH_MEM; - GraphVideoBuffer = MmMapIoSpace(PhysBuffer, VGA_END_MEM - VGA_GRAPH_MEM + 1, MmNonCached); - if (NULL == GraphVideoBuffer) - { - return; - } - VideoBuffer = (PUSHORT) (GraphVideoBuffer + (VGA_CHAR_MEM - VGA_GRAPH_MEM)); + boot_infos_t *XBootInfo = (boot_infos_t *)LoaderBlock->ArchExtra; + GraphVideoBuffer = (ULONG)XBootInfo->dispDeviceBase; + memcpy(&PpcEarlybootInfo, XBootInfo, sizeof(*XBootInfo)); /* Set cursor position */ -// CursorX = LoaderBlock->cursorx; -// CursorY = LoaderBlock->cursory; CursorX = 0; CursorY = 0; - /* read screen size from the crtc */ - /* FIXME: screen size should be read from the boot parameters */ - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_COLUMNS); - SizeX = READ_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA) + 1; - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_ROWS); - SizeY = READ_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA); - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_OVERFLOW); - Data = READ_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA); - SizeY |= (((Data & 0x02) << 7) | ((Data & 0x40) << 3)); - SizeY++; - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_SCANLINES); - ScanLines = (READ_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA) & 0x1F) + 1; - SizeY = SizeY / ScanLines; - -#ifdef BOCHS_30ROWS - SizeY=30; -#endif - HalClearDisplay(CHAR_ATTRIBUTE_BLACK); + HalClearDisplay(1); DisplayInitialized = TRUE; - - /* - Save the VGA state at this point so we can restore it on a bugcheck. - */ - HalSavePalette(); - HalSaveMode(); - HalSaveFont(); } } @@ -645,14 +253,8 @@ if (HalOwnsDisplay == TRUE) return; - if (!HalResetDisplayParameters(SizeX, SizeY)) - { - HalRestoreMode(); - HalRestoreFont(); - HalRestorePalette(); - } HalOwnsDisplay = TRUE; - HalClearDisplay(CHAR_ATTRIBUTE); + HalClearDisplay(0); } @@ -681,12 +283,9 @@ */ { PCH pch; -#ifdef SCREEN_SYNCHRONIZATION - int offset; -#endif static KSPIN_LOCK Lock; KIRQL OldIrql; - ULONG Flags; + BOOLEAN InterruptsEnabled = PPCGetEEBit(); /* See comment at top of file */ if (! HalOwnsDisplay || ! DisplayInitialized) @@ -699,18 +298,7 @@ OldIrql = KfRaiseIrql(HIGH_LEVEL); KiAcquireSpinLock(&Lock); - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); - -#ifdef SCREEN_SYNCHRONIZATION - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_CURHI); - offset = READ_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA)<<8; - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_CURLO); - offset += READ_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA); - - CursorY = offset / SizeX; - CursorX = offset % SizeX; -#endif + _disable(); while (*pch != 0) { @@ -747,15 +335,8 @@ pch++; } -#ifdef SCREEN_SYNCHRONIZATION - offset = (CursorY * SizeX) + CursorX; - - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_CURLO); - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA, (UCHAR)(offset & 0xff)); - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_CURHI); - WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA, (UCHAR)((offset >> 8) & 0xff)); -#endif - Ki386RestoreFlags(Flags); + if(InterruptsEnabled) + _enable(); KiReleaseSpinLock(&Lock); KfLowerIrql(OldIrql); Modified: branches/powerpc/reactos/hal/halppc/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/generic.rbuild (original) +++ branches/powerpc/reactos/hal/halppc/generic/generic.rbuild Mon Jan 8 12:30:17 2007 @@ -6,17 +6,21 @@ <define name="_NTHAL_" /> <file>beep.c</file> <file>bus.c</file> + <file>display.c</file> <file>dma.c</file> <file>drive.c</file> <file>enum.c</file> <file>fmutex.c</file> + <file>font.c</file> <file>halinit.c</file> + <file>irql.c</file> <file>isa.c</file> <file>kdbg.c</file> <file>mca.c</file> <file>misc.c</file> <file>pci.c</file> <file>portio.c</file> + <file>processor.c</file> <file>reboot.c</file> <file>sysbus.c</file> <file>sysinfo.c</file>

1 0

[arty] 25375: Start of an implementation of page.c
by arty＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: arty Date: Mon Jan 8 12:28:39 2007 New Revision: 25375 URL: http://svn.reactos.org/svn/reactos?rev=25375&view=rev Log: Start of an implementation of page.c Added: branches/powerpc/reactos/ntoskrnl/mm/powerpc/ branches/powerpc/reactos/ntoskrnl/mm/powerpc/page.c Added: branches/powerpc/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/mm/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/mm/powerpc/page.c (added) +++ branches/powerpc/reactos/ntoskrnl/mm/powerpc/page.c Mon Jan 8 12:28:39 2007 @@ -1,0 +1,1325 @@ +/* $Id: page.c 23907 2006-09-04 05:52:23Z arty $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/mm/i386/page.c + * PURPOSE: Low level memory managment manipulation + * + * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * Revised for PowerPC by arty + */ + +/* INCLUDES ***************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) +#pragma alloc_text(INIT, MiInitPageDirectoryMap) +#endif + +/* GLOBALS *****************************************************************/ + +#define PAGETABLE_MAP (0xc0000000) +#define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) + +#define PA_PRESENT (1ll<<63) +#define PA_USER (1ll<<62) +#define PA_ACCESSED 0x200 +#define PA_DIRTY 0x100 +#define PA_WT 0x20 +#define PA_CD 0x10 +#define PA_READWRITE 3 + +#define HYPERSPACE (0xc0400000) +#define IS_HYPERSPACE(v) (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < HYPERSPACE + 0x400000)) + +#define PP_FROM_PROTECT(X) \ + ((X & (PAGE_NOACCESS | PAGE_GUARD)) ? 0 : \ + (X & PAGE_IS_WRITABLE) ? 2 : \ + (X & (PAGE_IS_READABLE | PAGE_IS_EXECUTABLE)) ? 3 : 0) + +ULONG MmGlobalKernelPageDirectory[1024]; + +#define PTE_TO_PFN(X) ((X) >> PAGE_SHIFT) +#define PFN_TO_PTE(X) ((X) << PAGE_SHIFT) + +#if defined(__GNUC__) +#define PTE_TO_PAGE(X) ((LARGE_INTEGER)(LONGLONG)(PAGE_MASK(X))) +#else +__inline LARGE_INTEGER PTE_TO_PAGE(ULONG npage) +{ + LARGE_INTEGER dummy; + dummy.QuadPart = (LONGLONG)(PAGE_MASK(npage)); + return dummy; +} +#endif + +/* FUNCTIONS ***************************************************************/ + +BOOLEAN MmUnmapPageTable(PULONG Pt); + +VOID +STDCALL +MiFlushTlbIpiRoutine(PVOID Address) +{ + if (Address == (PVOID)0xffffffff) + { + KeFlushCurrentTb(); + } + else if (Address == (PVOID)0xfffffffe) + { + FLUSH_TLB; + } + else + { + FLUSH_TLB_ONE(Address); + } +} + +VOID +MiFlushTlb(PULONG Pt, PVOID Address) +{ +#ifdef CONFIG_SMP + if (Pt) + { + MmUnmapPageTable(Pt); + } + if (KeNumberProcessors>1) + { + KeIpiGenericCall(MiFlushTlbIpiRoutine, Address); + } + else + { + MiFlushTlbIpiRoutine(Address); + } +#else + if ((Pt && MmUnmapPageTable(Pt)) || Address >= MmSystemRangeStart) + { + FLUSH_TLB_ONE(Address); + } +#endif +} + + + +PULONG +MmGetPageDirectory(VOID) +{ + unsigned int page_dir=0; + return((PULONG)page_dir); +} + +static ULONGLONG +ProtectToPTE(ULONG flProtect) +{ + return PP_FROM_PROTECT(flProtect); +} + +#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) + +#define ADDR_TO_PDE(v) (PULONG)(PAGEDIRECTORY_MAP + \ + ((((ULONG)(v)) / (1024 * 1024))&(~0x3))) +#define ADDR_TO_PTE(v) (PULONG)(PAGETABLE_MAP + ((((ULONG)(v) / 1024))&(~0x3))) + +#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) + +#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) + +NTSTATUS +STDCALL +MmCopyMmInfo(PEPROCESS Src, + PEPROCESS Dest, + PPHYSICAL_ADDRESS DirectoryTableBase) +{ + NTSTATUS Status; + ULONG i, j; + PFN_TYPE Pfn[7]; + ULONG Count; + PULONG PageDirectory; + + DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", Src, Dest); + + Count = 2; + + for (i = 0; i < Count; i++) + { + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn[i]); + if (!NT_SUCCESS(Status)) + { + for (j = 0; j < i; j++) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]); + } + return Status; + } + } + + PageDirectory = MmCreateHyperspaceMapping(Pfn[0]); + + memcpy(PageDirectory + ADDR_TO_PDE_OFFSET(MmSystemRangeStart), + MmGlobalKernelPageDirectory + ADDR_TO_PDE_OFFSET(MmSystemRangeStart), + (1024 - ADDR_TO_PDE_OFFSET(MmSystemRangeStart)) * sizeof(ULONG)); + + DPRINT("Addr %x\n",ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)); + PageDirectory[ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)] = PFN_TO_PTE(Pfn[0]) | PA_PRESENT | PA_READWRITE; + PageDirectory[ADDR_TO_PDE_OFFSET(HYPERSPACE)] = PFN_TO_PTE(Pfn[1]) | PA_PRESENT | PA_READWRITE; + + MmDeleteHyperspaceMapping(PageDirectory); + + DirectoryTableBase->QuadPart = PFN_TO_PTE(Pfn[0]); + DPRINT("Finished MmCopyMmInfo(): %I64x\n", DirectoryTableBase->QuadPart); + return(STATUS_SUCCESS); +} + +VOID +NTAPI +MmDeletePageTable(PEPROCESS Process, PVOID Address) +{ + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + + if (Process != NULL && Process != CurrentProcess) + { + KeAttachProcess(&Process->Pcb); + } + + *(ADDR_TO_PDE(Address)) = 0; + MiFlushTlb(ADDR_TO_PDE(Address), ADDR_TO_PTE(Address)); + + if (Address >= MmSystemRangeStart) + { + KEBUGCHECK(0); + } + if (Process != NULL && Process != CurrentProcess) + { + KeDetachProcess(); + } +} + +VOID +NTAPI +MmFreePageTable(PEPROCESS Process, PVOID Address) +{ + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + ULONG i; + PFN_TYPE Pfn; + + DPRINT("ProcessId %d, Address %x\n", Process->UniqueProcessId, Address); + if (Process != NULL && Process != CurrentProcess) + { + KeAttachProcess(&Process->Pcb); + } + + PULONG PageTable; + PageTable = (PULONG)PAGE_ROUND_DOWN((PVOID)ADDR_TO_PTE(Address)); + for (i = 0; i < 1024; i++) + { + if (PageTable[i] != 0) + { + DbgPrint("Page table entry not clear at %x/%x (is %x)\n", + ((ULONG)Address / (4*1024*1024)), i, PageTable[i]); + KEBUGCHECK(0); + } + } + Pfn = PTE_TO_PFN(*(ADDR_TO_PDE(Address))); + *(ADDR_TO_PDE(Address)) = 0; + MiFlushTlb(ADDR_TO_PDE(Address), ADDR_TO_PTE(Address)); + + if (Address >= MmSystemRangeStart) + { + // MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0; + KEBUGCHECK(0); + } + else + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); + } + if (Process != NULL && Process != CurrentProcess) + { + KeDetachProcess(); + } +} + +static PULONG +MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) +{ + ULONG PdeOffset = ADDR_TO_PDE_OFFSET(Address); + NTSTATUS Status; + PFN_TYPE Pfn; + ULONG Entry; + PULONG Pt, PageDir; + + if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) + { + PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); + if (PageDir == NULL) + { + KEBUGCHECK(0); + } + if (0 == InterlockedCompareExchangeUL(&PageDir[PdeOffset], 0, 0)) + { + if (Create == FALSE) + { + MmDeleteHyperspaceMapping(PageDir); + return NULL; + } + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn); + if (!NT_SUCCESS(Status) || Pfn == 0) + { + KEBUGCHECK(0); + } + Entry = InterlockedCompareExchangeUL(&PageDir[PdeOffset], PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); + if (Entry != 0) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); + Pfn = PTE_TO_PFN(Entry); + } + } + else + { + Pfn = PTE_TO_PFN(PageDir[PdeOffset]); + } + MmDeleteHyperspaceMapping(PageDir); + Pt = MmCreateHyperspaceMapping(Pfn); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + return Pt + ADDR_TO_PTE_OFFSET(Address); + } + PageDir = ADDR_TO_PDE(Address); + if (0 == InterlockedCompareExchangeUL(PageDir, 0, 0)) + { + if (Address >= MmSystemRangeStart) + { + if (0 == InterlockedCompareExchangeUL(&MmGlobalKernelPageDirectory[PdeOffset], 0, 0)) + { + if (Create == FALSE) + { + return NULL; + } + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn); + if (!NT_SUCCESS(Status) || Pfn == 0) + { + KEBUGCHECK(0); + } + Entry = PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE; + if(0 != InterlockedCompareExchangeUL(&MmGlobalKernelPageDirectory[PdeOffset], Entry, 0)) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); + } + } + (void)InterlockedExchangeUL(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); + } + else + { + if (Create == FALSE) + { + return NULL; + } + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn); + if (!NT_SUCCESS(Status) || Pfn == 0) + { + KEBUGCHECK(0); + } + Entry = InterlockedCompareExchangeUL(PageDir, PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); + if (Entry != 0) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); + } + } + } + return (PULONG)ADDR_TO_PTE(Address); +} + +BOOLEAN MmUnmapPageTable(PULONG Pt) +{ + if (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024) + { + return TRUE; + } + + if (Pt) + { + MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pt)); + } + return FALSE; +} + +static ULONG MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address) +{ + ULONG Pte; + PULONG Pt; + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + if (Pt) + { + Pte = *Pt; + MmUnmapPageTable(Pt); + return Pte; + } + return 0; +} + +PFN_TYPE +NTAPI +MmGetPfnForProcess(PEPROCESS Process, + PVOID Address) +{ + ULONG Entry; + Entry = MmGetPageEntryForProcess(Process, Address); + return(PTE_TO_PFN(Entry)); +} + +VOID +NTAPI +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) +/* + * FUNCTION: Delete a virtual mapping + */ +{ + BOOLEAN WasValid; + ULONG Pte; + PULONG Pt; + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + /* + * Atomically disable the present bit and get the old value. + */ + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_PRESENT, Pte)); + + MiFlushTlb(Pt, Address); + WasValid = (PAGE_MASK(Pte) != 0); + if (!WasValid) + { + KEBUGCHECK(0); + } + + /* + * Return some information to the caller + */ + if (WasDirty != NULL) + { + *WasDirty = Pte & PA_DIRTY; + } + if (Page != NULL) + { + *Page = PTE_TO_PFN(Pte); + } +} + +VOID +NTAPI +MmRawDeleteVirtualMapping(PVOID Address) +{ + PULONG Pt; + + Pt = MmGetPageTableForProcess(NULL, Address, FALSE); + if (Pt && *Pt) + { + /* + * Set the entry to zero + */ + (void)InterlockedExchangeUL(Pt, 0); + MiFlushTlb(Pt, Address); + } +} + +VOID +NTAPI +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, + BOOLEAN* WasDirty, PPFN_TYPE Page) +/* + * FUNCTION: Delete a virtual mapping + */ +{ + BOOLEAN WasValid = FALSE; + PFN_TYPE Pfn; + + DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", + Process, Address, FreePage, WasDirty, Page); + + ULONG Pte; + PULONG Pt; + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + + if (Pt == NULL) + { + if (WasDirty != NULL) + { + *WasDirty = FALSE; + } + if (Page != NULL) + { + *Page = 0; + } + return; + } + + /* + * Atomically set the entry to zero and get the old value. + */ + Pte = InterlockedExchangeUL(Pt, 0); + + MiFlushTlb(Pt, Address); + + WasValid = (PAGE_MASK(Pte) != 0); + if (WasValid) + { + Pfn = PTE_TO_PFN(Pte); + MmMarkPageUnmapped(Pfn); + } + else + { + Pfn = 0; + } + + if (FreePage && WasValid) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); + } + + /* + * Return some information to the caller + */ + if (WasDirty != NULL) + { + *WasDirty = Pte & PA_DIRTY ? TRUE : FALSE; + } + if (Page != NULL) + { + *Page = Pfn; + } + /* + * Decrement the reference count for this page table. + */ + if (Process != NULL && WasValid && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && + Address < MmSystemRangeStart) + { + PUSHORT Ptrc; + ULONG Idx; + + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; + Idx = ADDR_TO_PAGE_TABLE(Address); + + Ptrc[Idx]--; + if (Ptrc[Idx] == 0) + { + MmFreePageTable(Process, Address); + } + } +} + +VOID +NTAPI +MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, + SWAPENTRY* SwapEntry) +/* + * FUNCTION: Delete a virtual mapping + */ +{ + ULONG Pte; + PULONG Pt; + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + + if (Pt == NULL) + { + *SwapEntry = 0; + return; + } + + /* + * Atomically set the entry to zero and get the old value. + */ + Pte = InterlockedExchangeUL(Pt, 0); + + MiFlushTlb(Pt, Address); + + /* + * Decrement the reference count for this page table. + */ + if (Process != NULL && Pte && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && + Address < MmSystemRangeStart) + { + PUSHORT Ptrc; + + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; + + Ptrc[ADDR_TO_PAGE_TABLE(Address)]--; + if (Ptrc[ADDR_TO_PAGE_TABLE(Address)] == 0) + { + MmFreePageTable(Process, Address); + } + } + + /* + * Return some information to the caller + */ + *SwapEntry = Pte >> 1; +} + +BOOLEAN +Mmi386MakeKernelPageTableGlobal(PVOID PAddress) +{ + PULONG Pt, Pde; + Pde = ADDR_TO_PDE(PAddress); + if (*Pde == 0) + { + Pt = MmGetPageTableForProcess(NULL, PAddress, FALSE); +#if 0 + /* Non existing mappings are not cached within the tlb. We must not invalidate this entry */ + FLASH_TLB_ONE(PAddress); +#endif + if (Pt != NULL) + { + return TRUE; + } + } + return(FALSE); +} + +BOOLEAN +NTAPI +MmIsDirtyPage(PEPROCESS Process, PVOID Address) +{ + return MmGetPageEntryForProcess(Process, Address) & PA_DIRTY ? TRUE : FALSE; +} + +BOOLEAN +NTAPI +MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) +{ + PULONG Pt; + ULONG Pte; + + if (Address < MmSystemRangeStart && Process == NULL) + { + DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n"); + KEBUGCHECK(0); + } + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_ACCESSED, Pte)); + + if (Pte & PA_ACCESSED) + { + MiFlushTlb(Pt, Address); + return TRUE; + } + else + { + MmUnmapPageTable(Pt); + return FALSE; + } +} + +VOID +NTAPI +MmSetCleanPage(PEPROCESS Process, PVOID Address) +{ + PULONG Pt; + ULONG Pte; + + if (Address < MmSystemRangeStart && Process == NULL) + { + DPRINT1("MmSetCleanPage is called for user space without a process.\n"); + KEBUGCHECK(0); + } + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + + if (Pt == NULL) + { + KEBUGCHECK(0); + } + + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_DIRTY, Pte)); + + if (Pte & PA_DIRTY) + { + MiFlushTlb(Pt, Address); + } + else + { + MmUnmapPageTable(Pt); + } +} + +VOID +NTAPI +MmSetDirtyPage(PEPROCESS Process, PVOID Address) +{ + PULONG Pt; + ULONG Pte; + + if (Address < MmSystemRangeStart && Process == NULL) + { + DPRINT1("MmSetDirtyPage is called for user space without a process.\n"); + KEBUGCHECK(0); + } + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangeUL(Pt, Pte | PA_DIRTY, Pte)); + if (!(Pte & PA_DIRTY)) + { + MiFlushTlb(Pt, Address); + } + else + { + MmUnmapPageTable(Pt); + } +} + +VOID +NTAPI +MmEnableVirtualMapping(PEPROCESS Process, PVOID Address) +{ + PULONG Pt; + ULONG Pte; + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangeUL(Pt, Pte | PA_PRESENT, Pte)); + if (!(Pte & PA_PRESENT)) + { + MiFlushTlb(Pt, Address); + } + else + { + MmUnmapPageTable(Pt); + } +} + +BOOLEAN +NTAPI +MmIsPagePresent(PEPROCESS Process, PVOID Address) +{ + return MmGetPageEntryForProcess(Process, Address) & PA_PRESENT ? TRUE : FALSE; +} + +BOOLEAN +NTAPI +MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) +{ + ULONG Entry; + Entry = MmGetPageEntryForProcess(Process, Address); + return !(Entry & PA_PRESENT) && Entry != 0 ? TRUE : FALSE; +} + +NTSTATUS +NTAPI +MmCreateVirtualMappingForKernel(PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + ULONG Attributes; + ULONG i; + PVOID Addr; + ULONG PdeOffset, oldPdeOffset; + BOOLEAN NoExecute = FALSE; + PULONG Pt; + ULONG Pte; + + DPRINT("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n", + Address, flProtect, Pages, PageCount); + + if (Address < MmSystemRangeStart) + { + DPRINT1("MmCreateVirtualMappingForKernel is called for user space\n"); + KEBUGCHECK(0); + } + + Attributes = ProtectToPTE(flProtect); + if (Attributes & 0x80000000) + { + NoExecute = TRUE; + } + Attributes &= 0xfff; + + Addr = Address; + + oldPdeOffset = ADDR_TO_PDE_OFFSET(Addr); + Pt = MmGetPageTableForProcess(NULL, Addr, TRUE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + Pt--; + + for (i = 0; i < PageCount; i++, Addr = (PVOID)((ULONG_PTR)Addr + PAGE_SIZE)) + { + if (!(Attributes & PA_PRESENT) && Pages[i] != 0) + { + DPRINT1("Setting physical address but not allowing access at address " + "0x%.8X with attributes %x/%x.\n", + Addr, Attributes, flProtect); + KEBUGCHECK(0); + } + + PdeOffset = ADDR_TO_PDE_OFFSET(Addr); + if (oldPdeOffset != PdeOffset) + { + Pt = MmGetPageTableForProcess(NULL, Addr, TRUE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + } + else + { + Pt++; + } + oldPdeOffset = PdeOffset; + + Pte = *Pt; + if (Pte != 0) + { + KEBUGCHECK(0); + } + (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + } + + return(STATUS_SUCCESS); +} + +NTSTATUS +NTAPI +MmCreatePageFileMapping(PEPROCESS Process, + PVOID Address, + SWAPENTRY SwapEntry) +{ + PULONG Pt; + ULONG Pte; + + if (Process == NULL && Address < MmSystemRangeStart) + { + DPRINT1("No process\n"); + KEBUGCHECK(0); + } + if (Process != NULL && Address >= MmSystemRangeStart) + { + DPRINT1("Setting kernel address with process context\n"); + KEBUGCHECK(0); + } + if (SwapEntry & (1 << 31)) + { + KEBUGCHECK(0); + } + + Pt = MmGetPageTableForProcess(Process, Address, TRUE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + Pte = *Pt; + if (PAGE_MASK((Pte)) != 0) + { + MmMarkPageUnmapped(PTE_TO_PFN((Pte))); + } + (void)InterlockedExchangeUL(Pt, SwapEntry << 1); + if (Pte != 0) + { + MiFlushTlb(Pt, Address); + } + else + { + MmUnmapPageTable(Pt); + } + + if (Process != NULL && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && + Address < MmSystemRangeStart) + { + PUSHORT Ptrc; + ULONG Idx; + + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; + Idx = ADDR_TO_PAGE_TABLE(Address); + Ptrc[Idx]++; + } + return(STATUS_SUCCESS); +} + + +NTSTATUS +NTAPI +MmCreateVirtualMappingUnsafe(PEPROCESS Process, + PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + ULONG Attributes; + PVOID Addr; + ULONG i; + ULONG oldPdeOffset, PdeOffset; + BOOLEAN NoExecute = FALSE; + PULONG Pt = NULL; + ULONG Pte; + + DPRINT("MmCreateVirtualMappingUnsafe(%x, %x, %x, %x (%x), %d)\n", + Process, Address, flProtect, Pages, *Pages, PageCount); + + if (Process == NULL) + { + if (Address < MmSystemRangeStart) + { + DPRINT1("No process\n"); + KEBUGCHECK(0); + } + if (PageCount > 0x10000 || + (ULONG_PTR) Address / PAGE_SIZE + PageCount > 0x100000) + { + DPRINT1("Page count to large\n"); + KEBUGCHECK(0); + } + } + else + { + if (Address >= MmSystemRangeStart) + { + DPRINT1("Setting kernel address with process context\n"); + KEBUGCHECK(0); + } + if (PageCount > (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE || + (ULONG_PTR) Address / PAGE_SIZE + PageCount > + (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE) + { + DPRINT1("Page Count to large\n"); + KEBUGCHECK(0); + } + } + + Attributes = ProtectToPTE(flProtect); + if (Attributes & 0x80000000) + { + NoExecute = TRUE; + } + Attributes &= 0xfff; + if (Address >= MmSystemRangeStart) + { + Attributes &= ~PA_USER; + } + else + { + Attributes |= PA_USER; + } + + Addr = Address; + + oldPdeOffset = ADDR_TO_PDE_OFFSET(Addr) + 1; + for (i = 0; i < PageCount; i++, Addr = (PVOID)((ULONG_PTR)Addr + PAGE_SIZE)) + { + if (!(Attributes & PA_PRESENT) && Pages[i] != 0) + { + DPRINT1("Setting physical address but not allowing access at address " + "0x%.8X with attributes %x/%x.\n", + Addr, Attributes, flProtect); + KEBUGCHECK(0); + } + PdeOffset = ADDR_TO_PDE_OFFSET(Addr); + if (oldPdeOffset != PdeOffset) + { + MmUnmapPageTable(Pt); + Pt = MmGetPageTableForProcess(Process, Addr, TRUE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + } + else + { + Pt++; + } + oldPdeOffset = PdeOffset; + + Pte = *Pt; + MmMarkPageMapped(Pages[i]); + if (PAGE_MASK((Pte)) != 0 && !((Pte) & PA_PRESENT)) + { + KEBUGCHECK(0); + } + if (PAGE_MASK((Pte)) != 0) + { + MmMarkPageUnmapped(PTE_TO_PFN((Pte))); + } + (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + if (Address < MmSystemRangeStart && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && + Attributes & PA_PRESENT) + { + PUSHORT Ptrc; + + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; + + Ptrc[ADDR_TO_PAGE_TABLE(Addr)]++; + } + if (Pte != 0) + { + if (Address > MmSystemRangeStart || + (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024)) + { + MiFlushTlb(Pt, Address); + } + } + } + if (Addr > Address) + { + MmUnmapPageTable(Pt); + } + return(STATUS_SUCCESS); +} + +NTSTATUS +NTAPI +MmCreateVirtualMapping(PEPROCESS Process, + PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + ULONG i; + + for (i = 0; i < PageCount; i++) + { + if (!MmIsUsablePage(Pages[i])) + { + DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); + KEBUGCHECK(0); + } + } + + return(MmCreateVirtualMappingUnsafe(Process, + Address, + flProtect, + Pages, + PageCount)); +} + +ULONG +NTAPI +MmGetPageProtect(PEPROCESS Process, PVOID Address) +{ + ULONG Entry; + ULONG Protect; + + Entry = MmGetPageEntryForProcess(Process, Address); + + if (!(Entry & PA_PRESENT)) + { + Protect = PAGE_NOACCESS; + } + else + { + if (Entry & PA_READWRITE) + { + Protect = PAGE_READWRITE; + } + else + { + Protect = PAGE_EXECUTE_READ; + } + if (Entry & PA_CD) + { + Protect |= PAGE_NOCACHE; + } + if (Entry & PA_WT) + { + Protect |= PAGE_WRITETHROUGH; + } + if (!(Entry & PA_USER)) + { + Protect |= PAGE_SYSTEM; + } + + } + return(Protect); +} + +VOID +NTAPI +MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) +{ + ULONG Attributes = 0; + + DPRINT("MmSetPageProtect(Process %x Address %x flProtect %x)\n", + Process, Address, flProtect); + + Attributes = ProtectToPTE(flProtect); + +#if 0 + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + InterlockedExchange((PLONG)Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); + MiFlushTlb(Pt, Address); +#endif +} + +/* + * @implemented + */ +PHYSICAL_ADDRESS STDCALL +MmGetPhysicalAddress(PVOID vaddr) +/* + * FUNCTION: Returns the physical address corresponding to a virtual address + */ +{ + PHYSICAL_ADDRESS p; + ULONG Pte; + + DPRINT("MmGetPhysicalAddress(vaddr %x)\n", vaddr); + Pte = MmGetPageEntryForProcess(NULL, vaddr); + if (Pte != 0 && Pte & PA_PRESENT) + { + p.QuadPart = PAGE_MASK(Pte); + p.u.LowPart |= (ULONG_PTR)vaddr & (PAGE_SIZE - 1); + } + else + { + p.QuadPart = 0; + } + return p; +} + +PVOID +NTAPI +MmCreateHyperspaceMapping(PFN_TYPE Page) +{ + PVOID Address; + ULONG i; + ULONG Entry; + PULONG Pte; + Entry = PFN_TO_PTE(Page) | PA_PRESENT | PA_READWRITE; + Pte = ADDR_TO_PTE(HYPERSPACE) + Page % 1024; + if (Page & 1024) + { + for (i = Page % 1024; i < 1024; i++, Pte++) + { + if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) + { + break; + } + } + if (i >= 1024) + { + Pte = ADDR_TO_PTE(HYPERSPACE); + for (i = 0; i < Page % 1024; i++, Pte++) + { + if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) + { + break; + } + } + if (i >= Page % 1024) + { + KEBUGCHECK(0); + } + } + } + else + { + for (i = Page % 1024; (LONG)i >= 0; i--, Pte--) + { + if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) + { + break; + } + } + if ((LONG)i < 0) + { + Pte = ADDR_TO_PTE(HYPERSPACE) + 1023; + for (i = 1023; i > Page % 1024; i--, Pte--) + { + if (0 == InterlockedCompareExchange((PLONG)Pte, (LONG)Entry, 0)) + { + break; + } + } + if (i <= Page % 1024) + { + KEBUGCHECK(0); + } + } + } + Address = (PVOID)((ULONG_PTR)HYPERSPACE + i * PAGE_SIZE); + FLUSH_TLB_ONE(Address); + return Address; +} + +PFN_TYPE +NTAPI +MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) +{ + PFN_TYPE Pfn; + ASSERT (IS_HYPERSPACE(Address)); + ULONG Entry; + Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE); + Pfn = PTE_TO_PFN(Entry); + FLUSH_TLB_ONE(Address); + return Pfn; +} + +PFN_TYPE +NTAPI +MmDeleteHyperspaceMapping(PVOID Address) +{ + PFN_TYPE Pfn; + ASSERT (IS_HYPERSPACE(Address)); + ULONG Entry; + Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), 0); + Pfn = PTE_TO_PFN(Entry); + FLUSH_TLB_ONE(Address); + return Pfn; +} + +VOID +NTAPI +MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) +{ + ULONG StartOffset, EndOffset, Offset; + PULONG Pde; + + if (Address < MmSystemRangeStart) + { + KEBUGCHECK(0); + } + StartOffset = ADDR_TO_PDE_OFFSET(Address); + EndOffset = ADDR_TO_PDE_OFFSET((PVOID)((ULONG_PTR)Address + Size)); + + if (Process != NULL && Process != PsGetCurrentProcess()) + { + Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.u.LowPart)); + } + else + { + Pde = (PULONG)PAGEDIRECTORY_MAP; + } + for (Offset = StartOffset; Offset <= EndOffset; Offset++) + { + if (Offset != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)) + { + (void)InterlockedCompareExchangeUL(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); + } + } + if (Pde != (PULONG)PAGEDIRECTORY_MAP) + { + MmDeleteHyperspaceMapping(Pde); + } +} + +VOID +INIT_FUNCTION +NTAPI +MmInitGlobalKernelPageDirectory(VOID) +{ + ULONG i; + PULONG CurrentPageDirectory = (PULONG)PAGEDIRECTORY_MAP; + + DPRINT("MmInitGlobalKernelPageDirectory()\n"); + + for (i = ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i < 1024; i++) + { + if (i != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) && + i != ADDR_TO_PDE_OFFSET(HYPERSPACE) && + 0 == MmGlobalKernelPageDirectory[i] && 0 != CurrentPageDirectory[i]) + { + MmGlobalKernelPageDirectory[i] = CurrentPageDirectory[i]; + } + } +} + +ULONG +NTAPI +MiGetUserPageDirectoryCount(VOID) +{ + return ADDR_TO_PDE_OFFSET(MmSystemRangeStart); +} + +VOID +INIT_FUNCTION +NTAPI +MiInitPageDirectoryMap(VOID) +{ + MEMORY_AREA* kernel_map_desc = NULL; + MEMORY_AREA* hyperspace_desc = NULL; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + PVOID BaseAddress; + NTSTATUS Status; + + DPRINT("MiInitPageDirectoryMap()\n"); + + BoundaryAddressMultiple.QuadPart = 0; + BaseAddress = (PVOID)PAGETABLE_MAP; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM, + &BaseAddress, + 0x400000, + PAGE_READWRITE, + &kernel_map_desc, + TRUE, + 0, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } + BaseAddress = (PVOID)HYPERSPACE; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM, + &BaseAddress, + 0x400000, + PAGE_READWRITE, + &hyperspace_desc, + TRUE, + 0, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } +} + +/* EOF */

1 0

[arty] 25374: Add needed reloc types.
by arty＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: arty Date: Mon Jan 8 12:27:30 2007 New Revision: 25374 URL: http://svn.reactos.org/svn/reactos?rev=25374&view=rev Log: Add needed reloc types. Modified: branches/powerpc/reactos/lib/rtl/image.c Modified: branches/powerpc/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/rtl/image.c… ============================================================================== --- branches/powerpc/reactos/lib/rtl/image.c (original) +++ branches/powerpc/reactos/lib/rtl/image.c Mon Jan 8 12:27:30 2007 @@ -164,13 +164,22 @@ USHORT Type; USHORT i; PUSHORT ShortPtr; + ULONG Addend; PULONG LongPtr; + + DbgPrint("Relocating %08x-%08x (With delta %08x)\n", + Address, Address + 0x1000, (ULONG)Delta); for (i = 0; i < Count; i++) { Offset = *TypeOffset & 0xFFF; Type = *TypeOffset >> 12; ShortPtr = (PUSHORT)(RVA(Address, Offset)); + + DbgPrint("Correcting (%04x) %08x at %08x\n", + Type, + *((PULONG)RVA(Address,Offset)), + ShortPtr); /* * Don't relocate within the relocation section itself. @@ -203,6 +212,11 @@ break; case IMAGE_REL_BASED_HIGHADJ: + Addend = (((ULONG)*ShortPtr) << 16) + (ULONG)Delta; + if(Addend & 0x8000) Addend += 0x8000; + *ShortPtr = Addend >> 16; + break; + case IMAGE_REL_BASED_MIPS_JMPADDR: default: DPRINT1("Unknown/unsupported fixup type %hu.\n", Type); @@ -256,6 +270,12 @@ RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)BaseAddress + RelocationDDir->VirtualAddress); RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size); + DbgPrint("Relocating a module from %08x to %08x (relocs at %08x to %08x)\n", + NtHeaders->OptionalHeader.ImageBase, + BaseAddress, + RelocationDir, + RelocationEnd); + while (RelocationDir < RelocationEnd && RelocationDir->SizeOfBlock > 0) { @@ -263,6 +283,8 @@ Address = (ULONG_PTR)RVA(BaseAddress, RelocationDir->VirtualAddress); TypeOffset = (PUSHORT)(RelocationDir + 1); + DbgPrint("Performing %d relocs from %08x to %08x\n", + Count, Address, Address + 0x1000); RelocationDir = LdrProcessRelocationBlockLongLong(Address, Count, TypeOffset,

1 0

[peterw] 25373: - Fix some annoying warnings in wrc. - Fixed a warning in winebuild.
by peterw＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: peterw Date: Mon Jan 8 11:48:28 2007 New Revision: 25373 URL: http://svn.reactos.org/svn/reactos?rev=25373&view=rev Log: - Fix some annoying warnings in wrc. - Fixed a warning in winebuild. Modified: trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/wrc/dumpres.c trunk/reactos/tools/wrc/newstruc.c Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… ============================================================================== --- trunk/reactos/tools/winebuild/build.h (original) +++ trunk/reactos/tools/winebuild/build.h Mon Jan 8 11:48:28 2007 @@ -220,6 +220,8 @@ extern int parse_spec_file( FILE *file, DLLSPEC *spec ); extern int parse_def_file( FILE *file, DLLSPEC *spec ); +extern int mkstemps(char *template, int suffix_len); + /* global variables */ extern int current_line; Modified: trunk/reactos/tools/wrc/dumpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/dumpres.c?rev=25… ============================================================================== --- trunk/reactos/tools/wrc/dumpres.c (original) +++ trunk/reactos/tools/wrc/dumpres.c Mon Jan 8 11:48:28 2007 @@ -203,12 +203,12 @@ printf("LANGUAGE <not set>\n"); if(l->version) - printf("VERSION %08lx\n", *(l->version)); + printf("VERSION %08x\n", *(l->version)); else printf("VERSION <not set>\n"); if(l->characts) - printf("CHARACTERISTICS %08lx\n", *(l->characts)); + printf("CHARACTERISTICS %08x\n", *(l->characts)); else printf("CHARACTERISTICS <not set>\n"); } @@ -537,16 +537,16 @@ { assert(ctrl->style != NULL); assert(ctrl->style->and_mask == 0); - printf("\tStyle: %08lx\n", ctrl->style->or_mask); + printf("\tStyle: %08x\n", ctrl->style->or_mask); } if(ctrl->gotexstyle) { assert(ctrl->exstyle != NULL); assert(ctrl->exstyle->and_mask == 0); - printf("\tExStyle: %08lx\n", ctrl->exstyle->or_mask); + printf("\tExStyle: %08x\n", ctrl->exstyle->or_mask); } if(ctrl->gothelpid) - printf("\tHelpid: %ld\n", ctrl->helpid); + printf("\tHelpid: %u\n", ctrl->helpid); if(ctrl->extra) { printf("\t"); @@ -577,14 +577,14 @@ { assert(dlg->style != NULL); assert(dlg->style->and_mask == 0); - printf("Style: %08lx\n", dlg->style->or_mask); + printf("Style: %08x\n", dlg->style->or_mask); } if(dlg->gotexstyle) { assert(dlg->exstyle != NULL); assert(dlg->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlg->exstyle->or_mask); + printf("ExStyle: %08x\n", dlg->exstyle->or_mask); } printf("Menu: %s\n", get_nameid_str(dlg->menu)); printf("Class: %s\n", get_nameid_str(dlg->dlgclass)); @@ -627,16 +627,16 @@ { assert(dlgex->style != NULL); assert(dlgex->style->and_mask == 0); - printf("Style: %08lx\n", dlgex->style->or_mask); + printf("Style: %08x\n", dlgex->style->or_mask); } if(dlgex->gotexstyle) { assert(dlgex->exstyle != NULL); assert(dlgex->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlgex->exstyle->or_mask); + printf("ExStyle: %08x\n", dlgex->exstyle->or_mask); } if(dlgex->gothelpid) - printf("Helpid: %ld\n", dlgex->helpid); + printf("Helpid: %u\n", dlgex->helpid); printf("Menu: %s\n", get_nameid_str(dlgex->menu)); printf("Class: %s\n", get_nameid_str(dlgex->dlgclass)); printf("Title: "); print_string(dlgex->title); printf("\n"); @@ -683,7 +683,7 @@ if(item->name) { print_string(item->name); - printf(", %d, %08lx", item->id, item->state); + printf(", %d, %08x", item->id, item->state); } else printf("SEPARATOR"); @@ -732,9 +732,9 @@ if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%u", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); printf("\n"); @@ -749,9 +749,9 @@ if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%u", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); } Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=2… ============================================================================== --- trunk/reactos/tools/wrc/newstruc.c (original) +++ trunk/reactos/tools/wrc/newstruc.c Mon Jan 8 11:48:28 2007 @@ -328,7 +328,7 @@ else { fprintf(stderr, "bisizel %d bosizel %d b4sizel %d\n", bisizel, bosizel, b4sizel); - yyerror("Invalid bitmap format, bih->biSize = %ld", bih->biSize); + yyerror("Invalid bitmap format, bih->biSize = %u", bih->biSize); } switch(type) @@ -1045,7 +1045,7 @@ for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) { if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + yyerror("Messagetable's data for block %d, ID 0x%08x is outside of defined data", (int)i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1053,7 +1053,7 @@ int n; if(mep->length & 1) - yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + yyerror("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]); @@ -1098,7 +1098,7 @@ mep->flags = BYTESWAP_WORD(mep->flags); if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + yyerror("Messagetable's data for block %d, ID 0x%08x is outside of defined data", (int)i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1106,7 +1106,7 @@ int n; if(mep->length & 1) - yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + yyerror("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]);

1 0

[ion] 25372: - Fix ObReferenceObjectByName to do proper name validation checks. - Fix ObReferenceObjectByName to call ObpCheckObjectReference before allowing the caller to obtain the reference. - Rename ObFindObject to ObpLookupObjectName and shuffle parameters around and add some placeholder code that resets the object pointer of the lookup context. - Modify ObpChargeQuotaForObject to also return if this is a new object. - Modify ObpDecrementHandleCount to detect when objects with a handle data
by ion＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: ion Date: Mon Jan 8 11:03:47 2007 New Revision: 25372 URL: http://svn.reactos.org/svn/reactos?rev=25372&view=rev Log: - Fix ObReferenceObjectByName to do proper name validation checks. - Fix ObReferenceObjectByName to call ObpCheckObjectReference before allowing the caller to obtain the reference. - Rename ObFindObject to ObpLookupObjectName and shuffle parameters around and add some placeholder code that resets the object pointer of the lookup context. - Modify ObpChargeQuotaForObject to also return if this is a new object. - Modify ObpDecrementHandleCount to detect when objects with a handle database are being used. Also protect close callout with checks. Protect ObpCloseHAndleTableEntry's callouts with checks as well. - Update logic of ObpIncrementHandleCount and ObpIncrementUnnamedHandleCount to handle currently exclusive objects as well as new handles with OBJ_EXCLUSIVE. Also detect objects that require handle databases and protect callouts. - Support CreatorInfo and the TypeList in ObpIncrementHandleCount. Also update the TotalNumberOfHandles in the object type properly. - Fixup object type lock usage in these routines. - Do proper invalid attributes check in ObOpenObjectByName, and also use a buffer from the pool instead of the stack. - Make ObInsertObject detect invalid object insertions and change some parameter names and checks. - Add stub code to validate the access mask in ObInsertObject. Proper initailize some lookup variables before starting lookup. - Add detection for symbolic link inserts which require some handling code later on. - Free the create information at the right moment isntead of too late. - Add some missing Ob functions, flags and types to the NDK. Fix OBJECT_DIRECTORY structure to use EX_PUSH_LOCK for locks, not ERESOURCE. Modified: trunk/reactos/include/ndk/iotypes.h trunk/reactos/include/ndk/obtypes.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h (original) +++ trunk/reactos/include/ndk/iotypes.h Mon Jan 8 11:03:47 2007 @@ -23,9 +23,7 @@ // Dependencies // #include <umtypes.h> -#if !defined(_NTIFS_) -typedef PVOID PFS_FILTER_CALLBACKS; -#endif +#include <ifssupp.h> // // I/O Completion Access Rights Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Mon Jan 8 11:03:47 2007 @@ -23,16 +23,14 @@ // Dependencies // #include <umtypes.h> - -// -// If the IFS wasn't included, define this here -// -#ifndef EX_PUSH_LOCK -#define EX_PUSH_LOCK ULONG_PTR -#endif +#ifndef NTOS_MODE_USER +#include <extypes.h> +#endif + +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 #ifdef NTOS_MODE_USER - // // Definitions for Object Creation // @@ -86,6 +84,7 @@ #define OB_FLAG_PERMANENT 0x10 #define OB_FLAG_SECURITY 0x20 #define OB_FLAG_SINGLE_PROCESS 0x40 +#define OB_FLAG_DEFER_DELETE 0x80 #define OBJECT_TO_OBJECT_HEADER(o) \ CONTAINING_RECORD((o), OBJECT_HEADER, Body) @@ -106,6 +105,11 @@ ((POBJECT_HEADER_CREATOR_INFO)(!((h)->Flags & \ OB_FLAG_CREATOR_INFO) ? NULL: ((PCHAR)(h) - \ sizeof(OBJECT_HEADER_CREATOR_INFO)))) + +#define OBJECT_HEADER_TO_EXCLUSIVE_PROCESS(h) \ + ((!((h)->Flags & OB_FLAG_EXCLUSIVE)) ? \ + NULL: (((POBJECT_HEADER_QUOTA_INFO)((PCHAR)(h) - \ + (h)->QuotaInfoOffset))->ExclusiveProcess)) // // Reasons for Open Callback @@ -359,8 +363,8 @@ struct _OBJECT_DIRECTORY_ENTRY *HashBuckets[NUMBER_HASH_BUCKETS]; #if (NTDDI_VERSION < NTDDI_WINXP) ERESOURCE Lock; -#elif (NTDDI_VERSION >= NTDDI_WINXP) - ERESOURCE Lock; // FIXME: HACKHACK, SHOULD BE EX_PUSH_LOCK +#else + EX_PUSH_LOCK Lock; #endif #if (NTDDI_VERSION < NTDDI_WINXP) BOOLEAN CurrentEntryValid; Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Mon Jan 8 11:03:47 2007 @@ -81,6 +81,18 @@ } OBP_CLOSE_HANDLE_CONTEXT, *POBP_CLOSE_HANDLE_CONTEXT; // +// Private Temporary Buffer for Lookup Routines +// +#define TAG_OB_TEMP_STORAGE TAG('O', 'b', 'S', 't') +typedef struct _OB_TEMP_BUFFER +{ + ACCESS_STATE LocalAccessState; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; + OBP_LOOKUP_CONTEXT LookupContext; + AUX_DATA AuxData; +} OB_TEMP_BUFFER, *POB_TEMP_BUFFER; + +// // Directory Namespace Functions // BOOLEAN @@ -152,18 +164,18 @@ // NTSTATUS NTAPI -ObFindObject( +ObpLookupObjectName( IN HANDLE RootHandle, IN PUNICODE_STRING ObjectName, IN ULONG Attributes, - IN KPROCESSOR_MODE PreviousMode, - IN PVOID *ReturnedObject, IN POBJECT_TYPE ObjectType, - IN POBP_LOOKUP_CONTEXT Context, + IN KPROCESSOR_MODE AccessMode, + IN OUT PVOID ParseContext, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN PVOID InsertObject, IN PACCESS_STATE AccessState, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN PVOID ParseContext, - IN PVOID Insert + IN POBP_LOOKUP_CONTEXT LookupContext, + OUT PVOID *FoundObject ); // @@ -268,6 +280,12 @@ ); VOID +FASTCALL +ObfDereferenceDeviceMap( + IN PVOID DeviceMap +); + +VOID NTAPI ObInheritDeviceMap( IN PEPROCESS Parent, @@ -314,14 +332,50 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); +// +// Object Security Routines +// BOOLEAN NTAPI ObCheckObjectAccess( IN PVOID Object, IN OUT PACCESS_STATE AccessState, - IN BOOLEAN Unknown, + IN BOOLEAN LockHeld, IN KPROCESSOR_MODE AccessMode, OUT PNTSTATUS ReturnedStatus +); + +BOOLEAN +NTAPI +ObCheckCreateObjectAccess( + IN PVOID Object, + IN ACCESS_MASK CreateAccess, + IN PACCESS_STATE AccessState, + IN PUNICODE_STRING ComponentName, + IN BOOLEAN LockHeld, + IN KPROCESSOR_MODE AccessMode, + OUT PNTSTATUS AccessStatus +); + +BOOLEAN +NTAPI +ObpCheckTraverseAccess( + IN PVOID Object, + IN ACCESS_MASK TraverseAccess, + IN PACCESS_STATE AccessState OPTIONAL, + IN BOOLEAN LockHeld, + IN KPROCESSOR_MODE AccessMode, + OUT PNTSTATUS AccessStatus +); + +BOOLEAN +NTAPI +ObpCheckObjectReference( + IN PVOID Object, + IN OUT PACCESS_STATE AccessState, + IN BOOLEAN LockHeld, + IN KPROCESSOR_MODE AccessMode, + OUT PNTSTATUS AccessStatus ); // Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Jan 8 11:03:47 2007 @@ -24,7 +24,8 @@ NTSTATUS NTAPI ObpChargeQuotaForObject(IN POBJECT_HEADER ObjectHeader, - IN POBJECT_TYPE ObjectType) + IN POBJECT_TYPE ObjectType, + OUT PBOOLEAN NewObject) { POBJECT_HEADER_QUOTA_INFO ObjectQuota; ULONG PagedPoolCharge, NonPagedPoolCharge; @@ -32,10 +33,14 @@ /* Get quota information */ ObjectQuota = OBJECT_HEADER_TO_QUOTA_INFO(ObjectHeader); + *NewObject = FALSE; /* Check if this is a new object */ if (ObjectHeader->Flags & OB_FLAG_CREATE_INFO) { + /* Set the flag */ + *NewObject = TRUE; + /* Remove the flag */ ObjectHeader->Flags &= ~ OB_FLAG_CREATE_INFO; if (ObjectQuota) @@ -95,6 +100,7 @@ LONG SystemHandleCount, ProcessHandleCount; LONG NewCount; POBJECT_HEADER_CREATOR_INFO CreatorInfo; + KIRQL CalloutIrql; /* Get the object type and header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); @@ -109,7 +115,7 @@ /* Lock the object type */ ObpEnterObjectTypeMutex(ObjectType); - /* FIXME: The process handle count should be in the Handle DB. Investigate */ + /* Set default counts */ SystemHandleCount = ObjectHeader->HandleCount; ProcessHandleCount = 0; @@ -129,6 +135,13 @@ } } + /* Is the object type keeping track of handles? */ + if (ObjectType->TypeInfo.MaintainHandleCount) + { + /* FIXME */ + DPRINT("Handle Database not yet implemented\n"); + } + /* Release the lock */ ObpLeaveObjectTypeMutex(ObjectType); @@ -136,11 +149,13 @@ if (ObjectType->TypeInfo.CloseProcedure) { /* Call it */ + ObpCalloutStart(&CalloutIrql); ObjectType->TypeInfo.CloseProcedure(Process, ObjectBody, GrantedAccess, ProcessHandleCount, SystemHandleCount); + ObpCalloutEnd(CalloutIrql, "Close", ObjectType, ObjectBody); } /* Check if we should delete the object */ @@ -193,6 +208,7 @@ POBJECT_TYPE ObjectType; POBJECT_HEADER ObjectHeader; ACCESS_MASK GrantedAccess; + KIRQL CalloutIrql; PAGED_CODE(); /* Get the object data */ @@ -212,15 +228,20 @@ if (ObjectType->TypeInfo.OkayToCloseProcedure) { /* Call it and check if it's not letting us close it */ + ObpCalloutStart(&CalloutIrql); if (!ObjectType->TypeInfo.OkayToCloseProcedure(PsGetCurrentProcess(), Body, Handle, AccessMode)) { /* Fail */ + ObpCalloutEnd(CalloutIrql, "NtClose", ObjectType, Body); ExUnlockHandleTableEntry(HandleTable, HandleEntry); return STATUS_HANDLE_NOT_CLOSABLE; } + + /* Success, validate callout retrn */ + ObpCalloutEnd(CalloutIrql, "NtClose", ObjectType, Body); } /* The callback allowed us to close it, but does the handle itself? */ @@ -241,7 +262,7 @@ } else { - /* Return the error isntead */ + /* Return the error instead */ return STATUS_HANDLE_NOT_CLOSABLE; } } @@ -258,9 +279,6 @@ ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); /* Dereference the object as well */ - ASSERT(ObjectHeader->Type); - ASSERT(ObjectHeader->PointerCount != 0xCCCCCCCC); - ObDereferenceObject(Body); /* Return to caller */ @@ -315,6 +333,10 @@ POBJECT_TYPE ObjectType; ULONG ProcessHandleCount; NTSTATUS Status; + PEPROCESS ExclusiveProcess; + BOOLEAN Exclusive = FALSE, NewObject; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; + KIRQL CalloutIrql; /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -331,8 +353,59 @@ ObpEnterObjectTypeMutex(ObjectType); /* Charge quota and remove the creator info flag */ - Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType); + Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType, &NewObject); if (!NT_SUCCESS(Status)) return Status; + + /* Check if the open is exclusive */ + if (HandleAttributes & OBJ_EXCLUSIVE) + { + /* Check if the object allows this, or if the inherit flag was given */ + if ((HandleAttributes & OBJ_INHERIT) || + !(ObjectHeader->Flags & OB_FLAG_EXCLUSIVE)) + { + /* Incorrect attempt */ + DPRINT1("Failing here\n"); + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Check if we have access to it */ + ExclusiveProcess = OBJECT_HEADER_TO_EXCLUSIVE_PROCESS(ObjectHeader); + if ((!(ExclusiveProcess) && (ObjectHeader->HandleCount)) || + ((ExclusiveProcess) && (ExclusiveProcess != PsGetCurrentProcess()))) + { + /* This isn't the right process */ + Status = STATUS_ACCESS_DENIED; + goto Quickie; + } + + /* Now you got exclusive access */ + Exclusive = TRUE; + } + else if ((ObjectHeader->Flags & OB_FLAG_EXCLUSIVE) && + (OBJECT_HEADER_TO_EXCLUSIVE_PROCESS(ObjectHeader))) + { + /* Caller didn't want exclusive access, but the object is exclusive */ + Status = STATUS_ACCESS_DENIED; + goto Quickie; + } + + /* + * Check if this is an object that went from 0 handles back to existence, + * but doesn't have an open procedure, only a close procedure. This means + * that it will never realize that the object is back alive, so we must + * fail the request. + */ + if (!(ObjectHeader->HandleCount) && + !(NewObject) && + (ObjectType->TypeInfo.MaintainHandleCount) && + !(ObjectType->TypeInfo.OpenProcedure) && + (ObjectType->TypeInfo.CloseProcedure)) + { + /* Fail */ + Status = STATUS_UNSUCCESSFUL; + goto Quickie; + } /* Check if we're opening an existing handle */ if (OpenReason == ObOpenHandle) @@ -345,7 +418,7 @@ &Status)) { /* Access was denied, so fail */ - return Status; + goto Quickie; } } else if (OpenReason == ObCreateHandle) @@ -365,30 +438,82 @@ RtlMapGenericMask(&AccessState->RemainingDesiredAccess, &ObjectType->TypeInfo.GenericMapping); } + + /* Check if the caller is trying to access system security */ + if (AccessState->RemainingDesiredAccess & ACCESS_SYSTEM_SECURITY) + { + /* FIXME: TODO */ + DPRINT1("ACCESS_SYSTEM_SECURITY not validated!\n"); + } + } + + /* Check if this is an exclusive handle */ + if (Exclusive) + { + /* Save the owner process */ + OBJECT_HEADER_TO_QUOTA_INFO(ObjectHeader)->ExclusiveProcess = Process; } /* Increase the handle count */ InterlockedIncrement(&ObjectHeader->HandleCount); + ProcessHandleCount = 0; + + /* Check if we have a handle database */ + if (ObjectType->TypeInfo.MaintainHandleCount) + { + /* FIXME: TODO */ + DPRINT("Handle DB not yet supported\n"); + } /* Release the lock */ ObpLeaveObjectTypeMutex(ObjectType); - /* FIXME: Use the Handle Database */ - ProcessHandleCount = 0; - /* Check if we have an open procedure */ + Status = STATUS_SUCCESS; if (ObjectType->TypeInfo.OpenProcedure) { /* Call it */ - ObjectType->TypeInfo.OpenProcedure(OpenReason, - Process, - Object, - AccessState->PreviouslyGrantedAccess, - ProcessHandleCount); + ObpCalloutStart(&CalloutIrql); + Status = ObjectType->TypeInfo.OpenProcedure(OpenReason, + Process, + Object, + AccessState->PreviouslyGrantedAccess, + ProcessHandleCount); + ObpCalloutEnd(CalloutIrql, "Open", ObjectType, Object); + + /* Check if the open procedure failed */ + if (!NT_SUCCESS(Status)) + { + /* FIXME: This should never happen for now */ + DPRINT1("Unhandled case\n"); + KEBUGCHECK(0); + return Status; + } + } + + /* Check if we have creator info */ + CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(ObjectHeader); + if (CreatorInfo) + { + /* We do, acquire the lock */ + ObpEnterObjectTypeMutex(ObjectType); + + /* Insert us on the list */ + InsertTailList(&ObjectType->TypeList, &CreatorInfo->TypeList); + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); } /* Increase total number of handles */ InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfHandles); + if (ObjectType->TotalNumberOfHandles > ObjectType->HighWaterNumberOfHandles) + { + /* Fixup count */ + ObjectType->HighWaterNumberOfHandles = ObjectType->TotalNumberOfHandles; + } + + /* Trace call and return */ OBTRACE(OB_HANDLE_DEBUG, "%s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", __FUNCTION__, @@ -396,7 +521,12 @@ OpenReason, ObjectHeader->HandleCount, ObjectHeader->PointerCount); - return STATUS_SUCCESS; + return Status; + +Quickie: + /* Release lock and return */ + ObpLeaveObjectTypeMutex(ObjectType); + return Status; } /*++ @@ -439,6 +569,10 @@ POBJECT_TYPE ObjectType; ULONG ProcessHandleCount; NTSTATUS Status; + PEPROCESS ExclusiveProcess; + BOOLEAN Exclusive = FALSE, NewObject; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; + KIRQL CalloutIrql; /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -454,8 +588,59 @@ ObpEnterObjectTypeMutex(ObjectType); /* Charge quota and remove the creator info flag */ - Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType); + Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType, &NewObject); if (!NT_SUCCESS(Status)) return Status; + + /* Check if the open is exclusive */ + if (HandleAttributes & OBJ_EXCLUSIVE) + { + /* Check if the object allows this, or if the inherit flag was given */ + if ((HandleAttributes & OBJ_INHERIT) || + !(ObjectHeader->Flags & OB_FLAG_EXCLUSIVE)) + { + /* Incorrect attempt */ + DPRINT1("failing here\n"); + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Check if we have access to it */ + ExclusiveProcess = OBJECT_HEADER_TO_EXCLUSIVE_PROCESS(ObjectHeader); + if ((!(ExclusiveProcess) && (ObjectHeader->HandleCount)) || + ((ExclusiveProcess) && (ExclusiveProcess != PsGetCurrentProcess()))) + { + /* This isn't the right process */ + Status = STATUS_ACCESS_DENIED; + goto Quickie; + } + + /* Now you got exclusive access */ + Exclusive = TRUE; + } + else if ((ObjectHeader->Flags & OB_FLAG_EXCLUSIVE) && + (OBJECT_HEADER_TO_EXCLUSIVE_PROCESS(ObjectHeader))) + { + /* Caller didn't want exclusive access, but the object is exclusive */ + Status = STATUS_ACCESS_DENIED; + goto Quickie; + } + + /* + * Check if this is an object that went from 0 handles back to existence, + * but doesn't have an open procedure, only a close procedure. This means + * that it will never realize that the object is back alive, so we must + * fail the request. + */ + if (!(ObjectHeader->HandleCount) && + !(NewObject) && + (ObjectType->TypeInfo.MaintainHandleCount) && + !(ObjectType->TypeInfo.OpenProcedure) && + (ObjectType->TypeInfo.CloseProcedure)) + { + /* Fail */ + Status = STATUS_UNSUCCESSFUL; + goto Quickie; + } /* Convert MAXIMUM_ALLOWED to GENERIC_ALL */ if (*DesiredAccess & MAXIMUM_ALLOWED) @@ -473,35 +658,85 @@ &ObjectType->TypeInfo.GenericMapping); } + /* Check if this is an exclusive handle */ + if (Exclusive) + { + /* Save the owner process */ + OBJECT_HEADER_TO_QUOTA_INFO(ObjectHeader)->ExclusiveProcess = Process; + } + /* Increase the handle count */ InterlockedIncrement(&ObjectHeader->HandleCount); - - /* Release the object type */ + ProcessHandleCount = 0; + + /* Check if we have a handle database */ + if (ObjectType->TypeInfo.MaintainHandleCount) + { + /* FIXME: TODO */ + DPRINT("Handle DB not yet supported\n"); + } + + /* Release the lock */ ObpLeaveObjectTypeMutex(ObjectType); - /* FIXME: Use the Handle Database */ - ProcessHandleCount = 0; - /* Check if we have an open procedure */ + Status = STATUS_SUCCESS; if (ObjectType->TypeInfo.OpenProcedure) { /* Call it */ - ObjectType->TypeInfo.OpenProcedure(ObCreateHandle, - Process, - Object, - *DesiredAccess, - ProcessHandleCount); + ObpCalloutStart(&CalloutIrql); + Status = ObjectType->TypeInfo.OpenProcedure(ObCreateHandle, + Process, + Object, + *DesiredAccess, + ProcessHandleCount); + ObpCalloutEnd(CalloutIrql, "Open", ObjectType, Object); + + /* Check if the open procedure failed */ + if (!NT_SUCCESS(Status)) + { + /* FIXME: This should never happen for now */ + DPRINT1("Unhandled case\n"); + KEBUGCHECK(0); + return Status; + } + } + + /* Check if we have creator info */ + CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(ObjectHeader); + if (CreatorInfo) + { + /* We do, acquire the lock */ + ObpEnterObjectTypeMutex(ObjectType); + + /* Insert us on the list */ + InsertTailList(&ObjectType->TypeList, &CreatorInfo->TypeList); + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); } /* Increase total number of handles */ InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfHandles); + if (ObjectType->TotalNumberOfHandles > ObjectType->HighWaterNumberOfHandles) + { + /* Fixup count */ + ObjectType->HighWaterNumberOfHandles = ObjectType->TotalNumberOfHandles; + } + + /* Trace call and return */ OBTRACE(OB_HANDLE_DEBUG, "%s - Incremented count for: %p. UNNAMED HC LC %lx %lx\n", __FUNCTION__, Object, ObjectHeader->HandleCount, ObjectHeader->PointerCount); - return STATUS_SUCCESS; + return Status; + +Quickie: + /* Release lock and return */ + ObpLeaveObjectTypeMutex(ObjectType); + return Status; } /*++ @@ -709,12 +944,7 @@ * * @return <FILLMEIN>. * -* @remarks Gloomy says OpenReason is "enables Security" if == 1. -* since this function *has* to call ObpIncrementHandleCount, -* which needs to somehow know the OpenReason, and since -* ObOpenHandle == 1, I'm guessing this is actually the -* OpenReason. Also makes sense since this function is shared -* by Duplication, Creation and Opening.. +* @remarks Cleans up the Lookup Context on success. * *--*/ NTSTATUS @@ -725,6 +955,7 @@ IN PACCESS_STATE AccessState, IN ULONG AdditionalReferences, IN ULONG HandleAttributes, + IN POBP_LOOKUP_CONTEXT Context, IN KPROCESSOR_MODE AccessMode, OUT PVOID *ReturnedObject, OUT PHANDLE ReturnedHandle) @@ -1485,14 +1716,11 @@ { PVOID Object = NULL; UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; - OBP_LOOKUP_CONTEXT Context; POBJECT_HEADER ObjectHeader; - AUX_DATA AuxData; PGENERIC_MAPPING GenericMapping = NULL; - ACCESS_STATE AccessState; OB_OPEN_REASON OpenReason; + POB_TEMP_BUFFER TempBuffer; PAGED_CODE(); /* Check if we didn't get any Object Attributes */ @@ -1502,12 +1730,18 @@ *Handle = NULL; return STATUS_INVALID_PARAMETER; } + + /* Allocate the temporary buffer */ + TempBuffer = ExAllocatePoolWithTag(NonPagedPool, + sizeof(OB_TEMP_BUFFER), + TAG_OB_TEMP_STORAGE); + if (!TempBuffer) return STATUS_INSUFFICIENT_RESOURCES; /* Capture all the info */ Status = ObpCaptureObjectAttributes(ObjectAttributes, AccessMode, TRUE, - &ObjectCreateInfo, + &TempBuffer->ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) return Status; @@ -1518,35 +1752,40 @@ if (ObjectType) GenericMapping = &ObjectType->TypeInfo.GenericMapping; /* Use our built-in access state */ - PassedAccessState = &AccessState; - Status = SeCreateAccessState(&AccessState, - &AuxData, + PassedAccessState = &TempBuffer->LocalAccessState; + Status = SeCreateAccessState(&TempBuffer->LocalAccessState, + &TempBuffer->AuxData, DesiredAccess, GenericMapping); if (!NT_SUCCESS(Status)) goto Quickie; } /* Get the security descriptor */ - if (ObjectCreateInfo.SecurityDescriptor) + if (TempBuffer->ObjectCreateInfo.SecurityDescriptor) { /* Save it in the access state */ PassedAccessState->SecurityDescriptor = - ObjectCreateInfo.SecurityDescriptor; + TempBuffer->ObjectCreateInfo.SecurityDescriptor; } /* Now do the lookup */ - Status = ObFindObject(ObjectCreateInfo.RootDirectory, - &ObjectName, - ObjectCreateInfo.Attributes, - AccessMode, - &Object, - ObjectType, - &Context, - PassedAccessState, - ObjectCreateInfo.SecurityQos, - ParseContext, - NULL); - if (!NT_SUCCESS(Status)) goto Cleanup; + Status = ObpLookupObjectName(TempBuffer->ObjectCreateInfo.RootDirectory, + &ObjectName, + TempBuffer->ObjectCreateInfo.Attributes, + ObjectType, + AccessMode, + ParseContext, + TempBuffer->ObjectCreateInfo.SecurityQos, + NULL, + PassedAccessState, + &TempBuffer->LookupContext, + &Object); + if (!NT_SUCCESS(Status)) + { + /* Cleanup after lookup */ + TempBuffer->LookupContext.Object = NULL; + goto Cleanup; + } /* Check if this object has create information */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -1570,29 +1809,44 @@ OpenReason = ObOpenHandle; } - /* Create the actual handle now */ - Status = ObpCreateHandle(OpenReason, - Object, - ObjectType, - PassedAccessState, - 0, - ObjectCreateInfo.Attributes, - AccessMode, - NULL, - Handle); - if (!NT_SUCCESS(Status)) ObDereferenceObject(Object); + /* Check if we have invalid object attributes */ + if (ObjectHeader->Type->TypeInfo.InvalidAttributes & + TempBuffer->ObjectCreateInfo.Attributes) + { + /* Set failure code */ + Status = STATUS_INVALID_PARAMETER; + TempBuffer->LookupContext.Object = NULL; + } + else + { + /* Create the actual handle now */ + Status = ObpCreateHandle(OpenReason, + Object, + ObjectType, + PassedAccessState, + 0, + TempBuffer->ObjectCreateInfo.Attributes, + &TempBuffer->LookupContext, + AccessMode, + NULL, + Handle); + if (!NT_SUCCESS(Status)) ObDereferenceObject(Object); + } Cleanup: /* Delete the access state */ - if (PassedAccessState == &AccessState) + if (PassedAccessState == &TempBuffer->LocalAccessState) { SeDeleteAccessState(PassedAccessState); } - /* Release the object attributes and return status */ Quickie: - ObpReleaseCapturedAttributes(&ObjectCreateInfo); + /* Release the object attributes and temporary buffer */ + ObpReleaseCapturedAttributes(&TempBuffer->ObjectCreateInfo); if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); + ExFreePool(TempBuffer); + + /* Return status */ OBTRACE(OB_HANDLE_DEBUG, "%s - returning Object %p with PC S: %lx %lx\n", __FUNCTION__, @@ -1684,6 +1938,7 @@ PassedAccessState, 0, HandleAttributes, + NULL, AccessMode, NULL, Handle); @@ -1747,39 +2002,70 @@ NTSTATUS NTAPI ObInsertObject(IN PVOID Object, - IN PACCESS_STATE PassedAccessState OPTIONAL, + IN PACCESS_STATE AccessState OPTIONAL, IN ACCESS_MASK DesiredAccess, - IN ULONG AdditionalReferences, - OUT PVOID *ReferencedObject OPTIONAL, + IN ULONG ObjectPointerBias, + OUT PVOID *NewObject OPTIONAL, OUT PHANDLE Handle) { POBJECT_CREATE_INFORMATION ObjectCreateInfo; - POBJECT_HEADER Header; + POBJECT_HEADER ObjectHeader; POBJECT_TYPE ObjectType; - PVOID FoundObject = Object; - POBJECT_HEADER FoundHeader = NULL; + PUNICODE_STRING ObjectName; + PVOID InsertObject; + PSECURITY_DESCRIPTOR ParentDescriptor = NULL; + BOOLEAN SdAllocated = FALSE; + POBJECT_HEADER_NAME_INFO ObjectNameInfo; + OBP_LOOKUP_CONTEXT Context; + ACCESS_STATE LocalAccessState; + AUX_DATA AuxData; + OB_OPEN_REASON OpenReason; + KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS, RealStatus; - PSECURITY_DESCRIPTOR DirectorySd = NULL; - BOOLEAN SdAllocated; - OBP_LOOKUP_CONTEXT Context; - POBJECT_HEADER_NAME_INFO ObjectNameInfo; - ACCESS_STATE AccessState; - AUX_DATA AuxData; - BOOLEAN IsNamed = FALSE; - OB_OPEN_REASON OpenReason = ObCreateHandle; PAGED_CODE(); - /* Get the Header and Create Info */ - Header = OBJECT_TO_OBJECT_HEADER(Object); - ObjectCreateInfo = Header->ObjectCreateInfo; - ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); - ObjectType = Header->Type; + /* Get the Header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + + /* Detect invalid insert */ + if (!(ObjectHeader->Flags & OB_FLAG_CREATE_INFO)) + { + /* Display warning and break into debugger */ + DPRINT1("OB: Attempting to insert existing object %08x\n", Object); + KEBUGCHECK(0); + DbgBreakPoint(); + + /* Allow debugger to continue */ + ObDereferenceObject(Object); + return STATUS_INVALID_PARAMETER; + } + + /* Get the create and name info, as well as the object type */ + ObjectCreateInfo = ObjectHeader->ObjectCreateInfo; + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + ObjectType = ObjectHeader->Type; + /* Check if this is an named object */ - if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) IsNamed = TRUE; + ObjectName = NULL; + if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) + { + /* Get the object name */ + ObjectName = &ObjectNameInfo->Name; + } + + /* Sanity check, but broken on ROS due to Cm */ +#if 0 + ASSERT((Handle) || + ((ObjectPointerBias == 0) && + (ObjectName == NULL) && + (ObjectType->TypeInfo.SecurityRequired) && + (NewObject == NULL))); +#endif /* Check if the object is unnamed and also doesn't have security */ - if ((!ObjectType->TypeInfo.SecurityRequired) && !(IsNamed)) + PreviousMode = KeGetPreviousMode(); + if (!(ObjectType->TypeInfo.SecurityRequired) && !(ObjectName)) { /* ReactOS HACK */ if (Handle) @@ -1790,16 +2076,17 @@ /* Create the handle */ Status = ObpCreateUnnamedHandle(Object, DesiredAccess, - AdditionalReferences + 1, + ObjectPointerBias + 1, ObjectCreateInfo->Attributes, - ExGetPreviousMode(), - ReferencedObject, + PreviousMode, + NewObject, Handle); } /* Free the create information */ ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); - Header->ObjectCreateInfo = NULL; + ObjectHeader->ObjectCreateInfo = NULL; + /* Remove the extra keep-alive reference */ if (Handle) ObDereferenceObject(Object); @@ -1808,17 +2095,17 @@ OBTRACE(OB_HANDLE_DEBUG, "%s - returning Object with PC S: %lx %lx\n", __FUNCTION__, - OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, + ObjectHeader->PointerCount, Status); return Status; } /* Check if we didn't get an access state */ - if (!PassedAccessState) + if (!AccessState) { /* Use our built-in access state */ - PassedAccessState = &AccessState; - Status = SeCreateAccessState(&AccessState, + AccessState = &LocalAccessState; + Status = SeCreateAccessState(&LocalAccessState, &AuxData, DesiredAccess, &ObjectType->TypeInfo.GenericMapping); @@ -1831,37 +2118,50 @@ } /* Save the security descriptor */ - PassedAccessState->SecurityDescriptor = - ObjectCreateInfo->SecurityDescriptor; + AccessState->SecurityDescriptor = ObjectCreateInfo->SecurityDescriptor; + + /* Validate the access mask */ + Status = STATUS_SUCCESS;//ObpValidateAccessMask(AccessState); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ObDereferenceObject(Object); + return Status; + } + + /* Setup a lookup context */ + Context.Object = NULL; + InsertObject = Object; + OpenReason = ObCreateHandle; /* Check if the object is named */ - if (IsNamed) + if (ObjectName) { /* Look it up */ - Status = ObFindObject(ObjectCreateInfo->RootDirectory, - &ObjectNameInfo->Name, - ObjectCreateInfo->Attributes, - (Header->Flags & OB_FLAG_KERNEL_MODE) ? - KernelMode : UserMode, - &FoundObject, - ObjectType, - &Context, - PassedAccessState, - ObjectCreateInfo->SecurityQos, - ObjectCreateInfo->ParseContext, - Object); + Status = ObpLookupObjectName(ObjectCreateInfo->RootDirectory, + ObjectName, + ObjectCreateInfo->Attributes, + ObjectType, + (ObjectHeader->Flags & OB_FLAG_KERNEL_MODE) ? + KernelMode : UserMode, + ObjectCreateInfo->ParseContext, + ObjectCreateInfo->SecurityQos, + Object, + AccessState, + &Context, + &InsertObject); + /* Check if we found an object that doesn't match the one requested */ - if ((NT_SUCCESS(Status)) && (FoundObject) && (Object != FoundObject)) + if ((NT_SUCCESS(Status)) && (InsertObject) && (Object != InsertObject)) { /* This means we're opening an object, not creating a new one */ - FoundHeader = OBJECT_TO_OBJECT_HEADER(FoundObject); OpenReason = ObOpenHandle; /* Make sure the caller said it's OK to do this */ if (ObjectCreateInfo->Attributes & OBJ_OPENIF) { /* He did, but did he want this type? */ - if (ObjectType != FoundHeader->Type) + if (ObjectType != OBJECT_TO_OBJECT_HEADER(InsertObject)->Type) { /* Wrong type, so fail */ Status = STATUS_OBJECT_TYPE_MISMATCH; @@ -1884,43 +2184,53 @@ { /* We failed, dereference the object and delete the access state */ ObDereferenceObject(Object); - if (PassedAccessState == &AccessState) + if (AccessState == &LocalAccessState) { /* We used a local one; delete it */ - SeDeleteAccessState(PassedAccessState); + SeDeleteAccessState(AccessState); } /* Return failure code */ return Status; } + else + { + /* Check if this is a symbolic link */ + if (ObjectType == ObSymbolicLinkType) + { + /* Create the internal name */ + DPRINT("FIXME: Created link!\n"); + //ObpCreateSymbolicLinkName(FoundObject); + } + } } /* Now check if this object is being created */ - if (FoundObject == Object) + if (InsertObject == Object) { /* Check if it's named or forces security */ - if ((IsNamed) || (ObjectType->TypeInfo.SecurityRequired)) + if ((ObjectName) || (ObjectType->TypeInfo.SecurityRequired)) { /* Make sure it's inserted into an object directory */ if ((ObjectNameInfo) && (ObjectNameInfo->Directory)) { /* Get the current descriptor */ ObGetObjectSecurity(ObjectNameInfo->Directory, - &DirectorySd, + &ParentDescriptor, &SdAllocated); } /* Now assign it */ - Status = ObAssignSecurity(PassedAccessState, - DirectorySd, + Status = ObAssignSecurity(AccessState, + ParentDescriptor, Object, ObjectType); /* Check if we captured one */ - if (DirectorySd) + if (ParentDescriptor) { /* We did, release it */ - ObReleaseObjectSecurity(DirectorySd, SdAllocated); + ObReleaseObjectSecurity(ParentDescriptor, SdAllocated); } else if (NT_SUCCESS(Status)) { @@ -1930,8 +2240,8 @@ TRUE); /* Clear the current one */ - PassedAccessState->SecurityDescriptor = - ObjectCreateInfo->SecurityDescriptor = NULL; + AccessState->SecurityDescriptor = + ObjectCreateInfo->SecurityDescriptor = NULL; } } @@ -1941,10 +2251,10 @@ /* We failed, dereference the object and delete the access state */ KEBUGCHECK(0); ObDereferenceObject(Object); - if (PassedAccessState == &AccessState) + if (AccessState == &LocalAccessState) { /* We used a local one; delete it */ - SeDeleteAccessState(PassedAccessState); + SeDeleteAccessState(AccessState); } /* Return failure code */ @@ -1961,33 +2271,28 @@ * a handle if Handle is NULL when the Registry Code calls it, because * the registry code totally bastardizes the Ob and needs to be fixed */ + ObjectHeader->ObjectCreateInfo = NULL; if (Handle) { /* Create the handle */ Status = ObpCreateHandle(OpenReason, - FoundObject, + InsertObject, NULL, - PassedAccessState, - AdditionalReferences + 1, + AccessState, + ObjectPointerBias + 1, ObjectCreateInfo->Attributes, - ExGetPreviousMode(), - ReferencedObject, + &Context, + PreviousMode, + NewObject, Handle); } - - /* We can delete the Create Info now */ - Header->ObjectCreateInfo = NULL; - ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); /* Check if creating the handle failed */ if (!NT_SUCCESS(Status)) { /* If the object had a name, backout everything */ - if (IsNamed) ObpDeleteNameCheck(Object); - } - - /* Remove the extra keep-alive reference */ - if (Handle) ObDereferenceObject(Object); + if (ObjectName) ObpDeleteNameCheck(Object); + } /* Check our final status */ if (!NT_SUCCESS(Status)) @@ -1997,12 +2302,17 @@ RealStatus = Status; } - /* Check if we created our own access state */ - if (PassedAccessState == &AccessState) - { - /* We used a local one; delete it */ - SeDeleteAccessState(PassedAccessState); - } + + + + /* Remove the extra keep-alive reference */ + if (Handle) ObDereferenceObject(Object); + + /* We can delete the Create Info now */ + ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); + + /* Check if we created our own access state and delete it if so */ + if (AccessState == &LocalAccessState) SeDeleteAccessState(AccessState); /* Return status code */ OBTRACE(OB_HANDLE_DEBUG, Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Mon Jan 8 11:03:47 2007 @@ -14,8 +14,9 @@ #define NTDDI_VERSION NTDDI_WINXP #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> - +#include <debug.h> + +BOOLEAN ObpCaseInsensitive = TRUE; POBJECT_DIRECTORY NameSpaceRoot = NULL; POBJECT_DIRECTORY ObpTypeDirectoryObject = NULL; @@ -181,6 +182,8 @@ (ObjectNameInfo->Name.Length) && !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) { + Context.Object = NULL; + /* Make sure it's still inserted */ Context.Directory = ObjectNameInfo->Directory; Context.DirectoryLocked = TRUE; @@ -220,6 +223,8 @@ ExFreePool(ObjectNameInfo->Name.Buffer); RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); + Context.Object = NULL; + /* Clear the current directory and de-reference it */ Directory = ObjectNameInfo->Directory; ObjectNameInfo->Directory = NULL; @@ -237,17 +242,17 @@ NTSTATUS NTAPI -ObFindObject(IN HANDLE RootHandle, - IN PUNICODE_STRING ObjectName, - IN ULONG Attributes, - IN KPROCESSOR_MODE AccessMode, - IN PVOID *ReturnedObject, - IN POBJECT_TYPE ObjectType, - IN POBP_LOOKUP_CONTEXT Context, - IN PACCESS_STATE AccessState, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN OUT PVOID ParseContext, - OUT PVOID ExpectedObject) +ObpLookupObjectName(IN HANDLE RootHandle, + IN PUNICODE_STRING ObjectName, + IN ULONG Attributes, + IN POBJECT_TYPE ObjectType, + IN KPROCESSOR_MODE AccessMode, + IN OUT PVOID ParseContext, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN PVOID ExpectedObject, + IN PACCESS_STATE AccessState, + IN POBP_LOOKUP_CONTEXT Context, + OUT PVOID *ReturnedObject) { PVOID RootDirectory; PVOID CurrentDirectory = NULL; @@ -500,7 +505,7 @@ ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(CurrentHeader); /* Copy the Name */ - RtlCopyMemory(NewName, PartName.Buffer, PartName.MaximumLength); + RtlMoveMemory(NewName, PartName.Buffer, PartName.MaximumLength); /* Free old name */ if (ObjectNameInfo->Name.Buffer) ExFreePool(ObjectNameInfo->Name.Buffer); @@ -526,7 +531,7 @@ /* We found it, so now get its header */ CurrentHeader = OBJECT_TO_OBJECT_HEADER(CurrentObject); - /* + /* * Check for a parse Procedure, but don't bother to parse for an insert * unless it's a Symbolic Link, in which case we MUST parse */ @@ -674,9 +679,9 @@ NTSTATUS NTAPI -ObQueryNameString(IN PVOID Object, +ObQueryNameString(IN PVOID Object, OUT POBJECT_NAME_INFORMATION ObjectNameInfo, - IN ULONG Length, + IN ULONG Length, OUT PULONG ReturnLength) { POBJECT_HEADER_NAME_INFO LocalInfo; Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon Jan 8 11:03:47 2007 @@ -369,21 +369,21 @@ return STATUS_OBJECT_TYPE_MISMATCH; } - /* Oncrement the reference count and return success */ + /* Increment the reference count and return success */ InterlockedIncrement(&Header->PointerCount); return STATUS_SUCCESS; } NTSTATUS NTAPI -ObReferenceObjectByName(PUNICODE_STRING ObjectPath, - ULONG Attributes, - PACCESS_STATE PassedAccessState, - ACCESS_MASK DesiredAccess, - POBJECT_TYPE ObjectType, - KPROCESSOR_MODE AccessMode, - PVOID ParseContext, - PVOID* ObjectPtr) +ObReferenceObjectByName(IN PUNICODE_STRING ObjectPath, + IN ULONG Attributes, + IN PACCESS_STATE PassedAccessState, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_TYPE ObjectType, + IN KPROCESSOR_MODE AccessMode, + IN OUT PVOID ParseContext, + OUT PVOID* ObjectPtr) { PVOID Object = NULL; UNICODE_STRING ObjectName; @@ -391,10 +391,17 @@ OBP_LOOKUP_CONTEXT Context; AUX_DATA AuxData; ACCESS_STATE AccessState; + PAGED_CODE(); + + /* Fail quickly */ + if (!ObjectPath) return STATUS_OBJECT_NAME_INVALID; /* Capture the name */ Status = ObpCaptureObjectName(&ObjectName, ObjectPath, AccessMode, TRUE); if (!NT_SUCCESS(Status)) return Status; + + /* We also need a valid name after capture */ + if (!ObjectName.Length) return STATUS_OBJECT_NAME_INVALID; /* Check if we didn't get an access state */ if (!PassedAccessState) @@ -410,21 +417,33 @@ /* Find the object */ *ObjectPtr = NULL; - Status = ObFindObject(NULL, - &ObjectName, - Attributes, - AccessMode, - &Object, - ObjectType, - &Context, - PassedAccessState, - NULL, - ParseContext, - NULL); + Status = ObpLookupObjectName(NULL, + &ObjectName, + Attributes, + ObjectType, + AccessMode, + ParseContext, + NULL, + NULL, + PassedAccessState, + &Context, + &Object); + Context.Object = NULL; + + /* Check if the lookup succeeded */ if (NT_SUCCESS(Status)) { - /* Return the object */ - *ObjectPtr = Object; + /* Check if access is allowed */ + if (ObpCheckObjectReference(Object, + PassedAccessState, + FALSE, + AccessMode, + &Status)) + { + /* Return the object */ + Status = STATUS_SUCCESS; + *ObjectPtr = Object; + } } /* Free the access state */

1 0

[ion] 25371: - Changes to lookup context set-up as place-holder and compatibility for future patch. Only configure the lookup context once, outside the initial loop, instead of configuring it with the same settings at each iteration.
by ion＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: ion Date: Mon Jan 8 10:54:57 2007 New Revision: 25371 URL: http://svn.reactos.org/svn/reactos?rev=25371&view=rev Log: - Changes to lookup context set-up as place-holder and compatibility for future patch. Only configure the lookup context once, outside the initial loop, instead of configuring it with the same settings at each iteration. Modified: trunk/reactos/ntoskrnl/ob/obinit.c Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Mon Jan 8 10:54:57 2007 @@ -12,11 +12,9 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, ObInit) -#endif +#include <debug.h> + +/* GLOBALS *******************************************************************/ GENERIC_MAPPING ObpTypeMapping = { @@ -280,6 +278,10 @@ Status = NtClose(Handle); if (!NT_SUCCESS(Status)) return FALSE; + Context.Object = NULL; + Context.Directory = ObpTypeDirectoryObject; + Context.DirectoryLocked = TRUE; + /* Loop the object types */ ListHead = &ObTypeObjectType->TypeList; NextEntry = ListHead->Flink; @@ -297,10 +299,6 @@ /* Make sure we have a name, and aren't inserted yet */ if ((NameInfo) && !(NameInfo->Directory)) { - /* Set up the context for the insert */ - Context.Directory = ObpTypeDirectoryObject; - Context.DirectoryLocked = TRUE; - /* Do the initial lookup to setup the context */ if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, &NameInfo->Name, @@ -319,6 +317,8 @@ NextEntry = NextEntry->Flink; } + Context.Object = NULL; + /* Initialize DOS Devices Directory and related Symbolic Links */ Status = ObpCreateDosDevicesDirectory(); if (!NT_SUCCESS(Status)) return FALSE;

1 0

[ion] 25370: - Validate lookup context in ObpInsertEntryDirectory. - Read actual ObpLUIDDeviceMapsEnable variable do determine if shadow-searching is enabled in ObpLookupEntryDirectory. - Currently disable all directory locking code (it was never used anyways) in ObpLookupEntryDirectory. - Update ObpLookupEntryDirectory with placeholder code/branches for future patch implementing directory locks.
by ion＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: ion Date: Mon Jan 8 10:53:50 2007 New Revision: 25370 URL: http://svn.reactos.org/svn/reactos?rev=25370&view=rev Log: - Validate lookup context in ObpInsertEntryDirectory. - Read actual ObpLUIDDeviceMapsEnable variable do determine if shadow-searching is enabled in ObpLookupEntryDirectory. - Currently disable all directory locking code (it was never used anyways) in ObpLookupEntryDirectory. - Update ObpLookupEntryDirectory with placeholder code/branches for future patch implementing directory locks. Modified: trunk/reactos/ntoskrnl/ob/obdir.c Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Mon Jan 8 10:53:50 2007 @@ -13,11 +13,11 @@ /* INCLUDES ***************************************************************/ -#define NTDDI_VERSION NTDDI_WS03 #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> - +#include <debug.h> + +BOOLEAN ObpLUIDDeviceMapsEnabled; POBJECT_TYPE ObDirectoryType = NULL; /* PRIVATE FUNCTIONS ******************************************************/ @@ -53,6 +53,18 @@ /* Make sure we have a name */ ASSERT(ObjectHeader->NameInfoOffset != 0); + + /* Validate the context */ + if ((Context->Object) || + !(Context->DirectoryLocked) || + (Parent != Context->Directory)) + { + /* Invalid context */ + DPRINT1("OB: ObpInsertEntryDirectory - invalid context %p %ld\n", + Context, Context->DirectoryLocked); + KEBUGCHECK(0); + return FALSE; + } /* Allocate a new Directory Entry */ NewEntry = ExAllocatePoolWithTag(PagedPool, @@ -116,6 +128,7 @@ { BOOLEAN CaseInsensitive = FALSE; POBJECT_HEADER_NAME_INFO HeaderNameInfo; + POBJECT_HEADER ObjectHeader; ULONG HashValue; ULONG HashIndex; LONG TotalChars; @@ -127,8 +140,8 @@ PWSTR Buffer; PAGED_CODE(); - /* Always disable this until we have DOS Device Maps */ - SearchShadow = FALSE; + /* Check if we should search the shadow directory */ + if (!ObpLUIDDeviceMapsEnabled) SearchShadow = FALSE; /* Fail if we don't have a directory or name */ if (!(Directory) || !(Name)) goto Quickie; @@ -137,11 +150,11 @@ TotalChars = Name->Length / sizeof(WCHAR); Buffer = Name->Buffer; + /* Set up case-sensitivity */ + if (Attributes & OBJ_CASE_INSENSITIVE) CaseInsensitive = TRUE; + /* Fail if the name is empty */ if (!(Buffer) || !(TotalChars)) goto Quickie; - - /* Set up case-sensitivity */ - if (Attributes & OBJ_CASE_INSENSITIVE) CaseInsensitive = TRUE; /* Create the Hash */ for (HashValue = 0; TotalChars; TotalChars--) @@ -172,9 +185,7 @@ /* Check if the directory is already locked */ if (!Context->DirectoryLocked) { - /* Lock it */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&Directory->Lock, TRUE); + } /* Start looping */ @@ -184,10 +195,11 @@ if (CurrentEntry->HashValue == HashValue) { /* Make sure that it has a name */ - ASSERT(OBJECT_TO_OBJECT_HEADER(CurrentEntry->Object)->NameInfoOffset != 0); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentEntry->Object); /* Get the name information */ - HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(CurrentEntry->Object)); + ASSERT(ObjectHeader->NameInfoOffset != 0); + HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); /* Do the names match? */ if ((Name->Length == HeaderNameInfo->Name.Length) && @@ -207,6 +219,11 @@ /* Set this entry as the first, to speed up incoming insertion */ if (AllocatedEntry != LookupBucket) { + /* Check if the directory was locked */ + if (!Context->DirectoryLocked) + { + } + /* Set the Current Entry */ *AllocatedEntry = CurrentEntry->ChainLink; @@ -220,17 +237,42 @@ /* Save the found object */ FoundObject = CurrentEntry->Object; if (!FoundObject) goto Quickie; - } - - /* Check if the directory was unlocked (which means we locked it) */ - if (!Context->DirectoryLocked) - { - /* Lock it */ - ExReleaseResourceLite(&Directory->Lock); - KeLeaveCriticalRegion(); + + /* Get the object name information */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(FoundObject); + HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + + /* Reference the object being looked up */ + //ObReferenceObject(FoundObject); + + /* Check if the directory was locked */ + if (!Context->DirectoryLocked) + { + } + } + else + { + /* Check if the directory was locked */ + if (!Context->DirectoryLocked) + { + } + + /* Check if we should scan the shadow directory */ + if ((SearchShadow) && (Directory->DeviceMap)) + { + /* FIXME: We don't support this yet */ + KEBUGCHECK(0); + } } Quickie: + /* Check if we found an object already */ + if (Context->Object) + { + /* We already did a lookup, so remove this object's query reference */ + //ObpRemoveQueryReference(Context->Object); + } + /* Return the object we found */ Context->Object = FoundObject; return FoundObject;

1 0

[ion] 25369: - Set an invalid pointer as the object header's type when freeing it, to detect invalid usage. - Optimize type mutex acquisition in ObpDeleteObject. Also optimize freeing of the unicode_String containing the name. Also add callout checks/protection during the security and delete procedure callouts. - Acquire object type mutex during modification of the OB_FLAG_PERMANENT flag in ObpSetPermanentObject. - Initialize default QueryReferences field to 1 during object allocation. - Support
by ion＠svn.reactos.org 08 Jan '07

08 Jan '07

Author: ion Date: Mon Jan 8 10:51:07 2007 New Revision: 25369 URL: http://svn.reactos.org/svn/reactos?rev=25369&view=rev Log: - Set an invalid pointer as the object header's type when freeing it, to detect invalid usage. - Optimize type mutex acquisition in ObpDeleteObject. Also optimize freeing of the unicode_String containing the name. Also add callout checks/protection during the security and delete procedure callouts. - Acquire object type mutex during modification of the OB_FLAG_PERMANENT flag in ObpSetPermanentObject. - Initialize default QueryReferences field to 1 during object allocation. - Support undocumented 0x10000 object attribute flag used in Windows 2003 SP1 and higher to protect objects from user-mode access (such as PhysicalMemory). - Use InterlockedIncrements for ObjectType accounting outside the type lock. - Clear the lookup context's object pointer for future use. Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon Jan 8 10:51:07 2007 @@ -107,9 +107,6 @@ /* Add the SD charge too */ if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2048; } - - /* FIXME: Should be returning quota */ - DPRINT("Quotas: %lx %lx\n", PagedPoolCharge, NonPagedPoolCharge); } } @@ -128,6 +125,9 @@ ExFreePool(NameInfo->Name.Buffer); NameInfo->Name.Buffer = NULL; } + + /* Catch invalid access */ + Header->Type = (POBJECT_TYPE)0xBAADB0B0; /* Free the object using the same allocation tag */ ExFreePoolWithTag(HeaderLocation, ObjectType->Key); @@ -142,6 +142,7 @@ POBJECT_TYPE ObjectType; POBJECT_HEADER_NAME_INFO NameInfo; POBJECT_HEADER_CREATOR_INFO CreatorInfo; + KIRQL CalloutIrql; PAGED_CODE(); /* Get the header and type */ @@ -152,33 +153,32 @@ NameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); - /* Lock the object type */ - ObpEnterObjectTypeMutex(ObjectType); - /* Check if the object is on a type list */ if ((CreatorInfo) && !(IsListEmpty(&CreatorInfo->TypeList))) { + /* Lock the object type */ + ObpEnterObjectTypeMutex(ObjectType); + /* Remove the object from the type list */ RemoveEntryList(&CreatorInfo->TypeList); - } - - /* Release the lock */ - ObpLeaveObjectTypeMutex(ObjectType); + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); + } /* Check if we have a name */ if ((NameInfo) && (NameInfo->Name.Buffer)) { /* Free it */ ExFreePool(NameInfo->Name.Buffer); - - /* Clean up the string so we don't try this again */ - RtlInitUnicodeString(&NameInfo->Name, NULL); + RtlInitEmptyUnicodeString(&NameInfo->Name, NULL, 0); } /* Check if we have a security descriptor */ if (Header->SecurityDescriptor) { /* Call the security procedure to delete it */ + ObpCalloutStart(&CalloutIrql); ObjectType->TypeInfo.SecurityProcedure(Object, DeleteSecurityDescriptor, 0, @@ -187,13 +187,16 @@ &Header->SecurityDescriptor, 0, NULL); + ObpCalloutEnd(CalloutIrql, "Security", ObjectType, Object); } /* Check if we have a delete procedure */ if (ObjectType->TypeInfo.DeleteProcedure) { /* Call it */ + ObpCalloutStart(&CalloutIrql); ObjectType->TypeInfo.DeleteProcedure(Object); + ObpCalloutEnd(CalloutIrql, "Delete", ObjectType, Object); } /* Now de-allocate all object members */ @@ -256,15 +259,26 @@ /* Get the header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); + + /* Acquire object type lock */ + ObpEnterObjectTypeMutex(ObjectHeader->Type); + + /* Check what we're doing to it */ if (Permanent) { /* Set it to permanent */ ObjectHeader->Flags |= OB_FLAG_PERMANENT; + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectHeader->Type); } else { /* Remove the flag */ ObjectHeader->Flags &= ~OB_FLAG_PERMANENT; + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectHeader->Type); /* Check if we should delete the object now */ ObpDeleteNameCheck(ObjectBody); @@ -623,9 +637,10 @@ Header = ExAllocatePoolWithTag(PoolType, FinalSize + ObjectSize, Tag); if (!Header) return STATUS_INSUFFICIENT_RESOURCES; - /* Initialize quota info */ + /* Check if we have a quota header */ if (QuotaSize) { + /* Initialize quota info */ QuotaInfo = (POBJECT_HEADER_QUOTA_INFO)Header; QuotaInfo->PagedPoolCharge = ObjectCreateInfo->PagedPoolCharge; QuotaInfo->NonPagedPoolCharge = ObjectCreateInfo->NonPagedPoolCharge; @@ -634,26 +649,41 @@ Header = (POBJECT_HEADER)(QuotaInfo + 1); } - /* Initialize Handle Info */ + /* Check if we have a handle database header */ if (HandleSize) { + /* Initialize Handle Info */ HandleInfo = (POBJECT_HEADER_HANDLE_INFO)Header; HandleInfo->SingleEntry.HandleCount = 0; Header = (POBJECT_HEADER)(HandleInfo + 1); } - /* Initialize the Object Name Info */ + /* Check if we have a name header */ if (NameSize) { + /* Initialize the Object Name Info */ NameInfo = (POBJECT_HEADER_NAME_INFO)Header; NameInfo->Name = *ObjectName; NameInfo->Directory = NULL; + NameInfo->QueryReferences = 1; + + /* Check if this is a call with the special protection flag */ + if ((PreviousMode == KernelMode) && + (ObjectCreateInfo) && + (ObjectCreateInfo->Attributes & 0x10000)) + { + /* Set flag which will make the object protected from user-mode */ + NameInfo->QueryReferences |= 0x40000000; + } + + /* Set the header pointer */ Header = (POBJECT_HEADER)(NameInfo + 1); } - /* Initialize Creator Info */ + /* Check if we have a creator header */ if (CreatorSize) { + /* Initialize Creator Info */ CreatorInfo = (POBJECT_HEADER_CREATOR_INFO)Header; CreatorInfo->CreatorBackTraceIndex = 0; CreatorInfo->CreatorUniqueProcess = PsGetCurrentProcessId(); @@ -739,7 +769,7 @@ if (ObjectType) { /* Increase the number of objects of this type */ - ObjectType->TotalNumberOfObjects++; + InterlockedIncrement(&ObjectType->TotalNumberOfObjects); /* Update the high water */ ObjectType->HighWaterNumberOfObjects = max(ObjectType-> @@ -774,8 +804,6 @@ POBJECT_CREATE_INFORMATION ObjectCreateInfo; UNICODE_STRING ObjectName; POBJECT_HEADER Header; - DPRINT("ObCreateObject(Type %p ObjectAttributes %p, Object %p)\n", - Type, ObjectAttributes, Object); /* Allocate a capture buffer */ ObjectCreateInfo = ObpAllocateCapturedAttributes(LookasideCreateInfoList); @@ -898,6 +926,8 @@ if (*p++ == OBJ_NAME_PATH_SEPARATOR) return STATUS_OBJECT_NAME_INVALID; } + Context.Object = NULL; + /* Check if we've already created the directory of types */ if (ObpTypeDirectoryObject) { @@ -911,6 +941,7 @@ &Context)) { /* We have already created it, so fail */ + Context.Object = NULL; return STATUS_OBJECT_NAME_COLLISION; } } @@ -922,6 +953,7 @@ if (!ObjectName.Buffer) { /* Out of memory, fail */ + Context.Object = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -938,6 +970,8 @@ (POBJECT_HEADER*)&Header); if (!NT_SUCCESS(Status)) { + Context.Object = NULL; + /* Free the name and fail */ ExFreePool(ObjectName.Buffer); return Status; @@ -1067,12 +1101,15 @@ ObReferenceObject(ObpTypeDirectoryObject); } + Context.Object = NULL; + /* Return the object type and success */ *ObjectType = LocalObjectType; return STATUS_SUCCESS; } /* If we got here, then we failed */ + Context.Object = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -1094,6 +1131,8 @@ NTAPI ObMakeTemporaryObject(IN PVOID ObjectBody) { + PAGED_CODE(); + /* Call the internal API */ ObpSetPermanentObject(ObjectBody, FALSE); }

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