Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

by ekohl＠svn.reactos.com

- Convert U32 to ULONG. Modified: trunk/reactos/boot/freeldr/freeldr/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h _____ Modified: trunk/reactos/boot/freeldr/freeldr/debug.c --- trunk/reactos/boot/freeldr/freeldr/debug.c 2005-02-08 12:35:44 UTC (rev 13464) +++ trunk/reactos/boot/freeldr/freeldr/debug.c 2005-02-08 14:46:44 UTC (rev 13465) @@ -33,17 +33,17 @@ #define DEBUG_NONE #if defined (DEBUG_ALL) -U32 DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | DPRINT_FILESYSTEM | +ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | DPRINT_FILESYSTEM | DPRINT_UI | DPRINT_DISK | DPRINT_CACHE | DPRINT_REACTOS | DPRINT_LINUX; #elif defined (DEBUG_INIFILE) -U32 DebugPrintMask = DPRINT_INIFILE; +ULONG DebugPrintMask = DPRINT_INIFILE; #elif defined (DEBUG_REACTOS) -U32 DebugPrintMask = DPRINT_REACTOS | DPRINT_REGISTRY; +ULONG DebugPrintMask = DPRINT_REACTOS | DPRINT_REGISTRY; #elif defined (DEBUG_CUSTOM) -U32 DebugPrintMask = DPRINT_WARNING|DPRINT_FILESYSTEM|DPRINT_MEMORY|DPRINT_LINUX; +ULONG DebugPrintMask = DPRINT_WARNING|DPRINT_FILESYSTEM|DPRINT_MEMORY|DPRINT_LINUX; #else //#elif defined (DEBUG_NONE) -U32 DebugPrintMask = 0; +ULONG DebugPrintMask = 0; #endif #define SCREEN 1 @@ -57,13 +57,13 @@ #define BOCHS_OUTPUT_PORT 0xe9 -U32 DebugPort = RS232; -//U32 DebugPort = SCREEN; -//U32 DebugPort = BOCHS; -//U32 DebugPort = SCREEN|BOCHS; -U32 ComPort = COM1; -//U32 BaudRate = 19200; -U32 BaudRate = 115200; +ULONG DebugPort = RS232; +//ULONG DebugPort = SCREEN; +//ULONG DebugPort = BOCHS; +//ULONG DebugPort = SCREEN|BOCHS; +ULONG ComPort = COM1; +//ULONG BaudRate = 19200; +ULONG BaudRate = 115200; BOOL DebugStartOfLine = TRUE; @@ -100,7 +100,7 @@ } } -VOID DebugPrintHeader(U32 Mask) +VOID DebugPrintHeader(ULONG Mask) { /* No header */ if (Mask == 0) @@ -309,7 +309,7 @@ } -VOID DebugPrint(U32 Mask, char *format, ...) +VOID DebugPrint(ULONG Mask, char *format, ...) { int *dataptr = (int *) &format; @@ -336,11 +336,11 @@ DebugPrintV(format, ++dataptr); } -VOID DebugDumpBuffer(U32 Mask, PVOID Buffer, U32 Length) +VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length) { PUCHAR BufPtr = (PUCHAR)Buffer; - U32 Idx; - U32 Idx2; + ULONG Idx; + ULONG Idx2; // Mask out unwanted debug messages if (!(Mask & DebugPrintMask)) _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h --- trunk/reactos/boot/freeldr/freeldr/include/debug.h 2005-02-08 12:35:44 UTC (rev 13464) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h 2005-02-08 14:46:44 UTC (rev 13465) @@ -37,9 +37,9 @@ #define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages VOID DebugInit(VOID); - VOID DebugPrint(U32 Mask, char *format, ...); + VOID DebugPrint(ULONG Mask, char *format, ...); VOID DebugPrint1(char *format, ...); - VOID DebugDumpBuffer(U32 Mask, PVOID Buffer, U32 Length); + VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); #define DbgPrint(_x_) DebugPrint _x_ ; #define DPRINT1 DebugPrint1

19 years, 10 months

[gvg] 13464: Redraw shell background when wallpaper is changed

by gvg＠svn.reactos.com

Redraw shell background when wallpaper is changed Modified: trunk/reactos/lib/user32/misc/desktop.c _____ Modified: trunk/reactos/lib/user32/misc/desktop.c --- trunk/reactos/lib/user32/misc/desktop.c 2005-02-08 01:55:04 UTC (rev 13463) +++ trunk/reactos/lib/user32/misc/desktop.c 2005-02-08 12:35:44 UTC (rev 13464) @@ -177,7 +177,7 @@ } } - RedrawWindow(GetDesktopWindow(), NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); + RedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); return Ret; } @@ -280,7 +280,7 @@ } } - RedrawWindow(GetDesktopWindow(), NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW); + RedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); return Ret; }

19 years, 10 months

[ion] 13463: Forgot this file

by ion＠svn.reactos.com

Forgot this file Added: trunk/reactos/ntoskrnl/ke/i386/main.S _____ Added: trunk/reactos/ntoskrnl/ke/i386/main.S --- trunk/reactos/ntoskrnl/ke/i386/main.S 2005-02-08 01:46:01 UTC (rev 13462) +++ trunk/reactos/ntoskrnl/ke/i386/main.S 2005-02-08 01:55:04 UTC (rev 13463) @@ -0,0 +1,31 @@ +#include <roscfg.h> +#include <internal/ntoskrnl.h> +#include <internal/i386/ke.h> +#include <internal/i386/segment.h> +#include <internal/ps.h> +#include <internal/i386/mm.h> +#include <internal/i386/fpu.h> + +.globl _NtProcessStartup + +_NtProcessStartup: + + /* FIXME: Application processors should have their own GDT/IDT */ + lgdt _KiGdtDescriptor + lidt _KiIdtDescriptor + + /* Load the PCR selector */ + movl $PCR_SELECTOR, %eax + movl %eax, %fs + + /* Load the initial kernel stack */ + lea _kernel_stack, %eax + add $0x1000, %eax + and $0xFFFFE000, %eax + add $(0x3000 - SIZEOF_FX_SAVE_AREA), %eax + movl %eax, %esp + + /* Call the main kernel initialization */ + pushl %edx + pushl %ecx + call __main

19 years, 10 months

[ion] 13462: FreeLdr Patch. Now fully loads ntoskrnl using a PE Loader, supports /3gb dynamically but this is NOT enabled yet, so please continue using the 3GB entry in config until r2 is ready which will support relocation and remove the config entry. You must also supply /3GB to the commandline if you're using 3GB, just like since the previous patch. Also freeldr now uses w32api headers. Janitors will clean the dupes up. Thank you: Mike, Royce, Hartmut, Blight, Filip and everyone who reviewed.

by ion＠svn.reactos.com

FreeLdr Patch. Now fully loads ntoskrnl using a PE Loader, supports /3gb dynamically but this is NOT enabled yet, so please continue using the 3GB entry in config until r2 is ready which will support relocation and remove the config entry. You must also supply /3GB to the commandline if you're using 3GB, just like since the previous patch. Also freeldr now uses w32api headers. Janitors will clean the dupes up. Thank you: Mike, Royce, Hartmut, Blight, Filip and everyone who reviewed. Hartmut, if anything is missing from the patch you sent me, feel free to add it. More info at http://blogs.reactos.com/Alex_Ionescu. Modified: trunk/reactos/boot/freeldr/freeldr/Makefile Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/cm.h Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/cache.h Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h Modified: trunk/reactos/boot/freeldr/freeldr/include/comm.h Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/include/drivemap.h Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/inffile.h Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: trunk/reactos/boot/freeldr/freeldr/include/oslist.h Modified: trunk/reactos/boot/freeldr/freeldr/include/portio.h Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h Modified: trunk/reactos/boot/freeldr/freeldr/include/video.h Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/machine.c Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/mem.h Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.h Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/list.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/string.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/video/fade.c Modified: trunk/reactos/boot/freeldr/freeldr/video/palette.c Modified: trunk/reactos/boot/freeldr/freeldr/video/video.c Modified: trunk/reactos/hal/halx86/mp/mpsboot.asm Modified: trunk/reactos/hal/halx86/mp/processor_mp.c Modified: trunk/reactos/include/ntos/types.h [truncated at 100 lines; 13 more skipped] _____ Modified: trunk/reactos/boot/freeldr/freeldr/Makefile --- trunk/reactos/boot/freeldr/freeldr/Makefile 2005-02-07 23:11:30 UTC (rev 13461) +++ trunk/reactos/boot/freeldr/freeldr/Makefile 2005-02-08 01:46:01 UTC (rev 13462) @@ -83,7 +83,7 @@ $(CP) setupldr.sys $(BOOTCD_DIR)/disk/loader/setupldr.sys -COMPILER_OPTIONS = -Wall -Werror -nostdlib -nostdinc -ffreestanding -fno-builtin -fno-inline \ +COMPILER_OPTIONS = -Wall -Werror -nostdlib -ffreestanding -fno-builtin -fno-inline \ -fno-zero-initialized-in-bss -O1 -MD # FreeLoader does not use any of the standard libraries, includes, or built-in functions @@ -95,7 +95,7 @@ COMPILER_DEFINES = -D__$(TARGET)__ $(COMPILER_DEBUG_DEFINES) -COMPILER_INCLUDES = -I$(SRCDIR)/include -I$(PATH_TO_TOP)/include +COMPILER_INCLUDES = -I$(SRCDIR)/include -I$(PATH_TO_TOP)/w32api/include -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/ntoskrnl/include CFLAGS = $(COMPILER_OPTIONS) \ $(COMPILER_DEFINES) \ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-02-07 23:11:30 UTC (rev 13461) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-02-08 01:46:01 UTC (rev 13462) @@ -29,14 +29,14 @@ VOID MachInit(VOID) { - U32 PciId; + ULONG PciId; memset(&MachVtbl, 0, sizeof(MACHVTBL)); /* Check for Xbox by identifying device at PCI 0:0:0, if it's * 0x10de/0x02a5 then we're running on an Xbox */ - WRITE_PORT_ULONG((U32*) 0xcf8, CONFIG_CMD(0, 0, 0)); - PciId = READ_PORT_ULONG((U32*) 0xcfc); + WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0)); + PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { XboxMachInit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-02-07 23:11:30 UTC (rev 13461) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-02-08 01:46:01 UTC (rev 13462) @@ -89,96 +89,43 @@ #define CONTROLLER_TIMEOUT 250 -typedef struct _CM_INT13_DRIVE_PARAMETER -{ - U16 DriveSelect; - U32 MaxCylinders; - U16 SectorsPerTrack; - U16 MaxHeads; - U16 NumberDrives; -} CM_INT13_DRIVE_PARAMETER, *PCM_INT13_DRIVE_PARAMETER; - - typedef struct _CM_DISK_GEOMETRY_DEVICE_DATA { - U32 BytesPerSector; - U32 NumberOfCylinders; - U32 SectorsPerTrack; - U32 NumberOfHeads; + ULONG BytesPerSector; + ULONG NumberOfCylinders; + ULONG SectorsPerTrack; + ULONG NumberOfHeads; } CM_DISK_GEOMETRY_DEVICE_DATA, *PCM_DISK_GEOMETRY_DEVICE_DATA; typedef struct _CM_PNP_BIOS_DEVICE_NODE { - U16 Size; - U8 Node; - U32 ProductId; - U8 DeviceType[3]; - U16 DeviceAttributes; + USHORT Size; + UCHAR Node; + ULONG ProductId; + UCHAR DeviceType[3]; + USHORT DeviceAttributes; } __attribute__((packed)) CM_PNP_BIOS_DEVICE_NODE, *PCM_PNP_BIOS_DEVICE_NODE; typedef struct _CM_PNP_BIOS_INSTALLATION_CHECK { - U8 Signature[4]; - U8 Revision; - U8 Length; - U16 ControlField; - U8 Checksum; - U32 EventFlagAddress; - U16 RealModeEntryOffset; - U16 RealModeEntrySegment; - U16 ProtectedModeEntryOffset; - U32 ProtectedModeCodeBaseAddress; - U32 OemDeviceId; - U16 RealModeDataBaseAddress; - U32 ProtectedModeDataBaseAddress; + UCHAR Signature[4]; + UCHAR Revision; + UCHAR Length; + USHORT ControlField; + UCHAR Checksum; + ULONG EventFlagAddress; + USHORT RealModeEntryOffset; + USHORT RealModeEntrySegment; + USHORT ProtectedModeEntryOffset; + ULONG ProtectedModeCodeBaseAddress; + ULONG OemDeviceId; + USHORT RealModeDataBaseAddress; + ULONG ProtectedModeDataBaseAddress; } __attribute__((packed)) CM_PNP_BIOS_INSTALLATION_CHECK, *PCM_PNP_BIOS_INSTALLATION_CHECK; -typedef struct _CM_SERIAL_DEVICE_DATA -{ - U16 Version; - U16 Revision; - U32 BaudClock; -} __attribute__((packed)) CM_SERIAL_DEVICE_DATA, *PCM_SERIAL_DEVICE_DATA; - - -typedef struct _CM_FLOPPY_DEVICE_DATA -{ - U16 Version; - U16 Revision; - CHAR Size[8]; - U32 MaxDensity; - U32 MountDensity; - - /* Version 2.0 data */ - U8 StepRateHeadUnloadTime; - U8 HeadLoadTime; - U8 MotorOffTime; - U8 SectorLengthCode; - U8 SectorPerTrack; - U8 ReadWriteGapLength; - U8 DataTransferLength; - U8 FormatGapLength; - U8 FormatFillCharacter; - U8 HeadSettleTime; - U8 MotorSettleTime; - U8 MaximumTrackValue; - U8 DataTransferRate; -} __attribute__((packed)) CM_FLOPPY_DEVICE_DATA, *PCM_FLOPPY_DEVICE_DATA; - - -typedef struct _CM_KEYBOARD_DEVICE_DATA -{ - U16 Version; - U16 Revision; - U8 Type; - U8 Subtype; - U16 KeyboardFlags; -} __attribute__((packed)) CM_KEYBOARD_DEVICE_DATA, *PCM_KEYBOARD_DEVICE_DATA; - - static char Hex[] = "0123456789ABCDEF"; static unsigned int delay_count = 1; @@ -187,28 +134,28 @@ static VOID -__KeStallExecutionProcessor(U32 Loops) +__StallExecutionProcessor(ULONG Loops) { register unsigned int i; for (i = 0; i < Loops; i++); } -VOID KeStallExecutionProcessor(U32 Microseconds) +VOID StallExecutionProcessor(ULONG Microseconds) { - U64 LoopCount = ((U64)delay_count * (U64)Microseconds) / 1000ULL; - __KeStallExecutionProcessor((U32)LoopCount); + ULONGLONG LoopCount = ((ULONGLONG)delay_count * (ULONGLONG)Microseconds) / 1000ULL; + __StallExecutionProcessor((ULONG)LoopCount); } -static U32 +static ULONG Read8254Timer(VOID) { - U32 Count; + ULONG Count; - WRITE_PORT_UCHAR((PU8)0x43, 0x00); - Count = READ_PORT_UCHAR((PU8)0x40); - Count |= READ_PORT_UCHAR((PU8)0x40) << 8; + WRITE_PORT_UCHAR((PUCHAR)0x43, 0x00); + Count = READ_PORT_UCHAR((PUCHAR)0x40); + Count |= READ_PORT_UCHAR((PUCHAR)0x40) << 8; return Count; } @@ -217,9 +164,9 @@ static VOID WaitFor8254Wraparound(VOID) { - U32 CurCount; - U32 PrevCount = ~0; - S32 Delta; + ULONG CurCount; + ULONG PrevCount = ~0; + LONG Delta; CurCount = Read8254Timer(); @@ -242,14 +189,14 @@ VOID HalpCalibrateStallExecution(VOID) { - U32 i; - U32 calib_bit; - U32 CurCount; + ULONG i; + ULONG calib_bit; + ULONG CurCount; /* Initialise timer interrupt with MILLISECOND ms interval */ - WRITE_PORT_UCHAR((PU8)0x43, 0x34); /* binary, mode 2, LSB/MSB, ch 0 */ - WRITE_PORT_UCHAR((PU8)0x40, LATCH & 0xff); /* LSB */ - WRITE_PORT_UCHAR((PU8)0x40, LATCH >> 8); /* MSB */ + WRITE_PORT_UCHAR((PUCHAR)0x43, 0x34); /* binary, mode 2, LSB/MSB, ch 0 */ + WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH & 0xff); /* LSB */ + WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH >> 8); /* MSB */ /* Stage 1: Coarse calibration */ @@ -262,7 +209,7 @@ WaitFor8254Wraparound(); - __KeStallExecutionProcessor(delay_count); /* Do the delay */ + __StallExecutionProcessor(delay_count); /* Do the delay */ CurCount = Read8254Timer(); } while (CurCount > LATCH / 2); @@ -281,7 +228,7 @@ WaitFor8254Wraparound(); - __KeStallExecutionProcessor(delay_count); /* Do the delay */ + __StallExecutionProcessor(delay_count); /* Do the delay */ CurCount = Read8254Timer(); if (CurCount <= LATCH / 2) /* If a tick has passed, turn the */ @@ -294,13 +241,13 @@ VOID -SetComponentInformation(HKEY ComponentKey, - U32 Flags, - U32 Key, - U32 Affinity) +SetComponentInformation(FRLDRHKEY ComponentKey, + ULONG Flags, + ULONG Key, + ULONG Affinity) { CM_COMPONENT_INFORMATION CompInfo; - S32 Error; + LONG Error; CompInfo.Flags = Flags; CompInfo.Version = 0; @@ -311,7 +258,7 @@ Error = RegSetValue(ComponentKey, "Component Information", REG_BINARY, - (PU8)&CompInfo, + (PUCHAR)&CompInfo, sizeof(CM_COMPONENT_INFORMATION)); if (Error != ERROR_SUCCESS) { @@ -321,23 +268,23 @@ static VOID -DetectPnpBios(HKEY SystemKey, U32 *BusNumber) +DetectPnpBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PNP_BIOS_DEVICE_NODE DeviceNode; PCM_PNP_BIOS_INSTALLATION_CHECK InstData; char Buffer[80]; - HKEY BusKey; - U32 x; - U32 NodeSize = 0; - U32 NodeCount = 0; - U8 NodeNumber; - U32 FoundNodeCount; + FRLDRHKEY BusKey; + ULONG x; + ULONG NodeSize = 0; + ULONG NodeCount = 0; + UCHAR NodeNumber; + ULONG FoundNodeCount; int i; - U32 PnpBufferSize; - U32 Size; + ULONG PnpBufferSize; + ULONG Size; char *Ptr; - S32 Error; + LONG Error; InstData = (PCM_PNP_BIOS_INSTALLATION_CHECK)PnpBiosSupported(); if (InstData == NULL || strncmp(InstData->Signature, "$PnP", 4)) @@ -388,7 +335,7 @@ Error = RegSetValue(BusKey, "Identifier", REG_SZ, - (PU8)"PNP BIOS", + (PUCHAR)"PNP BIOS", 9); if (Error != ERROR_SUCCESS) { @@ -428,7 +375,7 @@ PnpBufferSize = sizeof(CM_PNP_BIOS_INSTALLATION_CHECK); for (i = 0; i < 0xFF; i++) { - NodeNumber = (U8)i; + NodeNumber = (UCHAR)i; x = PnpBiosGetDeviceNode(&NodeNumber, (PVOID)DISKREADBUFFER); if (x == 0) @@ -466,7 +413,7 @@ Error = RegSetValue(BusKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8) FullResourceDescriptor, + (PUCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -480,15 +427,15 @@ static VOID -SetHarddiskConfigurationData(HKEY DiskKey, - U32 DriveNumber) +SetHarddiskConfigurationData(FRLDRHKEY DiskKey, + ULONG DriveNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; EXTENDED_GEOMETRY ExtGeometry; GEOMETRY Geometry; - U32 Size; - S32 Error; + ULONG Size; + LONG Error; /* Set 'Configuration Data' value */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + @@ -548,7 +495,7 @@ Error = RegSetValue(DiskKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8) FullResourceDescriptor, + (PUCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -561,16 +508,16 @@ static VOID -SetHarddiskIdentifier(HKEY DiskKey, - U32 DriveNumber) +SetHarddiskIdentifier(FRLDRHKEY DiskKey, + ULONG DriveNumber) { PMASTER_BOOT_RECORD Mbr; - U32 *Buffer; - U32 i; - U32 Checksum; - U32 Signature; + ULONG *Buffer; + ULONG i; + ULONG Checksum; + ULONG Signature; char Identifier[20]; - S32 Error; + LONG Error; /* Read the MBR */ if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) @@ -579,7 +526,7 @@ return; } - Buffer = (U32*)DISKREADBUFFER; + Buffer = (ULONG*)DISKREADBUFFER; Mbr = (PMASTER_BOOT_RECORD)DISKREADBUFFER; Signature = Mbr->Signature; @@ -621,7 +568,7 @@ Error = RegSetValue(DiskKey, "Identifier", REG_SZ, - (PU8) Identifier, + (PUCHAR) Identifier, 20); if (Error != ERROR_SUCCESS) { @@ -633,18 +580,18 @@ static VOID -DetectBiosDisks(HKEY SystemKey, - HKEY BusKey) +DetectBiosDisks(FRLDRHKEY SystemKey, + FRLDRHKEY BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_INT13_DRIVE_PARAMETER Int13Drives; GEOMETRY Geometry; CHAR Buffer[80]; - HKEY DiskKey; - U32 DiskCount; - U32 Size; - U32 i; - S32 Error; + FRLDRHKEY DiskKey; + ULONG DiskCount; + ULONG Size; + ULONG i; + LONG Error; BOOL Changed; /* Count the number of visible drives */ @@ -726,7 +673,7 @@ Error = RegSetValue(SystemKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8) FullResourceDescriptor, + (PUCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -762,10 +709,10 @@ } -static U32 +static ULONG GetFloppyCount(VOID) { - U8 Data; + UCHAR Data; WRITE_PORT_UCHAR((PUCHAR)0x70, 0x10); Data = READ_PORT_UCHAR((PUCHAR)0x71); @@ -774,10 +721,10 @@ } -static U8 -GetFloppyType(U8 DriveNumber) +static UCHAR +GetFloppyType(UCHAR DriveNumber) { - U8 Data; + UCHAR Data; WRITE_PORT_UCHAR((PUCHAR)0x70, 0x10); Data = READ_PORT_UCHAR((PUCHAR)0x71); @@ -794,28 +741,28 @@ static PVOID GetInt1eTable(VOID) { - PU16 SegPtr = (PU16)0x7A; - PU16 OfsPtr = (PU16)0x78; + PUSHORT SegPtr = (PUSHORT)0x7A; + PUSHORT OfsPtr = (PUSHORT)0x78; - return (PVOID)(((U32)(*SegPtr)) << 4) + (U32)(*OfsPtr); + return (PVOID)(((ULONG)(*SegPtr)) << 4) + (ULONG)(*OfsPtr); } static VOID -DetectBiosFloppyPeripheral(HKEY ControllerKey) +DetectBiosFloppyPeripheral(FRLDRHKEY ControllerKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_FLOPPY_DEVICE_DATA FloppyData; char KeyName[32]; char Identifier[20]; - HKEY PeripheralKey; - U32 Size; - S32 Error; - U32 FloppyNumber; - U8 FloppyType; - U32 MaxDensity[6] = {0, 360, 1200, 720, 1440, 2880}; - PU8 Ptr; + FRLDRHKEY PeripheralKey; + ULONG Size; + LONG Error; + ULONG FloppyNumber; + UCHAR FloppyType; + ULONG MaxDensity[6] = {0, 360, 1200, 720, 1440, 2880}; + PUCHAR Ptr; for (FloppyNumber = 0; FloppyNumber < 2; FloppyNumber++) { @@ -882,7 +829,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8) FullResourceDescriptor, + (PUCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -898,7 +845,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PU8)Identifier, + (PUCHAR)Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -911,15 +858,15 @@ static VOID -DetectBiosFloppyController(HKEY SystemKey, - HKEY BusKey) +DetectBiosFloppyController(FRLDRHKEY SystemKey, + FRLDRHKEY BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - HKEY ControllerKey; - U32 Size; - S32 Error; - U32 FloppyCount; + FRLDRHKEY ControllerKey; + ULONG Size; + LONG Error; + ULONG FloppyCount; FloppyCount = GetFloppyCount(); DbgPrint((DPRINT_HWDETECT, @@ -967,7 +914,8 @@ PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; - PartialDescriptor->u.Port.Start = (U64)0x03F0; + PartialDescriptor->u.Port.Start.LowPart = 0x03F0; + PartialDescriptor->u.Port.Start.HighPart = 0x0; PartialDescriptor->u.Port.Length = 8; /* Set Interrupt */ @@ -991,7 +939,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8) FullResourceDescriptor, + (PUCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1007,8 +955,8 @@ static VOID -InitializeSerialPort(U32 Port, - U32 LineControl) +InitializeSerialPort(ULONG Port, + ULONG LineControl) { WRITE_PORT_UCHAR((PUCHAR)Port + 3, 0x80); /* set DLAB on */ WRITE_PORT_UCHAR((PUCHAR)Port, 0x60); /* speed LO byte */ @@ -1020,18 +968,18 @@ } -static U32 -DetectSerialMouse(U32 Port) +static ULONG +DetectSerialMouse(ULONG Port) { CHAR Buffer[4]; - U32 i; - U32 TimeOut = 200; - U8 LineControl; + ULONG i; + ULONG TimeOut = 200; + UCHAR LineControl; /* Shutdown mouse or something like that */ LineControl = READ_PORT_UCHAR((PUCHAR)Port + 4); WRITE_PORT_UCHAR((PUCHAR)Port + 4, (LineControl & ~0x02) | 0x01); - KeStallExecutionProcessor(100000); + StallExecutionProcessor(100000); /* Clear buffer */ while (READ_PORT_UCHAR((PUCHAR)Port + 5) & 0x01) @@ -1044,14 +992,14 @@ WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x0b); /* Wait 10 milliseconds for the mouse getting ready */ - KeStallExecutionProcessor(10000); + StallExecutionProcessor(10000); /* Read first four bytes, which contains Microsoft Mouse signs */ for (i = 0; i < 4; i++) { while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) { - KeStallExecutionProcessor(1000); + StallExecutionProcessor(1000); --TimeOut; if (TimeOut == 0) return MOUSE_TYPE_NONE; @@ -1107,29 +1055,29 @@ } -static U32 -GetSerialMousePnpId(U32 Port, char *Buffer) +static ULONG +GetSerialMousePnpId(ULONG Port, char *Buffer) { - U32 TimeOut; - U32 i = 0; + ULONG TimeOut; + ULONG i = 0; char c; char x; WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x09); /* Wait 10 milliseconds for the mouse getting ready */ - KeStallExecutionProcessor(10000); + StallExecutionProcessor(10000); WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x0b); - KeStallExecutionProcessor(10000); + StallExecutionProcessor(10000); for (;;) { TimeOut = 200; while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) { - KeStallExecutionProcessor(1000); + StallExecutionProcessor(1000); --TimeOut; if (TimeOut == 0) { @@ -1150,7 +1098,7 @@ TimeOut = 200; while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) { - KeStallExecutionProcessor(1000); + StallExecutionProcessor(1000); --TimeOut; if (TimeOut == 0) return 0; @@ -1168,18 +1116,18 @@ static VOID -DetectSerialPointerPeripheral(HKEY ControllerKey, - U32 Base) +DetectSerialPointerPeripheral(FRLDRHKEY ControllerKey, + ULONG Base) { CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; char Buffer[256]; char Identifier[256]; - HKEY PeripheralKey; - U32 MouseType; - U32 Length; - U32 i; - U32 j; - S32 Error; + FRLDRHKEY PeripheralKey; + ULONG MouseType; + ULONG Length; + ULONG i; + ULONG j; + LONG Error; DbgPrint((DPRINT_HWDETECT, "DetectSerialPointerPeripheral()\n")); @@ -1332,7 +1280,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8)&FullResourceDescriptor, + (PUCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) @@ -1346,7 +1294,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PU8)Identifier, + (PUCHAR)Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -1359,28 +1307,28 @@ static VOID -DetectSerialPorts(HKEY BusKey) +DetectSerialPorts(FRLDRHKEY BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_SERIAL_DEVICE_DATA SerialDeviceData; - U32 Irq[4] = {4, 3, 4, 3}; - U32 Base; + ULONG Irq[4] = {4, 3, 4, 3}; + ULONG Base; char Buffer[80]; - PU16 BasePtr; - U32 ControllerNumber = 0; - HKEY ControllerKey; - U32 i; - S32 Error; - U32 Size; + PUSHORT BasePtr; + ULONG ControllerNumber = 0; + FRLDRHKEY ControllerKey; + ULONG i; + LONG Error; + ULONG Size; DbgPrint((DPRINT_HWDETECT, "DetectSerialPorts()\n")); ControllerNumber = 0; - BasePtr = (PU16)0x400; + BasePtr = (PUSHORT)0x400; for (i = 0; i < 4; i++, BasePtr++) { - Base = (U32)*BasePtr; + Base = (ULONG)*BasePtr; if (Base == 0) continue; @@ -1433,7 +1381,8 @@ PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; - PartialDescriptor->u.Port.Start = (U64)Base; + PartialDescriptor->u.Port.Start.LowPart = Base; + PartialDescriptor->u.Port.Start.HighPart = 0x0; PartialDescriptor->u.Port.Length = 7; /* Set Interrupt */ @@ -1460,7 +1409,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8) FullResourceDescriptor, + (PUCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1477,7 +1426,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PU8)Buffer, + (PUCHAR)Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1499,27 +1448,27 @@ static VOID -DetectParallelPorts(HKEY BusKey) +DetectParallelPorts(FRLDRHKEY BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - U32 Irq[3] = {7, 5, (U32)-1}; + ULONG Irq[3] = {7, 5, (ULONG)-1}; char Buffer[80]; - HKEY ControllerKey; - PU16 BasePtr; - U32 Base; - U32 ControllerNumber; - U32 i; - S32 Error; - U32 Size; + FRLDRHKEY ControllerKey; + PUSHORT BasePtr; + ULONG Base; + ULONG ControllerNumber; + ULONG i; + LONG Error; + ULONG Size; DbgPrint((DPRINT_HWDETECT, "DetectParallelPorts() called\n")); ControllerNumber = 0; - BasePtr = (PU16)0x408; + BasePtr = (PUSHORT)0x408; for (i = 0; i < 3; i++, BasePtr++) { - Base = (U32)*BasePtr; + Base = (ULONG)*BasePtr; if (Base == 0) continue; @@ -1551,7 +1500,7 @@ /* Build full device descriptor */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR); - if (Irq[i] != (U32)-1) + if (Irq[i] != (ULONG)-1) Size += sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); FullResourceDescriptor = MmAllocateMemory(Size); @@ -1566,18 +1515,19 @@ /* Initialize resource descriptor */ FullResourceDescriptor->InterfaceType = Isa; FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Count = (Irq[i] != (U32)-1) ? 2 : 1; + FullResourceDescriptor->PartialResourceList.Count = (Irq[i] != (ULONG)-1) ? 2 : 1; /* Set IO Port */ PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; - PartialDescriptor->u.Port.Start = (U64)Base; + PartialDescriptor->u.Port.Start.LowPart = Base; + PartialDescriptor->u.Port.Start.HighPart = 0x0; PartialDescriptor->u.Port.Length = 3; /* Set Interrupt */ - if (Irq[i] != (U32)-1) + if (Irq[i] != (ULONG)-1) { PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeInterrupt; @@ -1592,7 +1542,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8) FullResourceDescriptor, + (PUCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1609,7 +1559,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PU8)Buffer, + (PUCHAR)Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1638,7 +1588,7 @@ WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA, 0xF2); - KeStallExecutionProcessor(10000); + StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); if ((Status & 0x01) != 0x01) @@ -1654,7 +1604,7 @@ return FALSE; } - KeStallExecutionProcessor(10000); + StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); if ((Status & 0x01) != 0x01) { @@ -1669,7 +1619,7 @@ return FALSE; } - KeStallExecutionProcessor(10000); + StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); if ((Status & 0x01) != 0x01) { @@ -1690,15 +1640,15 @@ static VOID -DetectKeyboardPeripheral(HKEY ControllerKey) +DetectKeyboardPeripheral(FRLDRHKEY ControllerKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_KEYBOARD_DEVICE_DATA KeyboardData; - HKEY PeripheralKey; + FRLDRHKEY PeripheralKey; char Buffer[80]; - U32 Size; - S32 Error; + ULONG Size; + LONG Error; if (DetectKeyboardDevice()) { @@ -1752,7 +1702,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8)FullResourceDescriptor, + (PUCHAR)FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1768,7 +1718,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PU8)Buffer, + (PUCHAR)Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1781,13 +1731,13 @@ static VOID -DetectKeyboardController(HKEY BusKey) +DetectKeyboardController(FRLDRHKEY BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - HKEY ControllerKey; - U32 Size; - S32 Error; + FRLDRHKEY ControllerKey; + ULONG Size; + LONG Error; /* Create controller key */ Error = RegCreateKey(BusKey, @@ -1837,7 +1787,8 @@ PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; - PartialDescriptor->u.Port.Start = (U64)0x60; + PartialDescriptor->u.Port.Start.LowPart = 0x60; + PartialDescriptor->u.Port.Start.HighPart = 0x0; PartialDescriptor->u.Port.Length = 1; /* Set IO Port 0x64 */ @@ -1845,14 +1796,15 @@ PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; - PartialDescriptor->u.Port.Start = (U64)0x64; + PartialDescriptor->u.Port.Start.LowPart = 0x64; + PartialDescriptor->u.Port.Start.HighPart = 0x0; PartialDescriptor->u.Port.Length = 1; /* Set 'Configuration Data' value */ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8)FullResourceDescriptor, + (PUCHAR)FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1870,8 +1822,8 @@ static VOID PS2ControllerWait(VOID) { - U32 Timeout; - U8 Status; + ULONG Timeout; + UCHAR Status; for (Timeout = 0; Timeout < CONTROLLER_TIMEOUT; Timeout++) [truncated at 1000 lines; 13197 more skipped]

19 years, 10 months

[ea] 13461: Typographic errors fixed and a function name changed.

by ea＠svn.reactos.com

Typographic errors fixed and a function name changed. Modified: trunk/reactos/lib/smdll/execpgm.c Modified: trunk/reactos/lib/smdll/readme.txt Modified: trunk/reactos/lib/smdll/smdll.def _____ Modified: trunk/reactos/lib/smdll/execpgm.c --- trunk/reactos/lib/smdll/execpgm.c 2005-02-07 12:58:08 UTC (rev 13460) +++ trunk/reactos/lib/smdll/execpgm.c 2005-02-07 23:11:30 UTC (rev 13461) @@ -12,7 +12,7 @@ #include <string.h> NTSTATUS STDCALL -SmExecPgm (HANDLE hSmApiPort, PUNICODE_STRING Pgm) +SmExecuteProgram (HANDLE hSmApiPort, PUNICODE_STRING Pgm) { NTSTATUS Status; SM_PORT_MESSAGE SmReqMsg; _____ Modified: trunk/reactos/lib/smdll/readme.txt --- trunk/reactos/lib/smdll/readme.txt 2005-02-07 12:58:08 UTC (rev 13460) +++ trunk/reactos/lib/smdll/readme.txt 2005-02-07 23:11:30 UTC (rev 13461) @@ -4,11 +4,11 @@ It should be linked in the following components: -a) the SM itself, because iy registers for managing native processes +a) the SM itself, because it registers for managing native processes IMAGE_SUBSYSTEM_NATIVE; b) environment subsystem servers, because each one should register in - the SM its own subsystem (willing to manageg those processes); + the SM its own subsystem (willing to manage those processes); c) terminal emulators for optional subsystems, like posixw32 and os2w32, to ask the SM to start the optional subsystem server they need connect to; _____ Modified: trunk/reactos/lib/smdll/smdll.def --- trunk/reactos/lib/smdll/smdll.def 2005-02-07 12:58:08 UTC (rev 13460) +++ trunk/reactos/lib/smdll/smdll.def 2005-02-07 23:11:30 UTC (rev 13461) @@ -2,4 +2,4 @@ EXPORTS SmCompleteSession@12 SmConnectApiPort@16 -SmExecPgm@8 \ No newline at end of file +SmExecuteProgram@8

19 years, 10 months

[weiden] 13460: revert moving smdll to rosrtl.

by weiden＠svn.reactos.com

revert moving smdll to rosrtl. Modified: trunk/reactos/Makefile Modified: trunk/reactos/bootdata/packages/reactos.dff Deleted: trunk/reactos/include/rosrtl/smapi.h Deleted: trunk/reactos/include/rosrtl/smhelper.h Added: trunk/reactos/include/sm/ Added: trunk/reactos/include/sm/api.h Added: trunk/reactos/include/sm/helper.h Modified: trunk/reactos/lib/rosrtl/makefile Deleted: trunk/reactos/lib/rosrtl/sm/ Added: trunk/reactos/lib/smdll/ Added: trunk/reactos/lib/smdll/compses.c Added: trunk/reactos/lib/smdll/connect.c Added: trunk/reactos/lib/smdll/dllmain.c Added: trunk/reactos/lib/smdll/execpgm.c Added: trunk/reactos/lib/smdll/makefile Added: trunk/reactos/lib/smdll/readme.txt Added: trunk/reactos/lib/smdll/smdll.def Added: trunk/reactos/lib/smdll/smdll.rc Added: trunk/reactos/lib/smdll/testapi.c _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/Makefile 2005-02-07 12:58:08 UTC (rev 13460) @@ -58,7 +58,7 @@ DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ - packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup \ + packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smdll snmpapi syssetup \ twain unicode user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ urlmon shdocvw dinput dinput8 dxdiagn devenum dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-02-07 12:58:08 UTC (rev 13460) @@ -116,6 +116,7 @@ lib\shdocvw\shdocvw.dll 1 lib\shell32\shell32.dll 1 lib\shlwapi\shlwapi.dll 1 +lib\smdll\smdll.dll 1 lib\syssetup\syssetup.dll 1 lib\twain\twain_32.dll 1 lib\urlmon\urlmon.dll 1 _____ Deleted: trunk/reactos/include/rosrtl/smapi.h --- trunk/reactos/include/rosrtl/smapi.h 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/include/rosrtl/smapi.h 2005-02-07 12:58:08 UTC (rev 13460) @@ -1,72 +0,0 @@ -/* $Id$ */ -#ifndef __ROSRTL_SM_API_H -#define __ROSRTL_SM_API_H - -#define SM_API_PORT_NAME L"\\SmApiPort" -#define SM_DBGSS_PORT_NAME L"\\DbgSsApiPort" -#define SM_DBGUI_PORT_NAME L"\\DbgUiApiPort" - -#pragma pack(push,4) - -/*** 1 ****************************************************************/ - -#define SM_API_COMPLETE_SESSION 1 /* complete a session initialization */ - -typedef struct _SM_PORT_MESSAGE_COMPSES -{ - HANDLE hApiPort; - HANDLE hSbApiPort; - -} SM_PORT_MESSAGE_COMPSES, *PSM_PORT_MESSAGE_COMPSES; - -/*** 2 ****************************************************************/ - -#define SM_API_2 2 - -/* obsolete */ - -/*** 3 ****************************************************************/ - -#define SM_API_3 3 - -/* unknown */ - -/*** 4 ****************************************************************/ - -#define SM_API_EXECUTE_PROGRAMME 4 /* start a subsystem (server) */ - -#define SM_EXEXPGM_MAX_LENGTH 32 /* max count of wide string */ - -typedef struct _SM_PORT_MESSAGE_EXECPGM -{ - ULONG NameLength; - WCHAR Name [SM_EXEXPGM_MAX_LENGTH]; - -} SM_PORT_MESSAGE_EXECPGM, *PSM_PORT_MESSAGE_EXECPGM; - -/*** | ****************************************************************/ - -typedef struct _SM_PORT_MESSAGE -{ - /*** LPC common header ***/ - LPC_MESSAGE Header; - /*** SM common header ***/ - DWORD ApiIndex; - NTSTATUS Status; - /*** SM per API arguments ***/ - union { - SM_PORT_MESSAGE_COMPSES CompSes; - SM_PORT_MESSAGE_EXECPGM ExecPgm; - }; - -} SM_PORT_MESSAGE, * PSM_PORT_MESSAGE; - -#pragma pack(pop) - -/*** MACRO ***********************************************************/ - -#define SM_PORT_DATA_SIZE(c) (sizeof(DWORD)+sizeof(NTSTATUS)+sizeof(c)) -#define SM_PORT_MESSAGE_SIZE (sizeof(SM_PORT_MESSAGE)) - - -#endif /* !def __ROSRTL_SM_API_H */ _____ Deleted: trunk/reactos/include/rosrtl/smhelper.h --- trunk/reactos/include/rosrtl/smhelper.h 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/include/rosrtl/smhelper.h 2005-02-07 12:58:08 UTC (rev 13460) @@ -1,46 +0,0 @@ -#ifndef _ROSRTL_SM_HELPER_H - -/*** DATA TYPES ******************************************************/ - -#define SM_SB_NAME_MAX_LENGTH 120 - -#pragma pack(push,4) - -/* SmConnectApiPort */ -typedef struct _SM_CONNECT_DATA -{ - ULONG Subsystem; - WCHAR SbName [SM_SB_NAME_MAX_LENGTH]; - -} SM_CONNECT_DATA, *PSM_CONNECT_DATA; - -/* SmpConnectSbApiPort */ -typedef struct _SB_CONNECT_DATA -{ - ULONG SmApiMax; -} SB_CONNECT_DATA, *PSB_CONNECT_DATA; - -#pragma pack(pop) - - -/*** PROTOTYPES ******************************************************/ - - -/* smdll/connect.c */ -NTSTATUS STDCALL -SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, - IN HANDLE hSbApiPort OPTIONAL, - IN DWORD dwSubsystem OPTIONAL, /* pe.h */ - IN OUT PHANDLE phSmApiPort); -/* smdll/compses.c */ -NTSTATUS STDCALL -SmCompleteSession (IN HANDLE hSmApiPort, - IN HANDLE hSbApiPort, - IN HANDLE hApiPort); -/* smdll/execpgm.c */ -NTSTATUS STDCALL -SmExecuteProgram (IN HANDLE hSmApiPort, - IN PUNICODE_STRING Pgm - ); - -#endif /* ndef _ROSRTL_SM_HELPER_H */ _____ Added: trunk/reactos/include/sm/api.h --- trunk/reactos/include/sm/api.h 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/include/sm/api.h 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,72 @@ +/* $Id$ */ +#ifndef __SM_API_H +#define __SM_API_H + +#define SM_API_PORT_NAME L"\\SmApiPort" +#define SM_DBGSS_PORT_NAME L"\\DbgSsApiPort" +#define SM_DBGUI_PORT_NAME L"\\DbgUiApiPort" + +#pragma pack(push,4) + +/*** 1 ****************************************************************/ + +#define SM_API_COMPLETE_SESSION 1 /* complete a session initialization */ + +typedef struct _SM_PORT_MESSAGE_COMPSES +{ + HANDLE hApiPort; + HANDLE hSbApiPort; + +} SM_PORT_MESSAGE_COMPSES, *PSM_PORT_MESSAGE_COMPSES; + +/*** 2 ****************************************************************/ + +#define SM_API_2 2 + +/* obsolete */ + +/*** 3 ****************************************************************/ + +#define SM_API_3 3 + +/* unknown */ + +/*** 4 ****************************************************************/ + +#define SM_API_EXECUTE_PROGRAMME 4 /* start a subsystem (server) */ + +#define SM_EXEXPGM_MAX_LENGTH 32 /* max count of wide string */ + +typedef struct _SM_PORT_MESSAGE_EXECPGM +{ + ULONG NameLength; + WCHAR Name [SM_EXEXPGM_MAX_LENGTH]; + +} SM_PORT_MESSAGE_EXECPGM, *PSM_PORT_MESSAGE_EXECPGM; + +/*** | ****************************************************************/ + +typedef struct _SM_PORT_MESSAGE +{ + /*** LPC common header ***/ + LPC_MESSAGE Header; + /*** SM common header ***/ + DWORD ApiIndex; + NTSTATUS Status; + /*** SM per API arguments ***/ + union { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + }; + +} SM_PORT_MESSAGE, * PSM_PORT_MESSAGE; + +#pragma pack(pop) + +/*** MACRO ***********************************************************/ + +#define SM_PORT_DATA_SIZE(c) (sizeof(DWORD)+sizeof(NTSTATUS)+sizeof(c)) +#define SM_PORT_MESSAGE_SIZE (sizeof(SM_PORT_MESSAGE)) + + +#endif /* !def __SM_API_H */ Property changes on: trunk/reactos/include/sm/api.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/include/sm/helper.h --- trunk/reactos/include/sm/helper.h 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/include/sm/helper.h 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,46 @@ +#ifndef _SM_HELPER_H + +/*** DATA TYPES ******************************************************/ + +#define SM_SB_NAME_MAX_LENGTH 120 + +#pragma pack(push,4) + +/* SmConnectApiPort */ +typedef struct _SM_CONNECT_DATA +{ + ULONG Subsystem; + WCHAR SbName [SM_SB_NAME_MAX_LENGTH]; + +} SM_CONNECT_DATA, *PSM_CONNECT_DATA; + +/* SmpConnectSbApiPort */ +typedef struct _SB_CONNECT_DATA +{ + ULONG SmApiMax; +} SB_CONNECT_DATA, *PSB_CONNECT_DATA; + +#pragma pack(pop) + + +/*** PROTOTYPES ******************************************************/ + + +/* smdll/connect.c */ +NTSTATUS STDCALL +SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, + IN HANDLE hSbApiPort OPTIONAL, + IN DWORD dwSubsystem OPTIONAL, /* pe.h */ + IN OUT PHANDLE phSmApiPort); +/* smdll/compses.c */ +NTSTATUS STDCALL +SmCompleteSession (IN HANDLE hSmApiPort, + IN HANDLE hSbApiPort, + IN HANDLE hApiPort); +/* smdll/execpgm.c */ +NTSTATUS STDCALL +SmExecuteProgram (IN HANDLE hSmApiPort, + IN PUNICODE_STRING Pgm + ); + +#endif /* ndef _SM_HELPER_H */ Property changes on: trunk/reactos/include/sm/helper.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/rosrtl/makefile --- trunk/reactos/lib/rosrtl/makefile 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/rosrtl/makefile 2005-02-07 12:58:08 UTC (rev 13460) @@ -33,12 +33,6 @@ file/sparse.o \ file/path.o -SM_OBJECTS = \ - sm/compses.o \ - sm/connect.o \ - sm/execpgm.o \ - sm/testapi.o - RECMUTEX_OBJECTS = recmutex/recmutex.o include $(PATH_TO_TOP)/config @@ -52,8 +46,7 @@ TARGET_CFLAGS = -D__USE_W32API -Wall -Werror TARGET_OBJECTS = $(THREAD_OBJECTS) $(MISC_OBJECTS) $(STRING_OBJECTS) \ - $(REGISTRY_OBJECTS) $(FILE_OBJECTS) $(RECMUTEX_OBJECTS) \ - $(SM_OBJECTS) + $(REGISTRY_OBJECTS) $(FILE_OBJECTS) $(RECMUTEX_OBJECTS) DEP_OBJECTS = $(TARGET_OBJECTS) _____ Added: trunk/reactos/lib/smdll/compses.c --- trunk/reactos/lib/smdll/compses.c 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/smdll/compses.c 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,39 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/smlib/compses.c + * PURPOSE: Call SM API SM_API_COMPLETE_SESSION + */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <sm/api.h> +#include <sm/helper.h> + +NTSTATUS STDCALL +SmCompleteSession (HANDLE hSmApiPort, HANDLE hSbApiPort, HANDLE hApiPort) +{ + NTSTATUS Status; + SM_PORT_MESSAGE SmReqMsg; + + /* Marshal Ses in the LPC message */ + SmReqMsg.CompSes.hApiPort = hApiPort; + SmReqMsg.CompSes.hSbApiPort = hSbApiPort; + + /* SM API to invoke */ + SmReqMsg.ApiIndex = SM_API_COMPLETE_SESSION; + + /* Port message */ + SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.CompSes); + SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; + Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); + if (NT_SUCCESS(Status)) + { + return SmReqMsg.Status; + } + DbgPrint ("%s failed (Status=0x%08lx)\n", __FUNCTION__, Status); + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/lib/smdll/compses.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/smdll/connect.c --- trunk/reactos/lib/smdll/connect.c 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/smdll/connect.c 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,83 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: reactos/lib/smdll/connect.c + * PURPOSE: Connect to the API LPC port exposed by the SM + */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <sm/api.h> +#include <sm/helper.h> +#include <pe.h> + +/********************************************************************** + * NAME EXPORTED + * SmConnectApiPort/4 + * + * DESCRIPTION + * Connect to SM API port and register a session "begin" port (Sb) + * or to issue API requests to SmApiPort. + * + * ARGUMENTS + * pSbApiPortName: name of the Sb port the calling subsystem + * server already created in the system name space; + * hSbApiPort: LPC port handle (checked, but not used); + * dwSubsystem: a valid IMAGE_SUBSYSTEM_xxx value; + * phSmApiPort: a pointer to a HANDLE, which will be + * filled with a valid client-side LPC comm port. + * + * RETURN VALUE + * If all three optional values are omitted, an LPC status. + * STATUS_INVALID_PARAMETER_MIX if PortName is defined and + * both hSbApiPort and dwSubsystem are 0. + */ +NTSTATUS STDCALL +SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, + IN HANDLE hSbApiPort OPTIONAL, + IN DWORD dwSubsystem OPTIONAL, + IN OUT PHANDLE phSmApiPort) +{ + UNICODE_STRING SmApiPortName; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + NTSTATUS Status = STATUS_SUCCESS; + SM_CONNECT_DATA ConnectData = {0,{0}}; + ULONG ConnectDataLength = 0; + + if (pSbApiPortName) + { + if (NULL == hSbApiPort || IMAGE_SUBSYSTEM_UNKNOWN == dwSubsystem) + { + return STATUS_INVALID_PARAMETER_MIX; + } + ConnectData.Subsystem = dwSubsystem; + memmove (& ConnectData.SbName, pSbApiPortName->Buffer, pSbApiPortName->Length); + } + ConnectDataLength = sizeof (ConnectData); + + SecurityQos.Length = sizeof (SecurityQos); + SecurityQos.ImpersonationLevel = SecurityIdentification; + SecurityQos.ContextTrackingMode = TRUE; + SecurityQos.EffectiveOnly = TRUE; + + RtlInitUnicodeString (& SmApiPortName, SM_API_PORT_NAME); + + Status = NtConnectPort ( + phSmApiPort, + & SmApiPortName, + & SecurityQos, + NULL, + NULL, + NULL, + & ConnectData, + & ConnectDataLength + ); + if (NT_SUCCESS(Status)) + { + return STATUS_SUCCESS; + } + DbgPrint ("%s failed (Status=0x%08lx)\n", __FUNCTION__, Status); + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/lib/smdll/connect.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/smdll/dllmain.c --- trunk/reactos/lib/smdll/dllmain.c 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/smdll/dllmain.c 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,17 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/smdll/dllmain.c + * PURPOSE: SM Helper Library + */ + +#define NTOS_MODE_USER +#include <ntos.h> + +BOOL STDCALL DllMain(HANDLE hinstDll, DWORD fdwReason, LPVOID fImpLoad) +{ + return TRUE; +} + +/* EOF */ Property changes on: trunk/reactos/lib/smdll/dllmain.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/smdll/execpgm.c --- trunk/reactos/lib/smdll/execpgm.c 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/smdll/execpgm.c 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,49 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/smdll/execpgm.c + * PURPOSE: Call SM API SM_API_EXECPGM + */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <sm/api.h> +#include <sm/helper.h> +#include <string.h> + +NTSTATUS STDCALL +SmExecPgm (HANDLE hSmApiPort, PUNICODE_STRING Pgm) +{ + NTSTATUS Status; + SM_PORT_MESSAGE SmReqMsg; + + + /* Check Pgm's length */ + if (Pgm->Length > (sizeof (Pgm->Buffer[0]) * SM_EXEXPGM_MAX_LENGTH)) + { + return STATUS_INVALID_PARAMETER; + } + /* Marshal Pgm in the LPC message */ + RtlZeroMemory (& SmReqMsg, sizeof SmReqMsg); + SmReqMsg.ExecPgm.NameLength = Pgm->Length; + RtlCopyMemory (SmReqMsg.ExecPgm.Name, Pgm->Buffer, Pgm->Length); + + /* SM API to invoke */ + SmReqMsg.ApiIndex = SM_API_EXECUTE_PROGRAMME; + + /* LPC message */ + SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.ExecPgm); + SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; + + /* Call SM and wait for a reply */ + Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); + if (NT_SUCCESS(Status)) + { + return SmReqMsg.Status; + } + DbgPrint ("%s failed (Status=0x%08lx)\n", __FUNCTION__, Status); + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/lib/smdll/execpgm.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/smdll/makefile --- trunk/reactos/lib/smdll/makefile 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/smdll/makefile 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,34 @@ +# $Id$ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = dynlink + +TARGET_NAME = smdll + +TARGET_SDKLIBS = ntdll.a + +TARGET_CFLAGS = -I./include -Wall -Werror + +# require os code to explicitly request A/W version of structs/functions +TARGET_CFLAGS += -D_DISABLE_TIDENTS + +TARGET_LFLAGS = -nostartfiles -nostdlib + +#TARGET_BASE = + +TARGET_OBJECTS = \ + dllmain.o \ + connect.o \ + execpgm.o \ + compses.o + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk + +# EOF Property changes on: trunk/reactos/lib/smdll/makefile ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/smdll/readme.txt --- trunk/reactos/lib/smdll/readme.txt 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/smdll/readme.txt 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,18 @@ +$Id$ + +This is SMDLL: a helper library to talk to the ReactOS session manager (SM). + +It should be linked in the following components: + +a) the SM itself, because iy registers for managing native processes + IMAGE_SUBSYSTEM_NATIVE; + +b) environment subsystem servers, because each one should register in + the SM its own subsystem (willing to manageg those processes); + +c) terminal emulators for optional subsystems, like posixw32 and os2w32, + to ask the SM to start the optional subsystem server they need connect to; + +d) system and development utilites to debug/query the SM. + +2004-02-15 ea \ No newline at end of file Property changes on: trunk/reactos/lib/smdll/readme.txt ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/smdll/smdll.def --- trunk/reactos/lib/smdll/smdll.def 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/smdll/smdll.def 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,5 @@ +LIBRARY SMDLL.DLL +EXPORTS +SmCompleteSession@12 +SmConnectApiPort@16 +SmExecPgm@8 \ No newline at end of file Property changes on: trunk/reactos/lib/smdll/smdll.def ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/smdll/smdll.rc --- trunk/reactos/lib/smdll/smdll.rc 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/smdll/smdll.rc 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS SM Helper\0" +#define REACTOS_STR_INTERNAL_NAME "smdll.dll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "smdll.dll\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/lib/smdll/smdll.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/smdll/testapi.c --- trunk/reactos/lib/smdll/testapi.c 2005-02-07 11:35:29 UTC (rev 13459) +++ trunk/reactos/lib/smdll/testapi.c 2005-02-07 12:58:08 UTC (rev 13460) @@ -0,0 +1,20 @@ +/* $Id$ */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <sm/api.h> + +VOID STDCALL SmPrintPortMessage (PSM_PORT_MESSAGE SmMessage) +{ + DbgPrint ("SM_PORT_MESSAGE %08lx:\n", (ULONG) SmMessage); + DbgPrint (" Header:\n"); + DbgPrint (" MessageType = %u\n", SmMessage->Header.MessageType); + DbgPrint (" DataSize = %d\n", SmMessage->Header.DataSize); + DbgPrint (" MessageSize = %d\n", SmMessage->Header.MessageSize); + DbgPrint (" ApiIndex = %ld\n", SmMessage->ApiIndex); + DbgPrint (" Status = %08lx\n", SmMessage->Status); + DbgPrint (" ExecPgm:\n"); + DbgPrint (" NameLength = %ld\n", SmMessage->ExecPgm.NameLength); + DbgPrint (" Name = %ls\n", (LPWSTR) & SmMessage->ExecPgm.Name); +} +/* EOF */ + Property changes on: trunk/reactos/lib/smdll/testapi.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

19 years, 10 months

[weiden] 13459: moved smdll to rosrtl. We just _can't_ have separate dlls for everything internal, that's what static libraries are for. Unless we want a dll hell even worse than necessary...

by weiden＠svn.reactos.com

moved smdll to rosrtl. We just _can't_ have separate dlls for everything internal, that's what static libraries are for. Unless we want a dll hell even worse than necessary... Deleted: trunk/reactos/include/sm/

19 years, 10 months

[weiden] 13458: moved smdll to rosrtl. We just _can't_ have separate dlls for everything internal, that's what static libraries are for. Unless we want a dll hell even worse than necessary...

by weiden＠svn.reactos.com

19 years, 10 months

[weiden] 13457: moved smdll to rosrtl. We just _can't_ have separate dlls for everything internal, that's what static libraries are for. Unless we want a dll hell even worse than necessary...

by weiden＠svn.reactos.com

moved smdll to rosrtl. We just _can't_ have separate dlls for everything internal, that's what static libraries are for. Unless we want a dll hell even worse than necessary... Modified: trunk/reactos/Makefile Modified: trunk/reactos/bootdata/packages/reactos.dff Added: trunk/reactos/include/rosrtl/smapi.h Added: trunk/reactos/include/rosrtl/smhelper.h Modified: trunk/reactos/lib/rosrtl/makefile Added: trunk/reactos/lib/rosrtl/sm/ Added: trunk/reactos/lib/rosrtl/sm/compses.c Added: trunk/reactos/lib/rosrtl/sm/connect.c Added: trunk/reactos/lib/rosrtl/sm/execpgm.c Added: trunk/reactos/lib/rosrtl/sm/readme.txt Added: trunk/reactos/lib/rosrtl/sm/testapi.c _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/Makefile 2005-02-07 11:34:52 UTC (rev 13457) @@ -58,7 +58,7 @@ DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ - packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smdll snmpapi syssetup \ + packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup \ twain unicode user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ urlmon shdocvw dinput dinput8 dxdiagn devenum dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-02-07 11:34:52 UTC (rev 13457) @@ -116,7 +116,6 @@ lib\shdocvw\shdocvw.dll 1 lib\shell32\shell32.dll 1 lib\shlwapi\shlwapi.dll 1 -lib\smdll\smdll.dll 1 lib\syssetup\syssetup.dll 1 lib\twain\twain_32.dll 1 lib\urlmon\urlmon.dll 1 _____ Added: trunk/reactos/include/rosrtl/smapi.h --- trunk/reactos/include/rosrtl/smapi.h 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/include/rosrtl/smapi.h 2005-02-07 11:34:52 UTC (rev 13457) @@ -0,0 +1,72 @@ +/* $Id$ */ +#ifndef __ROSRTL_SM_API_H +#define __ROSRTL_SM_API_H + +#define SM_API_PORT_NAME L"\\SmApiPort" +#define SM_DBGSS_PORT_NAME L"\\DbgSsApiPort" +#define SM_DBGUI_PORT_NAME L"\\DbgUiApiPort" + +#pragma pack(push,4) + +/*** 1 ****************************************************************/ + +#define SM_API_COMPLETE_SESSION 1 /* complete a session initialization */ + +typedef struct _SM_PORT_MESSAGE_COMPSES +{ + HANDLE hApiPort; + HANDLE hSbApiPort; + +} SM_PORT_MESSAGE_COMPSES, *PSM_PORT_MESSAGE_COMPSES; + +/*** 2 ****************************************************************/ + +#define SM_API_2 2 + +/* obsolete */ + +/*** 3 ****************************************************************/ + +#define SM_API_3 3 + +/* unknown */ + +/*** 4 ****************************************************************/ + +#define SM_API_EXECUTE_PROGRAMME 4 /* start a subsystem (server) */ + +#define SM_EXEXPGM_MAX_LENGTH 32 /* max count of wide string */ + +typedef struct _SM_PORT_MESSAGE_EXECPGM +{ + ULONG NameLength; + WCHAR Name [SM_EXEXPGM_MAX_LENGTH]; + +} SM_PORT_MESSAGE_EXECPGM, *PSM_PORT_MESSAGE_EXECPGM; + +/*** | ****************************************************************/ + +typedef struct _SM_PORT_MESSAGE +{ + /*** LPC common header ***/ + LPC_MESSAGE Header; + /*** SM common header ***/ + DWORD ApiIndex; + NTSTATUS Status; + /*** SM per API arguments ***/ + union { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + }; + +} SM_PORT_MESSAGE, * PSM_PORT_MESSAGE; + +#pragma pack(pop) + +/*** MACRO ***********************************************************/ + +#define SM_PORT_DATA_SIZE(c) (sizeof(DWORD)+sizeof(NTSTATUS)+sizeof(c)) +#define SM_PORT_MESSAGE_SIZE (sizeof(SM_PORT_MESSAGE)) + + +#endif /* !def __ROSRTL_SM_API_H */ Property changes on: trunk/reactos/include/rosrtl/smapi.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/include/rosrtl/smhelper.h --- trunk/reactos/include/rosrtl/smhelper.h 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/include/rosrtl/smhelper.h 2005-02-07 11:34:52 UTC (rev 13457) @@ -0,0 +1,46 @@ +#ifndef _ROSRTL_SM_HELPER_H + +/*** DATA TYPES ******************************************************/ + +#define SM_SB_NAME_MAX_LENGTH 120 + +#pragma pack(push,4) + +/* SmConnectApiPort */ +typedef struct _SM_CONNECT_DATA +{ + ULONG Subsystem; + WCHAR SbName [SM_SB_NAME_MAX_LENGTH]; + +} SM_CONNECT_DATA, *PSM_CONNECT_DATA; + +/* SmpConnectSbApiPort */ +typedef struct _SB_CONNECT_DATA +{ + ULONG SmApiMax; +} SB_CONNECT_DATA, *PSB_CONNECT_DATA; + +#pragma pack(pop) + + +/*** PROTOTYPES ******************************************************/ + + +/* smdll/connect.c */ +NTSTATUS STDCALL +SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, + IN HANDLE hSbApiPort OPTIONAL, + IN DWORD dwSubsystem OPTIONAL, /* pe.h */ + IN OUT PHANDLE phSmApiPort); +/* smdll/compses.c */ +NTSTATUS STDCALL +SmCompleteSession (IN HANDLE hSmApiPort, + IN HANDLE hSbApiPort, + IN HANDLE hApiPort); +/* smdll/execpgm.c */ +NTSTATUS STDCALL +SmExecuteProgram (IN HANDLE hSmApiPort, + IN PUNICODE_STRING Pgm + ); + +#endif /* ndef _ROSRTL_SM_HELPER_H */ Property changes on: trunk/reactos/include/rosrtl/smhelper.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/rosrtl/makefile --- trunk/reactos/lib/rosrtl/makefile 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/lib/rosrtl/makefile 2005-02-07 11:34:52 UTC (rev 13457) @@ -33,6 +33,12 @@ file/sparse.o \ file/path.o +SM_OBJECTS = \ + sm/compses.o \ + sm/connect.o \ + sm/execpgm.o \ + sm/testapi.o + RECMUTEX_OBJECTS = recmutex/recmutex.o include $(PATH_TO_TOP)/config @@ -46,7 +52,8 @@ TARGET_CFLAGS = -D__USE_W32API -Wall -Werror TARGET_OBJECTS = $(THREAD_OBJECTS) $(MISC_OBJECTS) $(STRING_OBJECTS) \ - $(REGISTRY_OBJECTS) $(FILE_OBJECTS) $(RECMUTEX_OBJECTS) + $(REGISTRY_OBJECTS) $(FILE_OBJECTS) $(RECMUTEX_OBJECTS) \ + $(SM_OBJECTS) DEP_OBJECTS = $(TARGET_OBJECTS) _____ Added: trunk/reactos/lib/rosrtl/sm/compses.c --- trunk/reactos/lib/rosrtl/sm/compses.c 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/lib/rosrtl/sm/compses.c 2005-02-07 11:34:52 UTC (rev 13457) @@ -0,0 +1,39 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/smlib/compses.c + * PURPOSE: Call SM API SM_API_COMPLETE_SESSION + */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <rosrtl/smapi.h> +#include <rosrtl/smhelper.h> + +NTSTATUS STDCALL +SmCompleteSession (HANDLE hSmApiPort, HANDLE hSbApiPort, HANDLE hApiPort) +{ + NTSTATUS Status; + SM_PORT_MESSAGE SmReqMsg; + + /* Marshal Ses in the LPC message */ + SmReqMsg.CompSes.hApiPort = hApiPort; + SmReqMsg.CompSes.hSbApiPort = hSbApiPort; + + /* SM API to invoke */ + SmReqMsg.ApiIndex = SM_API_COMPLETE_SESSION; + + /* Port message */ + SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.CompSes); + SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; + Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); + if (NT_SUCCESS(Status)) + { + return SmReqMsg.Status; + } + DbgPrint ("%s failed (Status=0x%08lx)\n", __FUNCTION__, Status); + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/lib/rosrtl/sm/compses.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rosrtl/sm/connect.c --- trunk/reactos/lib/rosrtl/sm/connect.c 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/lib/rosrtl/sm/connect.c 2005-02-07 11:34:52 UTC (rev 13457) @@ -0,0 +1,83 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: reactos/lib/smdll/connect.c + * PURPOSE: Connect to the API LPC port exposed by the SM + */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <rosrtl/smapi.h> +#include <rosrtl/smhelper.h> +#include <pe.h> + +/********************************************************************** + * NAME EXPORTED + * SmConnectApiPort/4 + * + * DESCRIPTION + * Connect to SM API port and register a session "begin" port (Sb) + * or to issue API requests to SmApiPort. + * + * ARGUMENTS + * pSbApiPortName: name of the Sb port the calling subsystem + * server already created in the system name space; + * hSbApiPort: LPC port handle (checked, but not used); + * dwSubsystem: a valid IMAGE_SUBSYSTEM_xxx value; + * phSmApiPort: a pointer to a HANDLE, which will be + * filled with a valid client-side LPC comm port. + * + * RETURN VALUE + * If all three optional values are omitted, an LPC status. + * STATUS_INVALID_PARAMETER_MIX if PortName is defined and + * both hSbApiPort and dwSubsystem are 0. + */ +NTSTATUS STDCALL +SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, + IN HANDLE hSbApiPort OPTIONAL, + IN DWORD dwSubsystem OPTIONAL, + IN OUT PHANDLE phSmApiPort) +{ + UNICODE_STRING SmApiPortName; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + NTSTATUS Status = STATUS_SUCCESS; + SM_CONNECT_DATA ConnectData = {0,{0}}; + ULONG ConnectDataLength = 0; + + if (pSbApiPortName) + { + if (NULL == hSbApiPort || IMAGE_SUBSYSTEM_UNKNOWN == dwSubsystem) + { + return STATUS_INVALID_PARAMETER_MIX; + } + ConnectData.Subsystem = dwSubsystem; + memmove (& ConnectData.SbName, pSbApiPortName->Buffer, pSbApiPortName->Length); + } + ConnectDataLength = sizeof (ConnectData); + + SecurityQos.Length = sizeof (SecurityQos); + SecurityQos.ImpersonationLevel = SecurityIdentification; + SecurityQos.ContextTrackingMode = TRUE; + SecurityQos.EffectiveOnly = TRUE; + + RtlInitUnicodeString (& SmApiPortName, SM_API_PORT_NAME); + + Status = NtConnectPort ( + phSmApiPort, + & SmApiPortName, + & SecurityQos, + NULL, + NULL, + NULL, + & ConnectData, + & ConnectDataLength + ); + if (NT_SUCCESS(Status)) + { + return STATUS_SUCCESS; + } + DbgPrint ("%s failed (Status=0x%08lx)\n", __FUNCTION__, Status); + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/lib/rosrtl/sm/connect.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rosrtl/sm/execpgm.c --- trunk/reactos/lib/rosrtl/sm/execpgm.c 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/lib/rosrtl/sm/execpgm.c 2005-02-07 11:34:52 UTC (rev 13457) @@ -0,0 +1,49 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/smdll/execpgm.c + * PURPOSE: Call SM API SM_API_EXECPGM + */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <rosrtl/smapi.h> +#include <rosrtl/smhelper.h> +#include <string.h> + +NTSTATUS STDCALL +SmExecPgm (HANDLE hSmApiPort, PUNICODE_STRING Pgm) +{ + NTSTATUS Status; + SM_PORT_MESSAGE SmReqMsg; + + + /* Check Pgm's length */ + if (Pgm->Length > (sizeof (Pgm->Buffer[0]) * SM_EXEXPGM_MAX_LENGTH)) + { + return STATUS_INVALID_PARAMETER; + } + /* Marshal Pgm in the LPC message */ + RtlZeroMemory (& SmReqMsg, sizeof SmReqMsg); + SmReqMsg.ExecPgm.NameLength = Pgm->Length; + RtlCopyMemory (SmReqMsg.ExecPgm.Name, Pgm->Buffer, Pgm->Length); + + /* SM API to invoke */ + SmReqMsg.ApiIndex = SM_API_EXECUTE_PROGRAMME; + + /* LPC message */ + SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.ExecPgm); + SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; + + /* Call SM and wait for a reply */ + Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); + if (NT_SUCCESS(Status)) + { + return SmReqMsg.Status; + } + DbgPrint ("%s failed (Status=0x%08lx)\n", __FUNCTION__, Status); + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/lib/rosrtl/sm/execpgm.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rosrtl/sm/readme.txt --- trunk/reactos/lib/rosrtl/sm/readme.txt 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/lib/rosrtl/sm/readme.txt 2005-02-07 11:34:52 UTC (rev 13457) @@ -0,0 +1,18 @@ +$Id$ + +This is a helper library to talk to the ReactOS session manager (SM). + +It should be linked in the following components: + +a) the SM itself, because iy registers for managing native processes + IMAGE_SUBSYSTEM_NATIVE; + +b) environment subsystem servers, because each one should register in + the SM its own subsystem (willing to manageg those processes); + +c) terminal emulators for optional subsystems, like posixw32 and os2w32, + to ask the SM to start the optional subsystem server they need connect to; + +d) system and development utilites to debug/query the SM. + +2004-02-15 ea \ No newline at end of file Property changes on: trunk/reactos/lib/rosrtl/sm/readme.txt ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/rosrtl/sm/testapi.c --- trunk/reactos/lib/rosrtl/sm/testapi.c 2005-02-07 10:33:44 UTC (rev 13456) +++ trunk/reactos/lib/rosrtl/sm/testapi.c 2005-02-07 11:34:52 UTC (rev 13457) @@ -0,0 +1,20 @@ +/* $Id$ */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <rosrtl/smapi.h> + +VOID STDCALL SmPrintPortMessage (PSM_PORT_MESSAGE SmMessage) +{ + DbgPrint ("SM_PORT_MESSAGE %08lx:\n", (ULONG) SmMessage); + DbgPrint (" Header:\n"); + DbgPrint (" MessageType = %u\n", SmMessage->Header.MessageType); + DbgPrint (" DataSize = %d\n", SmMessage->Header.DataSize); + DbgPrint (" MessageSize = %d\n", SmMessage->Header.MessageSize); + DbgPrint (" ApiIndex = %ld\n", SmMessage->ApiIndex); + DbgPrint (" Status = %08lx\n", SmMessage->Status); + DbgPrint (" ExecPgm:\n"); + DbgPrint (" NameLength = %ld\n", SmMessage->ExecPgm.NameLength); + DbgPrint (" Name = %ls\n", (LPWSTR) & SmMessage->ExecPgm.Name); +} +/* EOF */ + Property changes on: trunk/reactos/lib/rosrtl/sm/testapi.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

19 years, 10 months

[ekohl] 13456: - Nt->Zw

by ekohl＠svn.reactos.com

- Nt->Zw - Assign an instance path to the root device node and reports its arrival. Modified: trunk/reactos/ntoskrnl/io/arcname.c Modified: trunk/reactos/ntoskrnl/io/bootlog.c Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/errlog.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnproot.c Modified: trunk/reactos/ntoskrnl/io/resource.c Modified: trunk/reactos/ntoskrnl/io/symlink.c Modified: trunk/reactos/ntoskrnl/io/xhaldrv.c _____ Modified: trunk/reactos/ntoskrnl/io/arcname.c --- trunk/reactos/ntoskrnl/io/arcname.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/arcname.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -207,32 +207,32 @@ NULL, NULL); - Status = NtOpenFile(&Handle, + Status = ZwOpenFile(&Handle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, 0, 0); - DPRINT("NtOpenFile() DeviceNumber %lu Status %lx\n", i, Status); + DPRINT("ZwOpenFile() DeviceNumber %lu Status %lx\n", i, Status); if (NT_SUCCESS(Status)) { - Status = NtQueryVolumeInformationFile(Handle, + Status = ZwQueryVolumeInformationFile(Handle, &IoStatusBlock, FileFsVolume, FS_VOLUME_BUFFER_SIZE, FileFsVolumeInformation); - DPRINT("NtQueryVolumeInformationFile() Status %lx\n", Status); + DPRINT("ZwQueryVolumeInformationFile() Status %lx\n", Status); if (NT_SUCCESS(Status)) { DPRINT("VolumeLabel: '%S'\n", FileFsVolume->VolumeLabel); if (_wcsicmp(FileFsVolume->VolumeLabel, L"REACTOS") == 0) { - NtClose(Handle); + ZwClose(Handle); *DeviceNumber = i; return(STATUS_SUCCESS); } } - NtClose(Handle); + ZwClose(Handle); } #endif @@ -252,17 +252,17 @@ NULL, NULL); - Status = NtOpenFile(&Handle, + Status = ZwOpenFile(&Handle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, 0, 0); - DPRINT("NtOpenFile() DeviceNumber %lu Status %lx\n", i, Status); + DPRINT("ZwOpenFile() DeviceNumber %lu Status %lx\n", i, Status); if (NT_SUCCESS(Status)) { DPRINT("Found ntoskrnl.exe on Cdrom%lu\n", i); - NtClose(Handle); + ZwClose(Handle); *DeviceNumber = i; return(STATUS_SUCCESS); } @@ -283,17 +283,17 @@ NULL, NULL); - Status = NtOpenFile(&Handle, + Status = ZwOpenFile(&Handle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, 0, 0); - DPRINT("NtOpenFile() DeviceNumber %lu Status %lx\n", i, Status); + DPRINT("ZwOpenFile() DeviceNumber %lu Status %lx\n", i, Status); if (NT_SUCCESS(Status)) { DPRINT("Found ntoskrnl.exe on Cdrom%lu\n", i); - NtClose(Handle); + ZwClose(Handle); *DeviceNumber = i; return(STATUS_SUCCESS); } @@ -407,14 +407,14 @@ NULL, NULL); - Status = NtOpenSymbolicLinkObject(&Handle, + Status = ZwOpenSymbolicLinkObject(&Handle, SYMBOLIC_LINK_ALL_ACCESS, &ObjectAttributes); if (!NT_SUCCESS(Status)) { RtlFreeUnicodeString(&BootPath); RtlFreeUnicodeString(&DeviceName); - CPRINT("NtOpenSymbolicLinkObject() '%wZ' failed (Status %x)\n", + CPRINT("ZwOpenSymbolicLinkObject() '%wZ' failed (Status %x)\n", &ArcName, Status); RtlFreeUnicodeString(&ArcName); @@ -423,15 +423,15 @@ } RtlFreeUnicodeString(&ArcName); - Status = NtQuerySymbolicLinkObject(Handle, + Status = ZwQuerySymbolicLinkObject(Handle, &DeviceName, &Length); - NtClose (Handle); + ZwClose (Handle); if (!NT_SUCCESS(Status)) { RtlFreeUnicodeString(&BootPath); RtlFreeUnicodeString(&DeviceName); - CPRINT("NtQuerySymbolicObject() failed (Status %x)\n", + CPRINT("ZwQuerySymbolicObject() failed (Status %x)\n", Status); return(Status); @@ -466,7 +466,7 @@ NULL, NULL); - Status = NtOpenFile(&Handle, + Status = ZwOpenFile(&Handle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, @@ -474,12 +474,12 @@ 0); if (!NT_SUCCESS(Status)) { - CPRINT("NtOpenFile() failed to open '\\SystemRoot' (Status %x)\n", + CPRINT("ZwOpenFile() failed to open '\\SystemRoot' (Status %x)\n", Status); return(Status); } - NtClose(Handle); + ZwClose(Handle); return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/ntoskrnl/io/bootlog.c --- trunk/reactos/ntoskrnl/io/bootlog.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/bootlog.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -86,12 +86,12 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&ControlSetKey, + Status = ZwOpenKey(&ControlSetKey, KEY_ALL_ACCESS, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + DPRINT1("ZwOpenKey() failed (Status %lx)\n", Status); ExReleaseResourceLite(&IopBootLogResource); return; } @@ -102,7 +102,7 @@ OBJ_CASE_INSENSITIVE | OBJ_OPENIF, ControlSetKey, NULL); - Status = NtCreateKey(&BootLogKey, + Status = ZwCreateKey(&BootLogKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -111,21 +111,21 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - NtClose(ControlSetKey); + DPRINT1("ZwCreateKey() failed (Status %lx)\n", Status); + ZwClose(ControlSetKey); ExReleaseResourceLite(&IopBootLogResource); return; } RtlInitUnicodeString(&ValueName, ValueNameBuffer); - Status = NtSetValueKey(BootLogKey, + Status = ZwSetValueKey(BootLogKey, &ValueName, 0, REG_SZ, (PVOID)Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); - NtClose(BootLogKey); - NtClose(ControlSetKey); + ZwClose(BootLogKey); + ZwClose(ControlSetKey); if (!NT_SUCCESS(Status)) { @@ -160,7 +160,7 @@ NULL, NULL); - Status = NtCreateFile(&FileHandle, + Status = ZwCreateFile(&FileHandle, FILE_APPEND_DATA, &ObjectAttributes, &IoStatusBlock, @@ -173,13 +173,13 @@ 0); if (!NT_SUCCESS(Status)) { - DPRINT1("NtCreateFile() failed (Status %lx)\n", Status); + DPRINT1("ZwCreateFile() failed (Status %lx)\n", Status); return Status; } if (LogText != NULL) { - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -190,14 +190,14 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT1("ZwWriteFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); return Status; } } /* L"\r\n" */ - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -207,11 +207,11 @@ NULL, NULL); - NtClose(FileHandle); + ZwClose(FileHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + DPRINT1("ZwWriteFile() failed (Status %lx)\n", Status); } return Status; @@ -241,7 +241,7 @@ NULL, NULL); - Status = NtCreateFile(&FileHandle, + Status = ZwCreateFile(&FileHandle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, @@ -254,14 +254,14 @@ 0); if (!NT_SUCCESS(Status)) { - DPRINT1("NtCreateFile() failed (Status %lx)\n", Status); + DPRINT1("ZwCreateFile() failed (Status %lx)\n", Status); return Status; } ByteOffset.QuadPart = (LONGLONG)0; Signature = 0xFEFF; - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -272,10 +272,10 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteKey() failed (Status %lx)\n", Status); + DPRINT1("ZwWriteKey() failed (Status %lx)\n", Status); } - NtClose(FileHandle); + ZwClose(FileHandle); return Status; } @@ -344,7 +344,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); if (!NT_SUCCESS(Status)) @@ -363,7 +363,7 @@ RtlInitUnicodeString(&ValueName, ValueNameBuffer); - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, KeyInfo, @@ -377,7 +377,7 @@ if (!NT_SUCCESS(Status)) { CHECKPOINT1; - NtClose(KeyHandle); + ZwClose(KeyHandle); ExFreePool(KeyInfo); ExReleaseResourceLite(&IopBootLogResource); return; @@ -387,18 +387,18 @@ if (!NT_SUCCESS(Status)) { CHECKPOINT1; - NtClose(KeyHandle); + ZwClose(KeyHandle); ExFreePool(KeyInfo); ExReleaseResourceLite(&IopBootLogResource); return; } /* Delete keys */ - NtDeleteValueKey(KeyHandle, + ZwDeleteValueKey(KeyHandle, &ValueName); } - NtClose(KeyHandle); + ZwClose(KeyHandle); ExFreePool(KeyInfo); _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/device.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -339,7 +339,7 @@ NULL, NULL); - Status = NtOpenFile( + Status = ZwOpenFile( &FileHandle, DesiredAccess, &ObjectAttributes, @@ -364,7 +364,7 @@ *FileObject = LocalFileObject; } - NtClose(FileHandle); + ZwClose(FileHandle); return Status; } _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -959,7 +959,7 @@ NULL, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, 0x10001, &ObjectAttributes); if (!NT_SUCCESS(Status)) @@ -971,14 +971,14 @@ KeyInfo = ExAllocatePool(NonPagedPool, KeyInfoLength); if (KeyInfo == NULL) { - NtClose(KeyHandle); + ZwClose(KeyHandle); return(STATUS_INSUFFICIENT_RESOURCES); } Index = 0; while (TRUE) { - Status = NtEnumerateKey(KeyHandle, + Status = ZwEnumerateKey(KeyHandle, Index, KeyBasicInformation, KeyInfo, @@ -1006,7 +1006,7 @@ } ExFreePool(KeyInfo); - NtClose(KeyHandle); + ZwClose(KeyHandle); DPRINT("IoCreateDriverList() done\n"); @@ -1270,7 +1270,7 @@ NTSTATUS Status = STATUS_UNSUCCESSFUL; IopDisplayLoadingMessage(Service->ServiceName.Buffer); - Status = NtLoadDriver(&Service->RegistryPath); + Status = ZwLoadDriver(&Service->RegistryPath); IopBootLog(&Service->ImagePath, NT_SUCCESS(Status) ? TRUE : FALSE); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/ntoskrnl/io/errlog.c --- trunk/reactos/ntoskrnl/io/errlog.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/errlog.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -135,7 +135,7 @@ RtlInitUnicodeString (&PortName, L"\\ErrorLogPort"); - Status = NtConnectPort (&IopLogPort, + Status = ZwConnectPort (&IopLogPort, &PortName, NULL, NULL, @@ -145,7 +145,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT ("NtConnectPort() failed (Status %lx)\n", Status); + DPRINT ("ZwConnectPort() failed (Status %lx)\n", Status); return FALSE; } @@ -290,7 +290,7 @@ Request->Header.DataSize + sizeof(LPC_MESSAGE); /* Send the error message to the log port */ - Status = NtRequestPort (IopLogPort, + Status = ZwRequestPort (IopLogPort, &Request->Header); /* Release request buffer */ @@ -298,7 +298,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT ("NtRequestPort() failed (Status %lx)\n", Status); + DPRINT ("ZwRequestPort() failed (Status %lx)\n", Status); /* Requeue log message and restart the worker */ ExInterlockedInsertTailList (&IopLogListHead, _____ Modified: trunk/reactos/ntoskrnl/io/iocomp.c --- trunk/reactos/ntoskrnl/io/iocomp.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/iocomp.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -32,14 +32,14 @@ NTSTATUS STDCALL -NtpCreateIoCompletion( +IopCreateIoCompletion( PVOID ObjectBody, PVOID Parent, PWSTR RemainingPath, POBJECT_ATTRIBUTES ObjectAttributes ) { - DPRINT("NtpCreateIoCompletion(ObjectBody %x, Parent %x, RemainingPath %S)\n", + DPRINT("IopCreateIoCompletion(ObjectBody %x, Parent %x, RemainingPath %S)\n", ObjectBody, Parent, RemainingPath); if (RemainingPath != NULL && wcschr(RemainingPath+1, '\\') != NULL) @@ -51,11 +51,11 @@ } VOID STDCALL -NtpDeleteIoCompletion(PVOID ObjectBody) +IopDeleteIoCompletion(PVOID ObjectBody) { PKQUEUE Queue = ObjectBody; - DPRINT("NtpDeleteIoCompletion()\n"); + DPRINT("IopDeleteIoCompletion()\n"); KeRundownQueue(Queue); } @@ -132,12 +132,12 @@ ExIoCompletionType->Dump = NULL; ExIoCompletionType->Open = NULL; ExIoCompletionType->Close = NULL; - ExIoCompletionType->Delete = NtpDeleteIoCompletion; + ExIoCompletionType->Delete = IopDeleteIoCompletion; ExIoCompletionType->Parse = NULL; ExIoCompletionType->Security = NULL; ExIoCompletionType->QueryName = NULL; ExIoCompletionType->OkayToClose = NULL; - ExIoCompletionType->Create = NtpCreateIoCompletion; + ExIoCompletionType->Create = IopCreateIoCompletion; ExIoCompletionType->DuplicationNotify = NULL; ExInitializeNPagedLookasideList(&IoCompletionPacketLookaside, _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -465,7 +465,7 @@ 0, NULL, NULL); - NtCreateDirectoryObject(&Handle, + ZwCreateDirectoryObject(&Handle, 0, &ObjectAttributes); @@ -479,7 +479,7 @@ 0, NULL, NULL); - NtCreateDirectoryObject(&Handle, + ZwCreateDirectoryObject(&Handle, 0, &ObjectAttributes); _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -791,7 +791,7 @@ DPRINT("Create '%S'\n", KeyName.Buffer); - Status = NtCreateKey (&KeyHandle, + Status = ZwCreateKey (&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -800,7 +800,7 @@ NULL); if (!NT_SUCCESS (Status)) { - DPRINT ("NtCreateKey() failed with status %x\n", Status); + DPRINT ("ZwCreateKey() failed with status %x\n", Status); return Status; } @@ -811,7 +811,7 @@ } else { - NtClose (KeyHandle); + ZwClose (KeyHandle); *Next = L'\\'; } @@ -843,7 +843,7 @@ OBJ_CASE_INSENSITIVE, InstanceKey, NULL); - Status = NtCreateKey(&LogConfKey, + Status = ZwCreateKey(&LogConfKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -862,7 +862,7 @@ RtlInitUnicodeString(&KeyName, L"BootConfig"); - Status = NtSetValueKey(LogConfKey, + Status = ZwSetValueKey(LogConfKey, &KeyName, 0, REG_RESOURCE_LIST, @@ -877,7 +877,7 @@ { RtlInitUnicodeString(&KeyName, L"BasicConfigVector"); - Status = NtSetValueKey(LogConfKey, + Status = ZwSetValueKey(LogConfKey, &KeyName, 0, REG_RESOURCE_REQUIREMENTS_LIST, @@ -885,7 +885,7 @@ DeviceNode->ResourceRequirements->ListSize); } - NtClose(LogConfKey); + ZwClose(LogConfKey); } DPRINT("IopSetDeviceInstanceData() done\n"); @@ -1069,7 +1069,7 @@ /* Set 'Capabilities' value */ RtlInitUnicodeString(&ValueName, L"Capabilities"); - Status = NtSetValueKey(InstanceKey, + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_DWORD, @@ -1081,7 +1081,7 @@ { RtlInitUnicodeString(&ValueName, L"UINumber"); - Status = NtSetValueKey(InstanceKey, + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_DWORD, @@ -1120,7 +1120,7 @@ RtlInitUnicodeString(&ValueName, L"HardwareID"); - Status = NtSetValueKey(InstanceKey, + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_MULTI_SZ, @@ -1128,7 +1128,7 @@ (TotalLength + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); } } else @@ -1166,7 +1166,7 @@ RtlInitUnicodeString(&ValueName, L"CompatibleIDs"); - Status = NtSetValueKey(InstanceKey, + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_MULTI_SZ, @@ -1174,7 +1174,7 @@ (TotalLength + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); } } else @@ -1196,7 +1196,7 @@ { RtlInitUnicodeString(&ValueName, L"DeviceDesc"); - Status = NtSetValueKey(InstanceKey, + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_SZ, @@ -1204,7 +1204,7 @@ (wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); } } else @@ -1226,7 +1226,7 @@ DPRINT("LocationInformation: %S\n", (PWSTR)IoStatusBlock.Information); RtlInitUnicodeString(&ValueName, L"LocationInformation"); - Status = NtSetValueKey(InstanceKey, + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_SZ, @@ -1234,7 +1234,7 @@ (wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); } } else @@ -1315,7 +1315,7 @@ IopSetDeviceInstanceData(InstanceKey, DeviceNode); } - NtClose(InstanceKey); + ZwClose(InstanceKey); DeviceNode->Flags |= DNF_PROCESSED; @@ -1733,7 +1733,7 @@ NULL, NULL); - Status = NtOpenFile( + Status = ZwOpenFile( &Handle, FILE_ALL_ACCESS, &ObjectAttributes, @@ -1743,7 +1743,7 @@ BootDrivers = NT_SUCCESS(Status) ? FALSE : TRUE; - NtClose(Handle); + ZwClose(Handle); /* * Initialize services for discovered children. Only boot drivers will @@ -1805,6 +1805,18 @@ KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); } + if (!IopCreateUnicodeString(&IopRootDeviceNode->InstancePath, + L"HTREE\\Root\\0", + PagedPool)) + { + CPRINT("Failed to create the instance path!\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, STATUS_UNSUCCESSFUL, 0, 0, 0); + } + + /* Report the device to the user-mode pnp manager */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &IopRootDeviceNode->InstancePath); + IopRootDeviceNode->PhysicalDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE; PnpRootDriverEntry(IopRootDriverObject, NULL); IopRootDriverObject->DriverExtension->AddDevice( _____ Modified: trunk/reactos/ntoskrnl/io/pnproot.c --- trunk/reactos/ntoskrnl/io/pnproot.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/pnproot.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -20,7 +20,8 @@ /* DATA **********************************************************************/ -typedef struct _PNPROOT_DEVICE { +typedef struct _PNPROOT_DEVICE +{ // Entry on device list LIST_ENTRY ListEntry; // Physical Device Object of device @@ -35,7 +36,8 @@ UNICODE_STRING DeviceDescription; } PNPROOT_DEVICE, *PPNPROOT_DEVICE; -typedef enum { +typedef enum +{ dsStopped, dsStarted, dsPaused, @@ -285,10 +287,6 @@ } -NTSTATUS -PnpRootPdoPnpControl( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) /* * FUNCTION: Handle Plug and Play IRPs for the child device * ARGUMENTS: @@ -297,6 +295,10 @@ * RETURNS: * Status */ +NTSTATUS +PnpRootPdoPnpControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PIO_STACK_LOCATION IrpSp; NTSTATUS Status; @@ -353,10 +355,7 @@ return Status; } -NTSTATUS -PnpRootPdoPowerControl( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) + /* * FUNCTION: Handle power management IRPs for the child device * ARGUMENTS: @@ -365,6 +364,10 @@ * RETURNS: * Status */ +NTSTATUS +PnpRootPdoPowerControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PIO_STACK_LOCATION IrpSp; NTSTATUS Status; @@ -484,10 +487,10 @@ NULL, NULL); - Status = NtOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenKey() failed (Status %x)\n", Status); + DPRINT("ZwOpenKey() failed (Status %x)\n", Status); ExFreePool(KeyInfo); return Status; } @@ -570,7 +573,7 @@ DPRINT("Entries found: %d\n", Index); - NtClose(KeyHandle); + ZwClose(KeyHandle); ExFreePool(KeyInfo); @@ -668,8 +671,8 @@ /* FIXME: */ } - DPRINT("DeviceID: %S PDO %x\n", - PdoDeviceExtension->DeviceID.Buffer, + DPRINT1("DeviceID: %wZ PDO %p\n", + &PdoDeviceExtension->DeviceID, Device->Pdo); if (!IopCreateUnicodeString( @@ -681,6 +684,9 @@ /* FIXME: */ } + DPRINT1("InstanceID: %wZ PDO %p\n", + &PdoDeviceExtension->InstanceID, + Device->Pdo); } /* Reference the physical device object. The PnP manager @@ -730,11 +736,6 @@ } -NTSTATUS -STDCALL -PnpRootFdoPnpControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) /* * FUNCTION: Handle Plug and Play IRPs for the root bus device object * ARGUMENTS: @@ -743,6 +744,11 @@ * RETURNS: * Status */ +NTSTATUS +STDCALL +PnpRootFdoPnpControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; PIO_STACK_LOCATION IrpSp; @@ -788,11 +794,6 @@ } -NTSTATUS -STDCALL -PnpRootFdoPowerControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) /* * FUNCTION: Handle power management IRPs for the root bus device object * ARGUMENTS: @@ -801,6 +802,11 @@ * RETURNS: * Status */ +NTSTATUS +STDCALL +PnpRootFdoPowerControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PIO_STACK_LOCATION IrpSp; NTSTATUS Status; @@ -827,11 +833,6 @@ } -NTSTATUS -STDCALL -PnpRootPnpControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) /* * FUNCTION: Handle Plug and Play IRPs * ARGUMENTS: @@ -840,6 +841,11 @@ * RETURNS: * Status */ +NTSTATUS +STDCALL +PnpRootPnpControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PPNPROOT_COMMON_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; @@ -861,11 +867,6 @@ } -NTSTATUS -STDCALL -PnpRootPowerControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) /* * FUNCTION: Handle power management IRPs * ARGUMENTS: @@ -874,6 +875,11 @@ * RETURNS: * Status */ +NTSTATUS +STDCALL +PnpRootPowerControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PPNPROOT_COMMON_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; _____ Modified: trunk/reactos/ntoskrnl/io/resource.c --- trunk/reactos/ntoskrnl/io/resource.c 2005-02-07 10:30:14 UTC (rev 13455) +++ trunk/reactos/ntoskrnl/io/resource.c 2005-02-07 10:33:44 UTC (rev 13456) @@ -836,7 +836,7 @@ OBJ_CASE_INSENSITIVE | OBJ_OPENIF, 0, NULL); - Status = NtCreateKey(&ResourcemapKey, + Status = ZwCreateKey(&ResourcemapKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -854,14 +854,14 @@ OBJ_CASE_INSENSITIVE | OBJ_OPENIF, ResourcemapKey, NULL); - Status = NtCreateKey(&HalKey, + Status = ZwCreateKey(&HalKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, &Disposition); - NtClose(ResourcemapKey); + ZwClose(ResourcemapKey); if (!NT_SUCCESS(Status)) return(Status); @@ -871,21 +871,21 @@ OBJ_CASE_INSENSITIVE, HalKey, NULL); - Status = NtCreateKey(&DescriptionKey, + Status = ZwCreateKey(&DescriptionKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, &Disposition); - NtClose(HalKey); + ZwClose(HalKey); if (!NT_SUCCESS(Status)) return(Status); /* Add '.Raw' value. */ RtlRosInitUnicodeStringFromLiteral(&Name, L".Raw"); - Status = NtSetValueKey(DescriptionKey, + Status = ZwSetValueKey(DescriptionKey, &Name, 0, REG_RESOURCE_LIST, @@ -893,20 +893,20 @@ ListSize); if (!NT_SUCCESS(Status)) { - NtClose(DescriptionKey); + ZwClose(DescriptionKey); return(Status); [truncated at 1000 lines; 103 more skipped]

19 years, 10 months

← Newer
1
...
30
31
32
33
34
35
36
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005