Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 19136: Fix device installation in second stage setup
by hpoussin＠svn.reactos.com 11 Nov '05

11 Nov '05

Fix device installation in second stage setup Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-11 18:11:17 UTC (rev 19135) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-11 18:19:12 UTC (rev 19136) @@ -871,7 +871,7 @@ DPRINT("Installing %S (%S)\n", DevInstData.buffer, InstanceId); - if ((Show != SW_HIDE) && (!FindDriver(&DevInstData))) + if ((!FindDriver(&DevInstData)) && (Show != SW_HIDE)) { /* Create the Welcome page */

1 0

[weiden] 19135: fixed warnings when compiled with -Wwrite-strings
by weiden＠svn.reactos.com 11 Nov '05

11 Nov '05

fixed warnings when compiled with -Wwrite-strings Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.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/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/cmdline.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/fs.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/miscboot.h Modified: trunk/reactos/boot/freeldr/freeldr/include/oslist.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/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.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/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/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -27,7 +27,7 @@ #include "rtl.h" VOID -MachInit(char *CmdLine) +MachInit(const char *CmdLine) { ULONG PciId; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -26,7 +26,7 @@ #include "i386.h" VOID -PcMachInit(char *CmdLine) +PcMachInit(const char *CmdLine) { EnableA20(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -26,7 +26,7 @@ #include "mm.h" #endif -VOID PcMachInit(char *CmdLine); +VOID PcMachInit(const char *CmdLine); VOID PcConsPutChar(int Ch); BOOL PcConsKbHit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -24,7 +24,7 @@ #include "i386.h" VOID -XboxMachInit(char *CmdLine) +XboxMachInit(const char *CmdLine) { /* Initialize our stuff */ XboxMemInit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -26,7 +26,7 @@ UCHAR XboxFont8x16[256 * 16]; -VOID XboxMachInit(char *CmdLine); +VOID XboxMachInit(const char *CmdLine); VOID XboxConsPutChar(int Ch); BOOL XboxConsKbHit(); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -279,7 +279,7 @@ BootMain("freeldr-ppc"); } -void MachInit(char *CmdLine) { +void MachInit(const char *CmdLine) { int len; printf( "Determining boot device:\n" ); len = ofw_getprop(chosen_package, "bootpath", _____ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -43,8 +43,8 @@ CHAR SettingValue[80]; ULONG SectionId; ULONG OperatingSystemCount; - PCHAR *OperatingSystemSectionNames; - PCHAR *OperatingSystemDisplayNames; + PCSTR *OperatingSystemSectionNames; + PCSTR *OperatingSystemDisplayNames; ULONG DefaultOperatingSystem; LONG TimeOut; ULONG SelectedOperatingSystem; @@ -166,10 +166,10 @@ return; } -ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount) +ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount) { CHAR DefaultOSText[80]; - PCHAR DefaultOSName; + PCSTR DefaultOSName; ULONG SectionId; ULONG DefaultOS = 0; ULONG Idx; _____ Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c --- trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -106,7 +106,7 @@ } } -char * +const char * CmdLineGetDefaultOS(void) { return CmdLineInfo.DefaultOperatingSystem; _____ Modified: trunk/reactos/boot/freeldr/freeldr/custom.c --- trunk/reactos/boot/freeldr/freeldr/custom.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/custom.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -32,20 +32,20 @@ #include <machine.h> -CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; -CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; -CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; -CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; -CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; -CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; -CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; -CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; +const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; +const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; +const CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; +const CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; +const CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; +const CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; +const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; +const CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; -CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; +const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; VOID OptionMenuCustomBoot(VOID) { - PCHAR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; + PCSTR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; _____ Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -39,7 +39,7 @@ bReportError = bError; } -VOID DiskError(PCHAR ErrorString, ULONG ErrorCode) +VOID DiskError(PCSTR ErrorString, ULONG ErrorCode) { CHAR ErrorCodeString[200]; @@ -53,7 +53,7 @@ UiMessageBox(ErrorCodeString); } -PCHAR DiskGetErrorCodeString(ULONG ErrorCode) +PCSTR DiskGetErrorCodeString(ULONG ErrorCode) { switch (ErrorCode) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c --- trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -30,7 +30,7 @@ ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler -VOID DriveMapMapDrivesInSection(PCHAR SectionName) +VOID DriveMapMapDrivesInSection(PCSTR SectionName) { CHAR SettingName[80]; CHAR SettingValue[80]; @@ -117,7 +117,7 @@ } } -BOOL DriveMapIsValidDriveString(PCHAR DriveString) +BOOL DriveMapIsValidDriveString(PCSTR DriveString) { ULONG Index; @@ -147,7 +147,7 @@ return TRUE; } -ULONG DriveMapGetBiosDriveNumber(PCHAR DeviceName) +ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName) { ULONG BiosDriveNumber = 0; _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c --- trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -27,7 +27,7 @@ #include <fs.h> #include <cmdline.h> -VOID BootMain(char *CmdLine) +VOID BootMain(LPSTR CmdLine) { CmdLineParse(CmdLine); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -87,7 +87,7 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* Ext2OpenFile(PCHAR FileName) +FILE* Ext2OpenFile(PCSTR FileName) { EXT2_FILE_INFO TempExt2FileInfo; PEXT2_FILE_INFO FileHandle; @@ -190,7 +190,7 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) +BOOL Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) { UINT i; ULONG NumberOfPathParts; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -667,8 +667,8 @@ BOOL Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector); -FILE* Ext2OpenFile(PCHAR FileName); -BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); +FILE* Ext2OpenFile(PCSTR FileName); +BOOL Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); ULONGLONG Ext2GetFileSize(FILE *FileHandle); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -687,7 +687,7 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOL FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer) { UINT i; ULONG NumberOfPathParts; @@ -915,7 +915,7 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* FatOpenFile(PCHAR FileName) +FILE* FatOpenFile(PCSTR FileName) { FAT_FILE_INFO TempFatFileInfo; PFAT_FILE_INFO FileHandle; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h --- trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -156,10 +156,10 @@ ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount); PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOL RootDirectory); BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); +BOOL FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer); void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry); BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer); -FILE* FatOpenFile(PCHAR FileName); +FILE* FatOpenFile(PCSTR FileName); ULONG FatCountClustersInChain(ULONG StartCluster); ULONG* FatGetClusterChainArray(ULONG StartCluster); BOOL FatReadCluster(ULONG ClusterNumber, PVOID Buffer); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -42,7 +42,7 @@ // FUNCTIONS //////////////////////////////////////////////////////////////////////// ///////////////////// -VOID FileSystemError(PCHAR ErrorString) +VOID FileSystemError(PCSTR ErrorString) { DbgPrint((DPRINT_FILESYSTEM, "%s\n", ErrorString)); @@ -123,7 +123,7 @@ } -PFILE FsOpenFile(PCHAR FileName) +PFILE FsOpenFile(PCSTR FileName) { PFILE FileHandle = NULL; @@ -337,7 +337,7 @@ * This function parses a path in the form of dir1\dir2\file1.ext * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext) */ -ULONG FsGetNumPathParts(PCHAR Path) +ULONG FsGetNumPathParts(PCSTR Path) { size_t i; ULONG num; @@ -362,7 +362,7 @@ * and puts the first name of the path (e.g. "dir1") in buffer * compatible with the MSDOS directory structure */ -VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path) +VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) { size_t i; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -180,7 +180,7 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -static BOOL IsoLookupFile(PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) +static BOOL IsoLookupFile(PCSTR FileName, PISO_FILE_INFO IsoFileInfoPointer) { UINT i; ULONG NumberOfPathParts; @@ -263,7 +263,7 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* IsoOpenFile(PCHAR FileName) +FILE* IsoOpenFile(PCSTR FileName) { ISO_FILE_INFO TempFileInfo; PISO_FILE_INFO FileHandle; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.h --- trunk/reactos/boot/freeldr/freeldr/fs/iso.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -106,7 +106,7 @@ BOOL IsoOpenVolume(ULONG DriveNumber); -FILE* IsoOpenFile(PCHAR FileName); +FILE* IsoOpenFile(PCSTR FileName); BOOL IsoReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); ULONG IsoGetFileSize(FILE *FileHandle); VOID IsoSetFilePointer(FILE *FileHandle, ULONG NewFilePointer); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -87,7 +87,7 @@ } /* FIXME: Add support for attribute lists! */ -static BOOL NtfsFindAttribute(PNTFS_ATTR_CONTEXT Context, PNTFS_MFT_RECORD MftRecord, ULONG Type, PWCHAR Name) +static BOOL NtfsFindAttribute(PNTFS_ATTR_CONTEXT Context, PNTFS_MFT_RECORD MftRecord, ULONG Type, const WCHAR *Name) { PNTFS_ATTR_RECORD AttrRecord; PNTFS_ATTR_RECORD AttrRecordEnd; @@ -563,7 +563,7 @@ return FALSE; } -static BOOL NtfsLookupFile(PCHAR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT DataContext) +static BOOL NtfsLookupFile(PCSTR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT DataContext) { ULONG NumberOfPathParts; CHAR PathPart[261]; @@ -680,7 +680,7 @@ return TRUE; } -FILE* NtfsOpenFile(PCHAR FileName) +FILE* NtfsOpenFile(PCSTR FileName) { PNTFS_FILE_HANDLE FileHandle; PNTFS_MFT_RECORD MftRecord; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -219,7 +219,7 @@ } PACKED NTFS_FILE_HANDLE, *PNTFS_FILE_HANDLE; BOOL NtfsOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector); -FILE* NtfsOpenFile(PCHAR FileName); +FILE* NtfsOpenFile(PCSTR FileName); BOOL NtfsReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); ULONG NtfsGetFileSize(FILE *FileHandle); VOID NtfsSetFilePointer(FILE *FileHandle, ULONG NewFilePointer); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h --- trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -21,7 +21,7 @@ #define __BOOTMGR_H -ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount); +ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount); LONG GetTimeOut(VOID); BOOL MainBootMenuKeyPressFilter(ULONG KeyPress); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h --- trunk/reactos/boot/freeldr/freeldr/include/cmdline.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/cmdline.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -23,14 +23,14 @@ typedef struct tagCMDLINEINFO { - char *DefaultOperatingSystem; + const char *DefaultOperatingSystem; LONG TimeOut; } CMDLINEINFO, *PCMDLINEINFO; -extern void CmdLineParse(char *CmdLine); +void CmdLineParse(char *CmdLine); -extern char *CmdLineGetDefaultOS(void); -extern LONG CmdLineGetTimeOut(void); +const char *CmdLineGetDefaultOS(void); +LONG CmdLineGetTimeOut(void); #endif /* __CMDLINE_H__ */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h --- trunk/reactos/boot/freeldr/freeldr/include/disk.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -119,8 +119,8 @@ // //////////////////////////////////////////////////////////////////////// /////////////// VOID DiskReportError (BOOL bError); -VOID DiskError(PCHAR ErrorString, ULONG ErrorCode); -PCHAR DiskGetErrorCodeString(ULONG ErrorCode); +VOID DiskError(PCSTR ErrorString, ULONG ErrorCode); +PCSTR DiskGetErrorCodeString(ULONG ErrorCode); BOOL DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c BOOL DiskIsDriveRemovable(ULONG DriveNumber); VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/drivemap.h --- trunk/reactos/boot/freeldr/freeldr/include/drivemap.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/drivemap.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -29,9 +29,9 @@ } PACKED DRIVE_MAP_LIST, *PDRIVE_MAP_LIST; -VOID DriveMapMapDrivesInSection(PCHAR SectionName); -BOOL DriveMapIsValidDriveString(PCHAR DriveString); // Checks the drive string ("hd0") for validity -ULONG DriveMapGetBiosDriveNumber(PCHAR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0') +VOID DriveMapMapDrivesInSection(PCSTR SectionName); +BOOL DriveMapIsValidDriveString(PCSTR DriveString); // Checks the drive string ("hd0") for validity +ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0') VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap); // Installs the int 13h handler for the drive mapper VOID DriveMapRemoveInt13Handler(VOID); // Removes a previously installed int 13h drive map handler _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h --- trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -32,17 +32,17 @@ #define FILE VOID #define PFILE FILE * -VOID FileSystemError(PCHAR ErrorString); +VOID FileSystemError(PCSTR ErrorString); BOOL FsOpenBootVolume(); BOOL FsOpenSystemVolume(PCHAR SystemPath, PCHAR RemainingPath, PULONG BootDevice); -PFILE FsOpenFile(PCHAR FileName); +PFILE FsOpenFile(PCSTR FileName); VOID FsCloseFile(PFILE FileHandle); BOOL FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); ULONG FsGetFileSize(PFILE FileHandle); VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer); ULONG FsGetFilePointer(PFILE FileHandle); BOOL FsIsEndOfFile(PFILE FileHandle); -ULONG FsGetNumPathParts(PCHAR Path); -VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path); +ULONG FsGetNumPathParts(PCSTR Path); +VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); #endif // #defined __FS_H _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h --- trunk/reactos/boot/freeldr/freeldr/include/inifile.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/inifile.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -22,14 +22,14 @@ BOOL IniFileInitialize(VOID); -BOOL IniOpenSection(PCHAR SectionName, ULONG* SectionId); +BOOL IniOpenSection(PCSTR SectionName, ULONG* SectionId); ULONG IniGetNumSectionItems(ULONG SectionId); ULONG IniGetSectionSettingNameSize(ULONG SectionId, ULONG SettingIndex); ULONG IniGetSectionSettingValueSize(ULONG SectionId, ULONG SettingIndex); BOOL IniReadSettingByNumber(ULONG SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize); -BOOL IniReadSettingByName(ULONG SectionId, PCHAR SettingName, PCHAR Buffer, ULONG BufferSize); -BOOL IniAddSection(PCHAR SectionName, ULONG* SectionId); -BOOL IniAddSettingValueToSection(ULONG SectionId, PCHAR SettingName, PCHAR SettingValue); +BOOL IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize); +BOOL IniAddSection(PCSTR SectionName, ULONG* SectionId); +BOOL IniAddSettingValueToSection(ULONG SectionId, PCSTR SettingName, PCSTR SettingValue); #endif // defined __PARSEINI_H _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h --- trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -127,9 +127,9 @@ VOID BootNewLinuxKernel(VOID); // Implemented in linux.S VOID BootOldLinuxKernel(ULONG KernelSize); // Implemented in linux.S -VOID LoadAndBootLinux(PCHAR OperatingSystemName, PCHAR Description); +VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description); -BOOL LinuxParseIniSection(PCHAR OperatingSystemName); +BOOL LinuxParseIniSection(PCSTR OperatingSystemName); BOOL LinuxReadBootSector(PFILE LinuxKernelFile); BOOL LinuxReadSetupSector(PFILE LinuxKernelFile); BOOL LinuxReadKernel(PFILE LinuxKernelFile); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h --- trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -72,7 +72,7 @@ VOID (*HwDetect)(VOID); } MACHVTBL, *PMACHVTBL; -VOID MachInit(char *CmdLine); +VOID MachInit(const char *CmdLine); extern MACHVTBL MachVtbl; _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/miscboot.h --- trunk/reactos/boot/freeldr/freeldr/include/miscboot.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/miscboot.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -20,8 +20,8 @@ #ifndef __BOOT_H #define __BOOT_H -VOID LoadAndBootBootSector(PCHAR OperatingSystemName); -VOID LoadAndBootPartition(PCHAR OperatingSystemName); -VOID LoadAndBootDrive(PCHAR OperatingSystemName); +VOID LoadAndBootBootSector(PCSTR OperatingSystemName); +VOID LoadAndBootPartition(PCSTR OperatingSystemName); +VOID LoadAndBootDrive(PCSTR OperatingSystemName); #endif // defined __BOOT_H _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/oslist.h --- trunk/reactos/boot/freeldr/freeldr/include/oslist.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/oslist.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -20,7 +20,7 @@ #ifndef __OSLIST_H #define __OSLIST_H -BOOL InitOperatingSystemList(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer); +BOOL InitOperatingSystemList(PCSTR **SectionNamesPointer, PCSTR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer); ULONG CountOperatingSystems(ULONG SectionId); BOOL AllocateListMemory(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG OperatingSystemCount); BOOL RemoveQuotes(PCHAR QuotedString); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -26,7 +26,7 @@ // ReactOS Loading Functions // //////////////////////////////////////////////////////////////////////// /////////////// -VOID LoadAndBootReactOS(PCHAR OperatingSystemName); +VOID LoadAndBootReactOS(PCSTR OperatingSystemName); //////////////////////////////////////////////////////////////////////// /////////////// // @@ -61,8 +61,8 @@ VOID FASTCALL FrLdrSetupPageDirectory(VOID); VOID FASTCALL FrLdrGetPaeMode(VOID); BOOL STDCALL FrLdrMapKernel(FILE *KernelImage); -ULONG_PTR STDCALL FrLdrCreateModule(LPSTR ModuleName); -ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPSTR ModuleName, PULONG ModuleSize); +ULONG_PTR STDCALL FrLdrCreateModule(LPCSTR ModuleName); +ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); BOOL STDCALL FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID STDCALL FrLdrStartup(ULONG Magic); typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PLOADER_PARAMETER_BLOCK LoaderBlock); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h --- trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -63,7 +63,6 @@ #define min(a, b) (((a) < (b)) ? (a) : (b)) #endif -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #define UINT64_C(val) val##ULL //////////////////////////////////////////////////////////////////////// /////////////// _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h --- trunk/reactos/boot/freeldr/freeldr/include/ui.h 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/include/ui.h 2005-11-11 18:11:17 UTC (rev 19135) @@ -47,7 +47,7 @@ extern BOOL UiUseSpecialEffects; // Tells us if we should use fade effects -extern CHAR UiMonthNames[12][15]; +extern const CHAR UiMonthNames[12][15]; //////////////////////////////////////////////////////////////////////// /////////////// // @@ -56,26 +56,26 @@ //////////////////////////////////////////////////////////////////////// /////////////// BOOL UiInitialize(BOOLEAN ShowGui); // Initialize User-Interface BOOL SetupUiInitialize(VOID); // Initialize User-Interface -VOID UiUnInitialize(PCHAR BootText); // Un-initialize User-Interface +VOID UiUnInitialize(PCSTR BootText); // Un-initialize User-Interface VOID UiDrawBackdrop(VOID); // Fills the entire screen with a backdrop VOID UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr VOID UiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified VOID UiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle, UCHAR HorzStyle, BOOL Fill, BOOL Shadow, UCHAR Attr); // Draws a box around the area specified -VOID UiDrawText(ULONG X, ULONG Y, PCHAR Text, UCHAR Attr); // Draws text at coordinates specified -VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCHAR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges -VOID UiDrawStatusText(PCHAR StatusText); // Draws text at the very bottom line on the screen +VOID UiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr); // Draws text at coordinates specified +VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges +VOID UiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen VOID UiUpdateDateTime(VOID); // Updates the date and time -VOID UiInfoBox(PCHAR MessageText); // Displays a info box on the screen -VOID UiMessageBox(PCHAR MessageText); // Displays a message box on the screen with an ok button -VOID UiMessageBoxCritical(PCHAR MessageText); // Displays a message box on the screen with an ok button using no system resources +VOID UiInfoBox(PCSTR MessageText); // Displays a info box on the screen +VOID UiMessageBox(PCSTR MessageText); // Displays a message box on the screen with an ok button +VOID UiMessageBoxCritical(PCSTR MessageText); // Displays a message box on the screen with an ok button using no system resources VOID UiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled -VOID UiShowMessageBoxesInSection(PCHAR SectionName); // Displays all the message boxes in a given section +VOID UiShowMessageBoxesInSection(PCSTR SectionName); // Displays all the message boxes in a given section VOID UiEscapeString(PCHAR String); // Processes a string and changes all occurances of "\n" to '\n' -BOOL UiEditBox(PCHAR MessageText, PCHAR EditTextBuffer, ULONG Length); +BOOL UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); -UCHAR UiTextToColor(PCHAR ColorText); // Converts the text color into it's equivalent color value -UCHAR UiTextToFillStyle(PCHAR FillStyleText); // Converts the text fill into it's equivalent fill value +UCHAR UiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value +UCHAR UiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into it's equivalent fill value VOID UiTruncateStringEllipsis(PCHAR StringText, ULONG MaxChars); // Truncates a string to MaxChars by adding an ellipsis on the end '...' @@ -89,7 +89,7 @@ //////////////////////////////////////////////////////////////////////// /////////////// typedef BOOL (*UiMenuKeyPressFilterCallback)(ULONG KeyPress); -BOOL UiDisplayMenu(PCHAR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOL UiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); _____ Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -24,7 +24,7 @@ #include <debug.h> #include <mm.h> -BOOL IniOpenSection(PCHAR SectionName, ULONG* SectionId) +BOOL IniOpenSection(PCSTR SectionName, ULONG* SectionId) { PINI_SECTION Section; @@ -131,7 +131,7 @@ return FALSE; } -BOOL IniReadSettingByName(ULONG SectionId, PCHAR SettingName, PCHAR Buffer, ULONG BufferSize) +BOOL IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize) { PINI_SECTION Section = (PINI_SECTION)SectionId; PINI_SECTION_ITEM SectionItem; @@ -163,7 +163,7 @@ return FALSE; } -BOOL IniAddSection(PCHAR SectionName, ULONG* SectionId) +BOOL IniAddSection(PCSTR SectionName, ULONG* SectionId) { PINI_SECTION Section; @@ -203,7 +203,7 @@ return TRUE; } -BOOL IniAddSettingValueToSection(ULONG SectionId, PCHAR SettingName, PCHAR SettingValue) +BOOL IniAddSettingValueToSection(ULONG SectionId, PCSTR SettingName, PCSTR SettingValue) { PINI_SECTION Section = (PINI_SECTION)SectionId; PINI_SECTION_ITEM SectionItem; _____ Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -54,7 +54,7 @@ CHAR LinuxBootDescription[80]; CHAR LinuxBootPath[260] = ""; -VOID LoadAndBootLinux(PCHAR OperatingSystemName, PCHAR Description) +VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description) { PFILE LinuxKernel = NULL; PFILE LinuxInitrdFile = NULL; @@ -229,7 +229,7 @@ LinuxCommandLineSize = 0; } -BOOL LinuxParseIniSection(PCHAR OperatingSystemName) +BOOL LinuxParseIniSection(PCSTR OperatingSystemName) { CHAR SettingName[260]; ULONG SectionId; _____ Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c --- trunk/reactos/boot/freeldr/freeldr/miscboot.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -29,7 +29,7 @@ #include <drivemap.h> #include <machine.h> -VOID LoadAndBootBootSector(PCHAR OperatingSystemName) +VOID LoadAndBootBootSector(PCSTR OperatingSystemName) { PFILE FilePointer; CHAR SettingName[80]; @@ -100,7 +100,7 @@ ChainLoadBiosBootSectorCode(); } -VOID LoadAndBootPartition(PCHAR OperatingSystemName) +VOID LoadAndBootPartition(PCSTR OperatingSystemName) { CHAR SettingName[80]; CHAR SettingValue[80]; @@ -171,7 +171,7 @@ ChainLoadBiosBootSectorCode(); } -VOID LoadAndBootDrive(PCHAR OperatingSystemName) +VOID LoadAndBootDrive(PCSTR OperatingSystemName) { CHAR SettingName[80]; CHAR SettingValue[80]; _____ Modified: trunk/reactos/boot/freeldr/freeldr/options.c --- trunk/reactos/boot/freeldr/freeldr/options.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/options.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -27,7 +27,7 @@ #include <arch.h> -PCHAR OptionsMenuList[] = +PCSTR OptionsMenuList[] = { "Safe Mode", "Safe Mode with Networking", _____ Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c --- trunk/reactos/boot/freeldr/freeldr/oslist.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/oslist.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -24,7 +24,7 @@ #include <mm.h> #include <ui.h> -BOOL InitOperatingSystemList(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer) +BOOL InitOperatingSystemList(PCSTR **SectionNamesPointer, PCSTR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer) { ULONG Idx; ULONG CurrentOperatingSystemIndex; @@ -79,8 +79,8 @@ } *OperatingSystemCountPointer = OperatingSystemCount; - *SectionNamesPointer = OperatingSystemSectionNames; - *DisplayNamesPointer = OperatingSystemDisplayNames; + *SectionNamesPointer = (PCSTR*)OperatingSystemSectionNames; + *DisplayNamesPointer = (PCSTR*)OperatingSystemDisplayNames; return TRUE; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -326,7 +326,7 @@ static VOID -CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCHAR KeyName) +CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCSTR KeyName) { PCHAR BaseKeyName; ULONG NameSize; @@ -357,7 +357,7 @@ static PREGISTRY_HIVE -CmiCreateHive (PCHAR KeyName) +CmiCreateHive (PCSTR KeyName) { PREGISTRY_HIVE Hive; PCELL_HEADER FreeCell; @@ -1258,7 +1258,7 @@ static BOOL CmiExportHive (PREGISTRY_HIVE Hive, - PCHAR KeyName) + PCSTR KeyName) { PKEY_CELL KeyCell; FRLDRHKEY Key; @@ -1624,7 +1624,7 @@ BOOL -RegExportBinaryHive(PCHAR KeyName, +RegExportBinaryHive(PCSTR KeyName, PCHAR ChunkBase, ULONG* ChunkSize) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c --- trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -706,7 +706,7 @@ ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, - LPSTR ModuleName, + LPCSTR ModuleName, PULONG ModuleSize) { ULONG LocalModuleSize; @@ -757,7 +757,7 @@ ULONG_PTR STDCALL -FrLdrCreateModule(LPSTR ModuleName) +FrLdrCreateModule(LPCSTR ModuleName) { PLOADER_MODULE ModuleData; LPSTR NameBuffer; _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -78,7 +78,7 @@ FrLdrMapKernel(FilePointer); /* Update Processbar and return success */ - UiDrawProgressBarCenter(nPos, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS..."); return(TRUE); } @@ -145,8 +145,8 @@ } static BOOL -FrLdrLoadNlsFile(PCHAR szFileName, - PCHAR szModuleName) +FrLdrLoadNlsFile(PCSTR szFileName, + PCSTR szModuleName) { PFILE FilePointer; CHAR value[256]; @@ -340,7 +340,7 @@ FrLdrLoadModule(FilePointer, szFileName, NULL); /* Update status and return */ - UiDrawProgressBarCenter(nPos, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS..."); return(TRUE); } @@ -570,7 +570,7 @@ } VOID -LoadAndBootReactOS(PCHAR OperatingSystemName) +LoadAndBootReactOS(PCSTR OperatingSystemName) { PFILE FilePointer; CHAR name[1024]; @@ -704,7 +704,7 @@ if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE; UiDrawStatusText("Loading..."); - UiDrawProgressBarCenter(0, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(0, 100, (PCHAR)"Loading ReactOS..."); /* * Try to open system drive @@ -838,7 +838,7 @@ */ RegInitCurrentControlSet(FALSE); - UiDrawProgressBarCenter(15, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(15, 100, (PCHAR)"Loading ReactOS..."); /* * Export the hardware hive @@ -847,7 +847,7 @@ RegExportBinaryHive ("\\Registry\\Machine\\HARDWARE", (PCHAR)Base, &Size); FrLdrCloseModule (Base, Size); - UiDrawProgressBarCenter(20, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(20, 100, (PCHAR)"Loading ReactOS..."); /* * Load NLS files @@ -857,13 +857,13 @@ UiMessageBox(MsgBuffer); return; } - UiDrawProgressBarCenter(30, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(30, 100, (PCHAR)"Loading ReactOS..."); /* * Load kernel symbols */ LoadKernelSymbols(szKernelName, 30); - UiDrawProgressBarCenter(40, 100, "Loading ReactOS..."); + UiDrawProgressBarCenter(40, 100, (PCHAR)"Loading ReactOS..."); /* * Load boot drivers _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-11-11 18:09:46 UTC (rev 19134) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-11-11 18:11:17 UTC (rev 19135) @@ -206,7 +206,7 @@ LONG RegCreateKey(FRLDRHKEY ParentKey, - PCHAR KeyName, + PCSTR KeyName, PFRLDRHKEY Key) { PLIST_ENTRY Ptr; @@ -214,7 +214,7 @@ FRLDRHKEY CurrentKey; FRLDRHKEY NewKey; PCHAR p; - PCHAR name; + PCSTR name; int subkeyLength; int stringLength; @@ -331,7 +331,7 @@ LONG RegDeleteKey(FRLDRHKEY Key, - PCHAR Name) + PCSTR Name) { @@ -384,14 +384,14 @@ LONG RegOpenKey(FRLDRHKEY ParentKey, - PCHAR KeyName, + PCSTR KeyName, [truncated at 1000 lines; 439 more skipped]

1 0

[gedmurphy] 19134: don't try and display data if iphlpapi functions fail
by gedmurphy＠svn.reactos.com 11 Nov '05

11 Nov '05

don't try and display data if iphlpapi functions fail Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-11 17:28:13 UTC (rev 19133) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-11 18:09:46 UTC (rev 19134) @@ -127,9 +127,16 @@ } if (! GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR) - _tprintf(_T("GetAdaptersInfo failed %lu\n"), GetLastError()); + { + _tprintf(_T("GetAdaptersInfo failed %lu\n"), GetLastError()); + return EXIT_FAILURE; + } + if (! GetNetworkParams(pFixedInfo, &netOutBufLen) == NO_ERROR) + { _tprintf(_T("GetNetworkParams failed %lu\n"), GetLastError()); + return EXIT_FAILURE; + } pAdapter = pAdapterInfo; //HKEY hKey;

1 0

[gedmurphy] 19133: functionality for sc query and queryex
by gedmurphy＠svn.reactos.com 11 Nov '05

11 Nov '05

functionality for sc query and queryex supports sc query <service> sc query type= <...> sc query state <...> output as per MS utility added usage information for query functionality Modified: trunk/reactos/subsys/system/sc/query.c Modified: trunk/reactos/subsys/system/sc/usage.c _____ Modified: trunk/reactos/subsys/system/sc/query.c --- trunk/reactos/subsys/system/sc/query.c 2005-11-11 16:18:46 UTC (rev 19132) +++ trunk/reactos/subsys/system/sc/query.c 2005-11-11 17:28:13 UTC (rev 19133) @@ -8,27 +8,32 @@ * Ged Murphy 20/10/05 Created * */ +/* + * TODO: + * Allow calling of 2 options e.g.: + * type= driver state= inactive + */ #include "sc.h" /* local function decs */ VOID PrintService(BOOL bExtended); -BOOL EnumServices(DWORD ServiceType, DWORD ServiceState); +BOOL EnumServices(LPCTSTR ServiceName, DWORD ServiceType, DWORD ServiceState); +BOOL QueryService(LPCTSTR ServiceName, BOOL bExtended); /* global variables */ static ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; +DWORD NumServices = 0; -BOOL Query(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, BOOL bExtended) +BOOL +Query(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, BOOL bExtended) { - if (! ServiceName) + if (! ServiceName) /* display all running services and drivers */ { - /* display all running services and drivers */ - _tprintf(_T("No service name, displaying all services\n")); // test - /* get default values */ - EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); + EnumServices(NULL, SERVICE_WIN32, SERVICE_ACTIVE); /* print default values */ PrintService(bExtended); @@ -37,13 +42,12 @@ { LPCTSTR Type = *ServiceArgs; - _tprintf(_T("got type\narg = %s\n"), Type); // test if (_tcsicmp(Type, _T("driver")) == 0) - EnumServices(SERVICE_DRIVER, SERVICE_STATE_ALL); + EnumServices(NULL, SERVICE_DRIVER, SERVICE_ACTIVE); else if (_tcsicmp(Type, _T("service")) == 0) - EnumServices(SERVICE_WIN32, SERVICE_STATE_ALL); + EnumServices(NULL, SERVICE_WIN32, SERVICE_ACTIVE); else if (_tcsicmp(Type, _T("all")) == 0) - EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_STATE_ALL); + EnumServices(NULL, SERVICE_DRIVER|SERVICE_WIN32, SERVICE_ACTIVE); else { _tprintf(_T("\nERROR following \"type=\"!\n")); @@ -56,12 +60,10 @@ { LPCTSTR State = *ServiceArgs; - if (_tcsicmp(State, _T("active")) == 0) - EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_ACTIVE); - else if (_tcsicmp(State, _T("inactive")) == 0) - EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_INACTIVE); + if (_tcsicmp(State, _T("inactive")) == 0) + EnumServices(NULL, SERVICE_WIN32, SERVICE_INACTIVE); else if (_tcsicmp(State, _T("all")) == 0) - EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_STATE_ALL); + EnumServices(NULL, SERVICE_WIN32, SERVICE_STATE_ALL); else { _tprintf(_T("\nERROR following \"state=\"!\n")); @@ -77,35 +79,138 @@ else if(_tcsicmp(ServiceName, _T("group="))) */ - else + else /* print only the service requested */ { - /* print only the service requested */ - printf("Service name %s\n", ServiceName); // test + QueryService(ServiceName, bExtended); + } + + return TRUE; +} - /* get default values */ - EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); - /* print default values */ - PrintService(bExtended); +BOOL +QueryService(LPCTSTR ServiceName, BOOL bExtended) +{ + SERVICE_STATUS_PROCESS *pServiceInfo = NULL; + SC_HANDLE hSc; + DWORD BufSiz = 0; + DWORD BytesNeeded = 0; + DWORD Ret; + + hSc = OpenService(hSCManager, ServiceName, SERVICE_QUERY_STATUS); + + if (hSc == NULL) + { + _tprintf(_T("QueryService: openService failed\n")); + ReportLastError(); + return FALSE; } + + Ret = QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + NULL, + BufSiz, + &BytesNeeded); + + if ((Ret != 0) || (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) + { + _tprintf(_T("QueryService: First call to QueryServiceStatusEx failed : ")); + ReportLastError(); + return FALSE; + } + else /* Call function again if required size was returned */ + { + /* reserve memory for service info array */ + pServiceInfo = (SERVICE_STATUS_PROCESS *) + HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + if (pServiceInfo == NULL) + { + _tprintf(_T("QueryService: Failed to allocate memory : ")); + ReportLastError(); + return FALSE; + } + + /* fill array with service info */ + if (! QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)pServiceInfo, + BytesNeeded, + &BytesNeeded)) + { + _tprintf(_T("QueryService: Second call to QueryServiceStatusEx failed : ")); + ReportLastError(); + HeapFree(GetProcessHeap(), 0, pServiceInfo); + return FALSE; + } + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + + _tprintf(_T("\tTYPE : %x "), + (unsigned int)pServiceInfo->dwServiceType); + switch (pServiceInfo->dwServiceType) + { + case 1 : _tprintf(_T("KERNEL_DRIVER\n")); break; + case 2 : _tprintf(_T("FILE_SYSTEM_DRIVER\n")); break; + case 16 : _tprintf(_T("WIN32_OWN_PROCESS\n")); break; + case 32 : _tprintf(_T("WIN32_SHARE_PROCESS\n")); break; + default : _tprintf(_T("\n")); break; + } + + _tprintf(_T("\tSTATE : %x "), + (unsigned int)pServiceInfo->dwCurrentState); + + switch (pServiceInfo->dwCurrentState) + { + case 1 : _tprintf(_T("STOPPED\n")); break; + case 2 : _tprintf(_T("START_PENDING\n")); break; + case 3 : _tprintf(_T("STOP_PENDING\n")); break; + case 4 : _tprintf(_T("RUNNING\n")); break; + case 5 : _tprintf(_T("CONTINUE_PENDING\n")); break; + case 6 : _tprintf(_T("PAUSE_PENDING\n")); break; + case 7 : _tprintf(_T("PAUSED\n")); break; + default : _tprintf(_T("\n")); break; + } + +// _tprintf(_T("\n\taccepted : 0x%x\n\n"), +// pServiceStatus[i].ServiceStatusProcess.dwControlsAccepted); +// (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) + + _tprintf(_T("\tWIN32_EXIT_CODE : %d (0x%x)\n"), + (unsigned int)pServiceInfo->dwWin32ExitCode, + (unsigned int)pServiceInfo->dwWin32ExitCode); + _tprintf(_T("\tSERVICE_EXIT_CODE : %d (0x%x)\n"), + (unsigned int)pServiceInfo->dwServiceSpecificExitCode, + (unsigned int)pServiceInfo->dwServiceSpecificExitCode); + _tprintf(_T("\tCHECKPOINT : 0x%x\n"), + (unsigned int)pServiceInfo->dwCheckPoint); + _tprintf(_T("\tWAIT_HINT : 0x%x\n"), + (unsigned int)pServiceInfo->dwWaitHint); + if (bExtended) + { + _tprintf(_T("\tPID : %lu\n"), + pServiceInfo->dwProcessId); + _tprintf(_T("\tFLAGS : %lu\n"), + pServiceInfo->dwServiceFlags); + } + + HeapFree(GetProcessHeap(), 0, pServiceInfo); + return TRUE; - } -BOOL EnumServices(DWORD ServiceType, DWORD ServiceState) +BOOL +EnumServices(LPCTSTR ServiceName, DWORD ServiceType, DWORD ServiceState) { - //SC_HANDLE hSc; DWORD BufSize = 0; DWORD BytesNeeded = 0; - DWORD NumServices = 0; DWORD ResumeHandle = 0; - -// hSc = OpenService(hSCManager, ServiceName, SERVICE_QUERY_STATUS); + DWORD Ret; /* determine required buffer size */ - if (! EnumServicesStatusEx(hSCManager, + Ret = EnumServicesStatusEx(hSCManager, SC_ENUM_PROCESS_INFO, ServiceType, ServiceState, @@ -114,39 +219,45 @@ &BytesNeeded, &NumServices, &ResumeHandle, - 0)) + 0); + + if ((Ret != 0) && (GetLastError() != ERROR_MORE_DATA)) { - /* Call function again if required size was returned */ - if (GetLastError() == ERROR_MORE_DATA) + _tprintf(_T("EnumServices: First call to EnumServicesStatusEx failed : ")); + ReportLastError(); + return FALSE; + } + else /* Call function again if required size was returned */ + { + /* reserve memory for service info array */ + pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) + HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + if (pServiceStatus == NULL) { - /* reserve memory for service info array */ - pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) malloc(BytesNeeded); + _tprintf(_T("EnumServices: Failed to allocate memory : ")); + ReportLastError(); + return FALSE; + } - /* fill array with service info */ - if (! EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - SERVICE_DRIVER | SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)pServiceStatus, - BufSize, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0)) - { - _tprintf(_T("Second call to EnumServicesStatusEx failed : ")); - ReportLastError(); - return FALSE; - } - } - else /* exit on failure */ + /* fill array with service info */ + if (! EnumServicesStatusEx(hSCManager, + SC_ENUM_PROCESS_INFO, + ServiceType, + ServiceState, + (LPBYTE)pServiceStatus, + BytesNeeded, + &BytesNeeded, + &NumServices, + &ResumeHandle, + 0)) { - _tprintf(_T("First call to EnumServicesStatusEx failed : ")); + _tprintf(_T("EnumServices: Second call to EnumServicesStatusEx failed : ")); ReportLastError(); + HeapFree(GetProcessHeap(), 0, pServiceStatus); return FALSE; } } - + return TRUE; } @@ -154,26 +265,64 @@ VOID PrintService(BOOL bExtended) { - _tprintf(_T("SERVICE_NAME: %s\n"), pServiceStatus->lpServiceName); - _tprintf(_T("DISPLAY_NAME: %s\n"), pServiceStatus->lpDisplayName); - _tprintf(_T("TYPE : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwServiceType); - _tprintf(_T("STATE : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwCurrentState); - // (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) - _tprintf(_T("WIN32_EXIT_CODE : %lu \n"), - pServiceStatus->ServiceStatusProcess.dwWin32ExitCode); - _tprintf(_T("SERVICE_EXIT_CODE : %lu \n"), - pServiceStatus->ServiceStatusProcess.dwServiceSpecificExitCode); - _tprintf(_T("CHECKPOINT : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwCheckPoint); - _tprintf(_T("WAIT_HINT : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwWaitHint); - if (bExtended) + int i; + + for (i=0; i < NumServices; i++) { - _tprintf(_T("PID : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwProcessId); - _tprintf(_T("FLAGS : %lu\n"), - pServiceStatus->ServiceStatusProcess.dwServiceFlags); + + _tprintf(_T("SERVICE_NAME: %s\n"), pServiceStatus[i].lpServiceName); + _tprintf(_T("DISPLAY_NAME: %s\n"), pServiceStatus[i].lpDisplayName); + + _tprintf(_T("\tTYPE : %x "), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwServiceType); + switch (pServiceStatus[i].ServiceStatusProcess.dwServiceType) + { + case 1 : _tprintf(_T("KERNEL_DRIVER\n")); break; + case 2 : _tprintf(_T("FILE_SYSTEM_DRIVER\n")); break; + case 16 : _tprintf(_T("WIN32_OWN_PROCESS\n")); break; + case 32 : _tprintf(_T("WIN32_SHARE_PROCESS\n")); break; + default : _tprintf(_T("\n")); break; + } + + _tprintf(_T("\tSTATE : %x "), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwCurrentState); + + switch (pServiceStatus[i].ServiceStatusProcess.dwCurrentState) + { + case 1 : _tprintf(_T("STOPPED\n")); break; + case 2 : _tprintf(_T("START_PENDING\n")); break; + case 3 : _tprintf(_T("STOP_PENDING\n")); break; + case 4 : _tprintf(_T("RUNNING\n")); break; + case 5 : _tprintf(_T("CONTINUE_PENDING\n")); break; + case 6 : _tprintf(_T("PAUSE_PENDING\n")); break; + case 7 : _tprintf(_T("PAUSED\n")); break; + default : _tprintf(_T("\n")); break; + } + + // _tprintf(_T("\n\taccepted : 0x%x\n\n"), + // pServiceStatus[i].ServiceStatusProcess.dwControlsAccepted); + // (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) + + _tprintf(_T("\tWIN32_EXIT_CODE : %d (0x%x)\n"), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwWin32ExitCode, + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwWin32ExitCode); + _tprintf(_T("\tSERVICE_EXIT_CODE : %d (0x%x)\n"), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwServiceSpecificExitCode, + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwServiceSpecificExitCode); + _tprintf(_T("\tCHECKPOINT : 0x%x\n"), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwCheckPoint); + _tprintf(_T("\tWAIT_HINT : 0x%x\n"), + (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwWaitHint); + if (bExtended) + { + _tprintf(_T("\tPID : %lu\n"), + pServiceStatus[i].ServiceStatusProcess.dwProcessId); + _tprintf(_T("\tFLAGS : %lu\n"), + pServiceStatus[i].ServiceStatusProcess.dwServiceFlags); + } + + _tprintf(_T("\n")); } + + _tprintf(_T("number : %lu\n"), NumServices); } _____ Modified: trunk/reactos/subsys/system/sc/usage.c --- trunk/reactos/subsys/system/sc/usage.c 2005-11-11 16:18:46 UTC (rev 19132) +++ trunk/reactos/subsys/system/sc/usage.c 2005-11-11 17:28:13 UTC (rev 19133) @@ -8,11 +8,13 @@ * Ged Murphy 20/10/05 Created * */ - +#include <conio.h> #include "sc.h" INT MainUsage(VOID) { + TCHAR c; + _tprintf(_T("DESCRIPTION:\n") _T("\tSC is a command line program used for communicating with\n") _T("\tthe Service Control Manager and its services.\n") @@ -52,6 +54,43 @@ // "\t Lock : Locks the SCM Database\n") // "\t QueryLock : Queries the LockStatus for the SCM Database\n") + _tprintf(_T("\nWould you like to see help for the QUERY and QUERYEX commands? [ y | n ]: ")); + c = _getch(); // _gettch isn't defined in our tchar.h + _tprintf(_T("%c\n"), c); + if (tolower(c) == 'y') + { + _tprintf(_T("QUERY and QUERYEX OPTIONS :\n") + _T(" If the query command is followed by a service name, the status\n") + _T(" for that service is returned. Further options do not apply in\n") + _T(" this case. If the query command is followed by nothing or one of\n") + _T(" the options listed below, the services are enumerated.\n") + _T(" type= Type of services to enumerate (driver, service, all)\n") + _T(" (default = service)\n") + _T(" state= State of services to enumerate (inactive, all)\n") + _T(" (default = active)\n") +/* + _T(" bufsize= The size (in bytes) of the enumeration buffer\n") + _T(" (default = 4096)\n") + _T(" ri= The resume index number at which to begin the enumeration\n") + _T(" (default = 0)\n") + _T(" group= Service group to enumerate\n") + _T(" (default = all groups)\n") +*/ + _T("SYNTAX EXAMPLES\n") + _T("sc query - Enumerates status for active services & drivers\n") + _T("sc query messenger - Displays status for the messenger service\n") + _T("sc queryex messenger - Displays extended status for the messenger service\n") + _T("sc query type= driver - Enumerates only active drivers\n") + _T("sc query type= service - Enumerates only Win32 services\n") + _T("sc query state= all - Enumerates all services & drivers\n") +// _T("sc query bufsize= 50 - Enumerates with a 50 byte buffer.\n") +// _T("sc query ri= 14 - Enumerates with resume index = 14\n") +// _T("sc queryex group= "" - Enumerates active services not in a group\n") + _T("sc query type= service type= interact - Enumerates all interactive services\n")); +// _T("sc query type= driver group= NDIS - Enumerates all NDIS drivers\n")); + } + + return 0; }

1 0

[weiden] 19132: fixed warnings when compiled with -Wwrite-strings
by weiden＠svn.reactos.com 11 Nov '05

11 Nov '05

fixed warnings when compiled with -Wwrite-strings Modified: trunk/reactos/apps/utils/net/whois/whois.c Modified: trunk/reactos/apps/utils/ps/ps.c Modified: trunk/reactos/apps/utils/rosperf/alphablend.c _____ Modified: trunk/reactos/apps/utils/net/whois/whois.c --- trunk/reactos/apps/utils/net/whois/whois.c 2005-11-11 16:11:13 UTC (rev 19131) +++ trunk/reactos/apps/utils/net/whois/whois.c 2005-11-11 16:18:46 UTC (rev 19132) @@ -62,7 +62,7 @@ struct hostent *hp; struct servent *sp; int s; - char *host; + const char *host; WORD wVersionRequested; WSADATA wsaData; int err; _____ Modified: trunk/reactos/apps/utils/ps/ps.c --- trunk/reactos/apps/utils/ps/ps.c 2005-11-11 16:11:13 UTC (rev 19131) +++ trunk/reactos/apps/utils/ps/ps.c 2005-11-11 16:18:46 UTC (rev 19132) @@ -90,14 +90,14 @@ // x00000000 00000000 000:00:00 000:00:00 () -static char* title = "P PID PPID KTime UTime NAME\n"; -static char* title1 = "t TID KTime UTime State WaitResson\n"; -static char* title2 = "w PID Hwnd WndStile TID WndName\n"; +static char title[] = "P PID PPID KTime UTime NAME\n"; +static char title1[] = "t TID KTime UTime State WaitResson\n"; +static char title2[] = "w PID Hwnd WndStile TID WndName\n"; struct status { DWORD state; - char desc[10]; + const char desc[10]; } thread_stat[8 + 1] = { {0, "Init "}, {1, "Ready "}, _____ Modified: trunk/reactos/apps/utils/rosperf/alphablend.c --- trunk/reactos/apps/utils/rosperf/alphablend.c 2005-11-11 16:11:13 UTC (rev 19131) +++ trunk/reactos/apps/utils/rosperf/alphablend.c 2005-11-11 16:18:46 UTC (rev 19132) @@ -60,7 +60,7 @@ ULONG DbgPrint( - IN PCH Format, + IN PCSTR Format, IN ...); void

1 0

[weiden] 19131: fixed warnings when compiled with -Wwrite-strings
by weiden＠svn.reactos.com 11 Nov '05

11 Nov '05

fixed warnings when compiled with -Wwrite-strings Modified: trunk/reactos/apps/utils/net/finger/getopt.c Modified: trunk/reactos/apps/utils/net/finger/getopt.h Modified: trunk/reactos/apps/utils/net/ftp/cmds.c Modified: trunk/reactos/apps/utils/net/ftp/domacro.c Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ftp/ftp.c Modified: trunk/reactos/apps/utils/net/ftp/ftp_var.h Modified: trunk/reactos/apps/utils/net/ftp/main.c Modified: trunk/reactos/apps/utils/net/ftp/prototypes.h Modified: trunk/reactos/apps/utils/net/ftp/ruserpass.c Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h Modified: trunk/reactos/apps/utils/net/telnet/src/tconsole.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/tnconfig.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/tnconfig.h Modified: trunk/reactos/apps/utils/net/telnet/src/tnmain.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/tscroll.cpp _____ Modified: trunk/reactos/apps/utils/net/finger/getopt.c --- trunk/reactos/apps/utils/net/finger/getopt.c 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/finger/getopt.c 2005-11-11 16:11:13 UTC (rev 19131) @@ -50,7 +50,7 @@ int opterr = 1, /* if error message should be printed */ optind = 1, /* index into parent argv vector */ optopt; /* character checked for validity */ -char *optarg; /* argument associated with option */ +const char *optarg; /* argument associated with option */ #define BADCH (int)'?' #define EMSG "" @@ -58,7 +58,7 @@ int getopt(int nargc, char * const *nargv, const char *ostr) { - static char *place = EMSG; /* option letter processing */ + static const char *place = EMSG; /* option letter processing */ register char *oli; /* option letter list index */ char *p; _____ Modified: trunk/reactos/apps/utils/net/finger/getopt.h --- trunk/reactos/apps/utils/net/finger/getopt.h 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/finger/getopt.h 2005-11-11 16:11:13 UTC (rev 19131) @@ -1,6 +1,6 @@ /* getopt.h */ -extern char *optarg; +extern const char *optarg; extern int optind; int _____ Modified: trunk/reactos/apps/utils/net/ftp/cmds.c --- trunk/reactos/apps/utils/net/ftp/cmds.c 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/ftp/cmds.c 2005-11-11 16:11:13 UTC (rev 19131) @@ -53,9 +53,9 @@ extern off_t restart_point; extern char reply_string[]; -char *mname; +const char *mname; jmp_buf jabort; -char *dotrans(), *domap(); +const char *dotrans(), *domap(); extern short portnum; extern char *hostname; @@ -64,7 +64,7 @@ * Connect to peer server and * auto-login, if possible. */ -void setpeer(int argc, char *argv[]) +void setpeer(int argc, const char *argv[]) { char *host; @@ -154,8 +154,8 @@ } struct types { - char *t_name; - char *t_mode; + const char *t_name; + const char *t_mode; int t_type; char *t_arg; } types[] = { @@ -171,13 +171,13 @@ * Set transfer type. */ void settype(argc, argv) - char *argv[]; + const char *argv[]; { register struct types *p; int comret; if (argc > 2) { - char *sep; + const char *sep; printf("usage: %s [", argv[0]); sep = " "; @@ -216,7 +216,7 @@ } } -char *stype[] = { +const char *stype[] = { "type", "", 0 @@ -308,11 +308,11 @@ */ void put(argc, argv) int argc; - char *argv[]; + const char *argv[]; { - char *cmd; + const char *cmd; int loc = 0; - char *oldargv1, *oldargv2; + const char *oldargv1, *oldargv2; if (argc == 2) { argc++; @@ -374,12 +374,12 @@ * Send multiple files. */ void mput(argc, argv) - char *argv[]; + const char *argv[]; { register int i; int ointer; extern jmp_buf jabort; - char *tp; + const char *tp; if (argc < 2) { (void) strcat(line, " "); @@ -505,13 +505,13 @@ } void reget(argc, argv) - char *argv[]; + const char *argv[]; { (void) getit(argc, argv, 1, "r+w"); } void get(argc, argv) - char *argv[]; + const char *argv[]; { (void) getit(argc, argv, 0, restart_point ? "r+w" : "w" ); } @@ -520,11 +520,11 @@ * Receive one file. */ int getit(argc, argv, restartit, mode) - char *argv[]; - char *mode; + const char *argv[]; + const char *mode; { int loc = 0; - char *oldargv1, *oldargv2; + const char *oldargv1, *oldargv2; if (argc == 2) { argc++; @@ -565,7 +565,8 @@ return (0); } if (loc && mcase) { - char *tp = argv[1], *tp2, tmpbuf[MAXPATHLEN]; + const char *tp = argv[1]; + char *tp2, tmpbuf[MAXPATHLEN]; while (*tp && !islower(*tp)) { tp++; @@ -675,9 +676,10 @@ * Get multiple files. */ void mget(argc, argv) - char *argv[]; + const char *argv[]; { - char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN]; + const char *cp, *tp; + char *tp2, tmpbuf[MAXPATHLEN]; int ointer; extern jmp_buf jabort; @@ -756,7 +758,8 @@ static FILE *ftemp = NULL; static char **args; int oldverbose, oldhash; - char *cp, *mode; + char *cp; + const char *mode; if (!mflag) { if (!doglob) { @@ -808,7 +811,7 @@ return (buf); } -static char * +static const char * onoff(bool) int bool; { @@ -1002,7 +1005,7 @@ * on remote machine. */ void cd(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1034,7 +1037,7 @@ * on local machine. */ void lcd(argc, argv) - char *argv[]; + const char *argv[]; { char buf[MAXPATHLEN]; @@ -1064,7 +1067,7 @@ * Delete a single file. */ void delete(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1089,7 +1092,7 @@ * Delete multiple files. */ void mdelete(argc, argv) - char *argv[]; + const char *argv[]; { char *cp; int ointer; @@ -1139,7 +1142,7 @@ * Rename a remote file. */ void renamefile(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1178,9 +1181,9 @@ * of remote files. */ void ls(argc, argv) - char *argv[]; + const char *argv[]; { - char *cmd; + const char *cmd; if (argc < 2) argc++, argv[1] = NULL; @@ -1211,9 +1214,10 @@ * of multiple remote files. */ void mls(argc, argv) - char *argv[]; + const char *argv[]; { - char *cmd, mode[1], *dest; + const char *cmd, *dest; + char mode[1]; int ointer, i; extern jmp_buf jabort; @@ -1395,7 +1399,7 @@ */ void user(argc, argv) int argc; - char **argv; + const char **argv; { char acct[80], *getpass(); int n, aflag = 0; @@ -1466,7 +1470,7 @@ * Make a directory. */ void makedir(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1497,7 +1501,7 @@ * Remove a directory. */ void removedir(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1528,7 +1532,7 @@ * Send a line, verbatim, to the remote machine. */ void quote(argc, argv) - char *argv[]; + const char *argv[]; { int i; char buf[BUFSIZ]; @@ -1565,7 +1569,7 @@ */ void site(argc, argv) - char *argv[]; + const char *argv[]; { int i; char buf[BUFSIZ]; @@ -1597,7 +1601,7 @@ } void do_chmod(argc, argv) - char *argv[]; + const char *argv[]; { if (argc == 2) { printf("usage: %s mode file-name\n", argv[0]); @@ -1692,7 +1696,7 @@ } int confirm(cmd, file) - char *cmd, *file; + const char *cmd, *file; { char line[BUFSIZ]; @@ -1721,7 +1725,7 @@ * from the expression, we return only the first. */ int globulize(cpp) - char **cpp; + const char **cpp; { char **globbed; @@ -1796,7 +1800,7 @@ void doproxy(argc,argv) int argc; - char *argv[]; + const char *argv[]; { register struct cmd *c; struct cmd *getcmd(); @@ -1901,12 +1905,13 @@ ntout[16] = '\0'; } -char * +const char * dotrans(name) - char *name; + const char *name; { static char new[MAXPATHLEN]; - char *cp1, *cp2 = new; + const char *cp1; + char *cp2 = new; register int i, ostop, found; for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++); @@ -1943,7 +1948,7 @@ void setnmap(argc, argv) int argc; - char *argv[]; + const char *argv[]; { char *cp; @@ -1983,13 +1988,14 @@ (void) strncpy(mapout, cp, MAXPATHLEN - 1); } -char * +const char * domap(name) - char *name; + const char *name; { static char new[MAXPATHLEN]; - register char *cp1 = name, *cp2 = mapin; - char *tp[9], *te[9]; + const char *cp1 = name; + char *cpn, *cp2 = mapin; + const char *tp[9], *te[9]; int i, toks[9], toknum = 0, match = 1; for (i=0; i < 9; ++i) { @@ -2032,33 +2038,34 @@ { toks[toknum] = 0; } - cp1 = new; - *cp1 = '\0'; + + cpn = new; + *cpn = '\0'; cp2 = mapout; while (*cp2) { match = 0; switch (*cp2) { case '\\': if (*(cp2 + 1)) { - *cp1++ = *++cp2; + *cpn++ = *++cp2; } break; case '[': LOOP: if (*++cp2 == '$' && isdigit(*(cp2+1))) { if (*++cp2 == '0') { - char *cp3 = name; + const char *cp3 = name; while (*cp3) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } match = 1; } else if (toks[toknum = *cp2 - '1']) { - char *cp3 = tp[toknum]; + const char *cp3 = tp[toknum]; while (cp3 != te[toknum]) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } match = 1; } @@ -2072,24 +2079,24 @@ else if (*cp2 == '$' && isdigit(*(cp2+1))) { if (*++cp2 == '0') { - char *cp3 = name; + const char *cp3 = name; while (*cp3) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } } else if (toks[toknum = *cp2 - '1']) { - char *cp3=tp[toknum]; + const char *cp3=tp[toknum]; while (cp3 != te[toknum]) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } } } else if (*cp2) { - *cp1++ = *cp2++; + *cpn++ = *cp2++; } } if (!*cp2) { @@ -2126,29 +2133,29 @@ case '$': if (isdigit(*(cp2 + 1))) { if (*++cp2 == '0') { - char *cp3 = name; + const char *cp3 = name; while (*cp3) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } } else if (toks[toknum = *cp2 - '1']) { - char *cp3 = tp[toknum]; + const char *cp3 = tp[toknum]; while (cp3 != te[toknum]) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } } break; } /* intentional drop through */ default: - *cp1++ = *cp2; + *cpn++ = *cp2; break; } cp2++; } - *cp1 = '\0'; + *cpn = '\0'; if (!*new) { return(name); } @@ -2207,7 +2214,7 @@ void macdef(argc, argv) int argc; - char *argv[]; + const char *argv[]; { char *tmp; int c; @@ -2283,7 +2290,7 @@ * get size of file on remote machine */ void sizecmd(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -2308,7 +2315,7 @@ * get last modification time of file on remote machine */ void modtime(argc, argv) - char *argv[]; + const char *argv[]; { int overbose; @@ -2347,7 +2354,7 @@ * show status on reomte machine */ void rmtstatus(argc, argv) - char *argv[]; + const char *argv[]; { (void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]); } @@ -2356,7 +2363,7 @@ * get file if modtime is more recent than current file */ void newer(argc, argv) - char *argv[]; + const char *argv[]; { if (getit(argc, argv, -1, "w")) { printf("Local file \"%s\" is newer than remote file \"%s\"\n", _____ Modified: trunk/reactos/apps/utils/net/ftp/domacro.c --- trunk/reactos/apps/utils/net/ftp/domacro.c 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/ftp/domacro.c 2005-11-11 16:11:13 UTC (rev 19131) @@ -30,10 +30,11 @@ void domacro(argc, argv) int argc; - char *argv[]; + const char *argv[]; { - register int i, j; - register char *cp1, *cp2; + int i, j; + const char *cp1; + char *cp2; int count = 2, loopflg = 0; char line2[200]; struct cmd *getcmd(), *c; _____ Modified: trunk/reactos/apps/utils/net/ftp/fake.c --- trunk/reactos/apps/utils/net/ftp/fake.c 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-11-11 16:11:13 UTC (rev 19131) @@ -113,7 +113,7 @@ #endif -char *fprintfSocket(int s, char *format, ...) +const char *fprintfSocket(int s, const char *format, ...) { va_list argptr; char buffer[10009]; @@ -127,7 +127,7 @@ return NULL; } -char *fputsSocket(char *format, int s) +const char *fputsSocket(const char *format, int s) { send(s, format, strlen(format), 0); _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-11-11 16:11:13 UTC (rev 19131) @@ -98,9 +98,9 @@ off_t restart_point = 0; SOCKET cin, cout; -int dataconn(char *mode); +int dataconn(const char *mode); -int command(char *fmt, ...); +int command(const char *fmt, ...); char *hostname; @@ -203,19 +203,23 @@ return ((char *)0); } -int login(char *host) +int login(const char *host) { char tmp[80]; - char *user, *pass, *acct; + char *puser, *ppass, *pacct; + const char *user, *pass, *acct; int n, aflag = 0; user = pass = acct = 0; - if (ruserpass(host, &user, &pass, &acct) < 0) { + if (ruserpass(host, &puser, &ppass, &pacct) < 0) { code = -1; return(0); } + user = puser; + pass = ppass; + acct = pacct; while (user == NULL) { - char *myname = "none"; // This needs to become the usename env + const char *myname = "none"; // This needs to become the usename env if (myname) printf("Name (%s:%s): ", host, myname); @@ -273,7 +277,7 @@ } /*VARARGS1*/ -int command(char *fmt, ...) +int command(const char *fmt, ...) { va_list ap; int r; @@ -450,7 +454,7 @@ #define HASHBYTES 1024 -void sendrequest(char *cmd, char *local, char *remote, int printnames) +void sendrequest(const char *cmd, const char *local, const char *remote, int printnames) { FILE *fin; int dout = 0; @@ -461,7 +465,7 @@ register int c, d; struct stat st; struct timeval start, stop; - char *mode; + const char *mode; if (verbose && printnames) { if (local && *local != '-') @@ -723,7 +727,7 @@ } #endif -void recvrequest(char *cmd, char *local, char *remote, char *mode, +void recvrequest(const char *cmd, const char *local, const char *remote, const char *mode, int printnames) { FILE *fout = stdout; @@ -1253,7 +1257,7 @@ return (1); } -int dataconn(char *mode) +int dataconn(const char *mode) { struct sockaddr_in from; int s, fromlen = sizeof (from); @@ -1278,7 +1282,7 @@ } void ptransfer(direction, bytes, t0, t1) - char *direction; + const char *direction; long bytes; struct timeval *t0, *t1; { @@ -1432,12 +1436,12 @@ #endif void proxtrans(cmd, local, remote) - char *cmd, *local, *remote; + const char *cmd, *local, *remote; { // void (*oldintr)(int); int tmptype, oldtype = 0, secndflag = 0, nfnd; extern jmp_buf ptabort; - char *cmd2; + const char *cmd2; // struct fd_set mask; _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp_var.h --- trunk/reactos/apps/utils/net/ftp/ftp_var.h 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/ftp/ftp_var.h 2005-11-11 16:11:13 UTC (rev 19131) @@ -130,7 +130,7 @@ extern char argbuf[200]; /* argument storage buffer */ extern char *argbase; /* current storage point in arg buffer */ extern int margc; /* count of arguments on input line */ -extern char *margv[20]; /* args parsed from input line */ +extern const char *margv[20]; /* args parsed from input line */ extern int cpend; /* flag: if != 0, then pending server reply */ extern int mflag; /* flag: if != 0, then active multi command */ @@ -140,8 +140,8 @@ * Format of command table. */ struct cmd { - char *c_name; /* name of command */ - char *c_help; /* help string */ + const char *c_name; /* name of command */ + const char *c_help; /* help string */ char c_bell; /* give bell when command completes */ char c_conn; /* must be connected to use command */ char c_proxy; /* proxy server may execute */ _____ Modified: trunk/reactos/apps/utils/net/ftp/main.c --- trunk/reactos/apps/utils/net/ftp/main.c 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/ftp/main.c 2005-11-11 16:11:13 UTC (rev 19131) @@ -115,18 +115,18 @@ char argbuf[200]; /* argument storage buffer */ char *argbase; /* current storage point in arg buffer */ int margc; /* count of arguments on input line */ -char *margv[20]; /* args parsed from input line */ +const char *margv[20]; /* args parsed from input line */ int cpend; /* flag: if != 0, then pending server reply */ int mflag; /* flag: if != 0, then active multi command */ int options; /* used during socket creation */ -static char *slurpstring(); +static const char *slurpstring(); -int main(int argc, char *argv[]) +int main(int argc, const char *argv[]) { - register char *cp; + const char *cp; int top; #if 0 char homedir[MAXPATHLEN]; @@ -357,12 +357,12 @@ struct cmd * getcmd(name) - register char *name; + const char *name; { extern struct cmd cmdtab[]; - register char *p, *q; - register struct cmd *c, *found; - register int nmatches, longest; + const char *p, *q; + struct cmd *c, *found; + int nmatches, longest; longest = 0; nmatches = 0; @@ -393,7 +393,7 @@ void makeargv() { - char **argp; + const char **argp; margc = 0; argp = margv; @@ -409,7 +409,7 @@ * implemented with FSM to * handle quoting and strings */ -static char * +static const char * slurpstring() { int got_one = 0; _____ Modified: trunk/reactos/apps/utils/net/ftp/prototypes.h --- trunk/reactos/apps/utils/net/ftp/prototypes.h 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/ftp/prototypes.h 2005-11-11 16:11:13 UTC (rev 19131) @@ -1,8 +1,8 @@ int fgetcSocket(int s); -char *fputsSocket(char *format, int s); +const char *fputsSocket(const char *format, int s); -char *fprintfSocket(int s, char *format, ...); +const char *fprintfSocket(int s, const char *format, ...); int fputcSocket(int s, char putChar); int fputSocket(int s, char *putChar, int len); @@ -13,34 +13,34 @@ int herror(char *s); int getreply(int expecteof); -int ruserpass(char *host, char **aname, char **apass, char **aacct); +int ruserpass(const char *host, char **aname, char **apass, char **aacct); char *getpass(const char *prompt); void makeargv(void); -void domacro(int argc, char *argv[]); -void proxtrans(char *cmd, char *local, char *remote); +void domacro(int argc, const char *argv[]); +void proxtrans(const char *cmd, const char *local, const char *remote); int null(void); int initconn(void); void disconnect(void); -void ptransfer(char *direction, long bytes, struct timeval *t0, struct timeval *t1); +void ptransfer(const char *direction, long bytes, struct timeval *t0, struct timeval *t1); void setascii(void); void setbinary(void); void setebcdic(void); void settenex(void); void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0); void setpassive(int argc, char *argv[]); -void setpeer(int argc, char *argv[]); +void setpeer(int argc, const char *argv[]); void cmdscanner(int top); void pswitch(int flag); void quit(void); -int login(char *host); -int command(char *fmt, ...); -int globulize(char **cpp); -void sendrequest(char *cmd, char *local, char *remote, int printnames); -void recvrequest(char *cmd, char *local, char *remote, char *mode, +int login(const char *host); +int command(const char *fmt, ...); +int globulize(const char **cpp); +void sendrequest(const char *cmd, const char *local, const char *remote, int printnames); +void recvrequest(const char *cmd, const char *local, const char *remote, const char *mode, int printnames); -int confirm(char *cmd, char *file); +int confirm(const char *cmd, const char *file); void blkfree(char **av0); -int getit(int argc, char *argv[], int restartit, char *mode); +int getit(int argc, const char *argv[], int restartit, const char *mode); int sleep(int time); char *tail(); _____ Modified: trunk/reactos/apps/utils/net/ftp/ruserpass.c --- trunk/reactos/apps/utils/net/ftp/ruserpass.c 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/ftp/ruserpass.c 2005-11-11 16:11:13 UTC (rev 19131) @@ -50,7 +50,7 @@ static char tokval[100]; static struct toktab { - char *tokstr; + const char *tokstr; int tval; } toktab[]= { {"default", DEFAULT}, @@ -66,10 +66,11 @@ extern char *hostname; static int token(void); -int ruserpass(char *host, char **aname, char **apass, char **aacct) +int ruserpass(const char *host, char **aname, char **apass, char **aacct) { - char *hdir, buf[BUFSIZ], *tmp; - char myname[MAXHOSTNAMELEN], *mydomain; + const char *hdir, *mydomain; + char buf[BUFSIZ], *tmp; + char myname[MAXHOSTNAMELEN]; int t, i, c, usedefault = 0; struct stat stb; extern int errno; _____ Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp --- trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp 2005-11-11 16:11:13 UTC (rev 19131) @@ -219,7 +219,7 @@ Console.SetCursorPosition(x, y); } -char* TANSIParser::GetTerminalID() +const char* TANSIParser::GetTerminalID() { return "\033[?1;2c"; } @@ -479,7 +479,7 @@ // Get Terminal ID case 'c': { - char* szTerminalId = GetTerminalID(); + const char* szTerminalId = GetTerminalID(); Network.WriteString(szTerminalId, strlen(szTerminalId)); break; } @@ -1005,7 +1005,7 @@ // Terminal ID Request case 'Z': { - char* szTerminalId = GetTerminalID(); + const char* szTerminalId = GetTerminalID(); Network.WriteString(szTerminalId, strlen(szTerminalId)); break; } _____ Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h --- trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h 2005-11-11 16:11:13 UTC (rev 19131) @@ -40,7 +40,7 @@ #endif void ConSetAttribute(unsigned char wAttr); - char *GetTerminalID(); + const char *GetTerminalID(); void ConSetCursorPos(int x, int y); void ResetTerminal(); void Init(); _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tconsole.cpp --- trunk/reactos/apps/utils/net/telnet/src/tconsole.cpp 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/telnet/src/tconsole.cpp 2005-11-11 16:11:13 UTC (rev 19131) @@ -60,17 +60,17 @@ GetConsoleScreenBufferInfo(hConsole, &ConsoleInfo); // Start with correct colors - int fg = ini.get_normal_fg(); - int bg = ini.get_normal_bg(); - if(fg == -1) - fg = defaultfg = origfg = ConsoleInfo.wAttributes & 0xF; + int color_fg = ini.get_normal_fg(); + int color_bg = ini.get_normal_bg(); + if(color_fg == -1) + color_fg = defaultfg = origfg = ConsoleInfo.wAttributes & 0xF; else - defaultfg = origfg = fg; - if(bg == -1) - bg = defaultbg = origbg = (ConsoleInfo.wAttributes >> 4) & 0xF; + defaultfg = origfg = color_fg; + if(color_bg == -1) + color_bg = defaultbg = origbg = (ConsoleInfo.wAttributes >> 4) & 0xF; else - defaultbg = origbg = bg; - wAttributes = fg | (bg << 4); + defaultbg = origbg = color_bg; + wAttributes = color_fg | (color_bg << 4); reverse = blink = underline = false; SetConsoleTextAttribute(hConsole, wAttributes); _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnconfig.cpp --- trunk/reactos/apps/utils/net/telnet/src/tnconfig.cpp 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/telnet/src/tnconfig.cpp 2005-11-11 16:11:13 UTC (rev 19131) @@ -186,8 +186,8 @@ }; struct ini_variable { - char *name; // variable name - char *section; // name of ini file section the variable is in + const char *name; // variable name + const char *section; // name of ini file section the variable is in enum ini_data_type data_type; // type of data void *ini_data; // pointer to data int max_size; // max size if string _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnconfig.h --- trunk/reactos/apps/utils/net/telnet/src/tnconfig.h 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/telnet/src/tnconfig.h 2005-11-11 16:11:13 UTC (rev 19131) @@ -198,7 +198,7 @@ // Host configration char host[128]; - char *port; + const char *port; // Aliases char **aliases; _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnmain.cpp --- trunk/reactos/apps/utils/net/telnet/src/tnmain.cpp 2005-11-11 11:59:56 UTC (rev 19130) +++ trunk/reactos/apps/utils/net/telnet/src/tnmain.cpp 2005-11-11 16:11:13 UTC (rev 19131) @@ -146,13 +146,13 @@ if (cursor < current) if (InputRecord.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { - unsigned int i,j; + unsigned int j, k; for (j = cursor; j <= current; j++) if (buf[j+1] == ' ' || (j+1)==current) break; - for (i = ++j; i <= current; i++) - if (buf[i] != ' ' || i == current) { - cursor = i == current ? --i : i; + for (k = ++j; k <= current; k++) + if (buf[k] != ' ' || k == current) { + cursor = k == current ? --k : k; break; [truncated at 1000 lines; 49 more skipped]

1 0

[weiden] 19130: replace offsetof with FIELD_OFFSET
by weiden＠svn.reactos.com 11 Nov '05

11 Nov '05

replace offsetof with FIELD_OFFSET Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-11-11 08:58:05 UTC (rev 19129) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-11-11 11:59:56 UTC (rev 19130) @@ -24,9 +24,6 @@ #define REG_MAX_NAME_SIZE 256 #define REG_MAX_DATA_SIZE 2048 -/* FIXME: should go into msvcrt.h header? */ -#define offsetof(s,m) (size_t)&(((s*)NULL)->m) - /* GLOBALS ******************************************************************/ static RTL_CRITICAL_SECTION HandleTableCS; @@ -2240,7 +2237,7 @@ DWORD total_size; char buffer[256], *buf_ptr = buffer; KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; - static const int info_size = offsetof( KEY_VALUE_FULL_INFORMATION, Name ); + static const int info_size = FIELD_OFFSET( KEY_VALUE_FULL_INFORMATION, Name ); //TRACE("(%p,%ld,%p,%p,%p,%p,%p,%p)\n", // hkey, index, value, val_count, reserved, type, data, count ); @@ -2367,7 +2364,7 @@ DWORD total_size; char buffer[256], *buf_ptr = buffer; KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; - static const int info_size = offsetof( KEY_VALUE_FULL_INFORMATION, Name ); + static const int info_size = FIELD_OFFSET( KEY_VALUE_FULL_INFORMATION, Name ); //TRACE("(%p,%ld,%p,%p,%p,%p,%p,%p)\n", // hkey, index, value, val_count, reserved, type, data, count );

1 0

[sedwards] 19129: msvc fixes
by sedwards＠svn.reactos.com 11 Nov '05

11 Nov '05

msvc fixes Modified: trunk/reactos/apps/utils/net/finger/err.c Modified: trunk/reactos/apps/utils/net/finger/finger.c Modified: trunk/reactos/apps/utils/net/finger/net.c _____ Modified: trunk/reactos/apps/utils/net/finger/err.c --- trunk/reactos/apps/utils/net/finger/err.c 2005-11-11 01:05:23 UTC (rev 19128) +++ trunk/reactos/apps/utils/net/finger/err.c 2005-11-11 08:58:05 UTC (rev 19129) @@ -50,21 +50,10 @@ extern char *__progname; /* Program name, from crt0. */ void -#ifdef __STDC__ err(int eval, const char *fmt, ...) -#else -err(eval, fmt, va_alist) - int eval; - const char *fmt; - va_dcl -#endif { va_list ap; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif verr(eval, fmt, ap); va_end(ap); } @@ -85,21 +74,10 @@ } void -#if __STDC__ errx(int eval, const char *fmt, ...) -#else -errx(eval, fmt, va_alist) - int eval; - const char *fmt; - va_dcl -#endif { va_list ap; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif verrx(eval, fmt, ap); va_end(ap); } @@ -115,20 +93,10 @@ } void -#if __STDC__ warn(const char *fmt, ...) -#else -warn(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vwarn(fmt, ap); va_end(ap); } @@ -150,20 +118,10 @@ } void -#ifdef __STDC__ warnx(const char *fmt, ...) -#else -warnx(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vwarnx(fmt, ap); va_end(ap); } _____ Modified: trunk/reactos/apps/utils/net/finger/finger.c --- trunk/reactos/apps/utils/net/finger/finger.c 2005-11-11 01:05:23 UTC (rev 19128) +++ trunk/reactos/apps/utils/net/finger/finger.c 2005-11-11 08:58:05 UTC (rev 19129) @@ -62,7 +62,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include "unistd.h" #include "various.h" #include "getopt.h" _____ Modified: trunk/reactos/apps/utils/net/finger/net.c --- trunk/reactos/apps/utils/net/finger/net.c 2005-11-11 01:05:23 UTC (rev 19128) +++ trunk/reactos/apps/utils/net/finger/net.c 2005-11-11 08:58:05 UTC (rev 19129) @@ -35,13 +35,15 @@ */ #include <sys/types.h> #include <winsock2.h> -#include "unistd.h" + #include <stdio.h> #include <ctype.h> #include <string.h> #include "various.h" +int close(int); + void netfinger(char *name) {

1 0

[cwittich] 19128: list services with EnumServicesStatusEx instead of reading them from registry
by cwittich＠svn.reactos.com 11 Nov '05

11 Nov '05

list services with EnumServicesStatusEx instead of reading them from registry Modified: trunk/reactos/subsys/system/msconfig/De.rc Modified: trunk/reactos/subsys/system/msconfig/En.rc Modified: trunk/reactos/subsys/system/msconfig/resource.h Modified: trunk/reactos/subsys/system/msconfig/srvpage.c _____ Modified: trunk/reactos/subsys/system/msconfig/De.rc --- trunk/reactos/subsys/system/msconfig/De.rc 2005-11-10 23:02:14 UTC (rev 19127) +++ trunk/reactos/subsys/system/msconfig/De.rc 2005-11-11 01:05:23 UTC (rev 19128) @@ -50,6 +50,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_SERVICES_COLUMN_SERVICE "Dienst" + IDS_SERVICES_COLUMN_REQ "Erforderlich" IDS_SERVICES_COLUMN_VENDOR "Hersteller" IDS_SERVICES_COLUMN_STATUS "Status" END @@ -81,3 +82,12 @@ IDS_STARTUP_COLUMN_CMD "Befehl" IDS_STARTUP_COLUMN_PATH "Pfad" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "Gestartet" + IDS_SERVICES_STATUS_STOPPED "Beendet" + IDS_YES "Ja" + IDS_NO "Nein" +END + _____ Modified: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2005-11-10 23:02:14 UTC (rev 19127) +++ trunk/reactos/subsys/system/msconfig/En.rc 2005-11-11 01:05:23 UTC (rev 19128) @@ -50,6 +50,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_SERVICES_COLUMN_SERVICE "Service" + IDS_SERVICES_COLUMN_REQ "Required" IDS_SERVICES_COLUMN_VENDOR "Vendor" IDS_SERVICES_COLUMN_STATUS "Status" END @@ -80,3 +81,11 @@ IDS_STARTUP_COLUMN_CMD "Command" IDS_STARTUP_COLUMN_PATH "Path" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "Running" + IDS_SERVICES_STATUS_STOPPED "Stopped" + IDS_YES "Yes" + IDS_NO "No" +END _____ Modified: trunk/reactos/subsys/system/msconfig/resource.h --- trunk/reactos/subsys/system/msconfig/resource.h 2005-11-10 23:02:14 UTC (rev 19127) +++ trunk/reactos/subsys/system/msconfig/resource.h 2005-11-11 01:05:23 UTC (rev 19128) @@ -23,11 +23,12 @@ #define IDS_TOOLS_COLUMN_NAME 2010 #define IDS_TOOLS_COLUMN_DESCR 2011 #define IDS_SERVICES_COLUMN_SERVICE 2012 -#define IDS_SERVICES_COLUMN_VENDOR 2013 -#define IDS_SERVICES_COLUMN_STATUS 2014 -#define IDS_STARTUP_COLUMN_ELEMENT 2015 -#define IDS_STARTUP_COLUMN_CMD 2016 -#define IDS_STARTUP_COLUMN_PATH 2017 +#define IDS_SERVICES_COLUMN_REQ 2013 +#define IDS_SERVICES_COLUMN_VENDOR 2014 +#define IDS_SERVICES_COLUMN_STATUS 2015 +#define IDS_STARTUP_COLUMN_ELEMENT 2016 +#define IDS_STARTUP_COLUMN_CMD 2017 +#define IDS_STARTUP_COLUMN_PATH 2018 #define IDS_TOOLS_CMD_NAME 2100 #define IDS_TOOLS_CMD_DESCR 2101 @@ -49,4 +50,8 @@ #define IDS_TOOLS_SYSDM_CMD 2114 #define IDS_TOOLS_SYSDM_PARAM 2115 +#define IDS_SERVICES_STATUS_STOPPED 2200 +#define IDS_SERVICES_STATUS_RUNNING 2201 +#define IDS_YES 2202 +#define IDS_NO 2203 /* EOF */ _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-10 23:02:14 UTC (rev 19127) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-11 01:05:23 UTC (rev 19128) @@ -34,16 +34,22 @@ ListView_InsertColumn(hServicesListCtrl, 0, &column); column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_SERVICES_COLUMN_REQ, szTemp, 256); + column.pszText = szTemp; + column.cx = 70; + ListView_InsertColumn(hServicesListCtrl, 1, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; LoadString(hInst, IDS_SERVICES_COLUMN_VENDOR, szTemp, 256); column.pszText = szTemp; column.cx = 200; - ListView_InsertColumn(hServicesListCtrl, 1, &column); + ListView_InsertColumn(hServicesListCtrl, 2, &column); column.mask = LVCF_TEXT | LVCF_WIDTH; LoadString(hInst, IDS_SERVICES_COLUMN_STATUS, szTemp, 256); column.pszText = szTemp; column.cx = 70; - ListView_InsertColumn(hServicesListCtrl, 2, &column); + ListView_InsertColumn(hServicesListCtrl, 3, &column); GetServices(); return TRUE; @@ -55,50 +61,79 @@ void GetServices ( void ) { - HKEY hKey, hSubKey; - DWORD dwSubKeys, dwKeyLength; - DWORD dwType, dwDataLength; + LV_ITEM item; + SC_HANDLE ScHandle; + DWORD BufSize = 0; + DWORD BytesNeeded = 0; + DWORD ResumeHandle = 0; + DWORD NumServices = 0; size_t Index; - TCHAR lpKeyName[MAX_KEY_LENGTH]; - TCHAR lpSubKey[MAX_KEY_LENGTH]; - TCHAR DisplayName[MAX_VALUE_NAME]; - TCHAR ObjectName[MAX_VALUE_NAME]; - TCHAR lpServicesKey[MAX_KEY_LENGTH] = _T("SYSTEM\\CurrentControlSet\\Services"); - LV_ITEM item; + TCHAR szStatus[128]; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, lpServicesKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; + + ScHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); + if (ScHandle != INVALID_HANDLE_VALUE) { - if (RegQueryInfoKey(hKey, NULL, NULL, NULL, &dwSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + if (EnumServicesStatusEx(ScHandle, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, (LPBYTE)pServiceStatus, BufSize, &BytesNeeded, &NumServices, &ResumeHandle, 0) == 0) { - for (Index = 0; Index < dwSubKeys; Index++) - { - dwKeyLength = MAX_KEY_LENGTH; - if (RegEnumKeyEx(hKey, Index, lpKeyName, &dwKeyLength, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + /* Call function again if required size was returned */ + if (GetLastError() == ERROR_MORE_DATA) + { + /* reserve memory for service info array */ + pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); + if (pServiceStatus == NULL) + return; + + /* fill array with service info */ + if (EnumServicesStatusEx(ScHandle, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, (LPBYTE)pServiceStatus, BytesNeeded, &BytesNeeded, &NumServices, &ResumeHandle, 0) == 0) { - _tcscpy(lpSubKey, lpServicesKey); - _tcscat(lpSubKey, _T("\\")); - _tcscat(lpSubKey, lpKeyName); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, lpSubKey, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) + HeapFree(GetProcessHeap(), 0, pServiceStatus); + return; + } + } + else /* exit on failure */ + { + return; + } + } + + if (NumServices) + { + for (Index = 0; Index < NumServices; Index++) + { + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT; + item.iImage = 0; + item.pszText = pServiceStatus[Index].lpDisplayName; + item.iItem = ListView_GetItemCount(hServicesListCtrl); + item.lParam = 0; + item.iItem = ListView_InsertItem(hServicesListCtrl, &item); + + /* FIXME + if (QueryServiceConfig2(ScHandle, SERVICE_CONFIG_FAILURE_ACTIONS, ) == 0) + { + if (GetLastError() == ERROR_MORE_DATA) { - dwDataLength = MAX_VALUE_NAME; - if (RegQueryValueEx(hSubKey, _T("ObjectName"), NULL, &dwType, (LPBYTE)ObjectName, &dwDataLength) == ERROR_SUCCESS) - { - dwDataLength = MAX_VALUE_NAME; - if (RegQueryValueEx(hSubKey, _T("DisplayName"), NULL, &dwType, (LPBYTE)DisplayName, &dwDataLength) == ERROR_SUCCESS) - { - memset(&item, 0, sizeof(LV_ITEM)); - item.mask = LVIF_TEXT; - item.iImage = 0; - item.pszText = DisplayName; - item.iItem = ListView_GetItemCount(hServicesListCtrl); - item.lParam = 0; - ListView_InsertItem(hServicesListCtrl, &item); - } - } + } } + LoadString(hInst, ( CONDITION ? IDS_YES : IDS_NO), szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 1; + SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + */ + + LoadString(hInst, ((pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_STOPPED) ? IDS_SERVICES_STATUS_STOPPED : IDS_SERVICES_STATUS_RUNNING), szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 3; + SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } } - RegCloseKey(hKey); - } + + CloseServiceHandle(ScHandle); + } + + }

1 0

[cwittich] 19127: set eol-style:native
by cwittich＠svn.reactos.com 10 Nov '05

10 Nov '05

set eol-style:native Modified: trunk/reactos/subsys/system/msconfig/startuppage.c Modified: trunk/reactos/subsys/system/msconfig/startuppage.h _____ Modified: trunk/reactos/subsys/system/msconfig/startuppage.c --- trunk/reactos/subsys/system/msconfig/startuppage.c 2005-11-10 22:46:41 UTC (rev 19126) +++ trunk/reactos/subsys/system/msconfig/startuppage.c 2005-11-10 23:02:14 UTC (rev 19127) @@ -1,112 +1,112 @@ -#include <precomp.h> - -HWND hStartupPage; -HWND hStartupListCtrl; -HWND hStartupDialog; - -void GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName ); - -INT_PTR CALLBACK -StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - LV_COLUMN column; - TCHAR szTemp[256]; - DWORD dwStyle; - - switch (message) { - case WM_INITDIALOG: - - hStartupListCtrl = GetDlgItem(hDlg, IDC_STARTUP_LIST); - hStartupDialog = hDlg; - - dwStyle = SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); - dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; - SendMessage(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); - - SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - - // Initialize the application page's controls - column.mask = LVCF_TEXT | LVCF_WIDTH; - - LoadString(hInst, IDS_STARTUP_COLUMN_ELEMENT, szTemp, 256); - column.pszText = szTemp; - column.cx = 150; - ListView_InsertColumn(hStartupListCtrl, 0, &column); - - column.mask = LVCF_TEXT | LVCF_WIDTH; - LoadString(hInst, IDS_STARTUP_COLUMN_CMD, szTemp, 256); - column.pszText = szTemp; - column.cx = 150; - ListView_InsertColumn(hStartupListCtrl, 1, &column); - - column.mask = LVCF_TEXT | LVCF_WIDTH; - LoadString(hInst, IDS_STARTUP_COLUMN_PATH, szTemp, 256); - column.pszText = szTemp; - column.cx = 250; - ListView_InsertColumn(hStartupListCtrl, 2, &column); - - GetAutostartEntriesFromRegistry(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); - GetAutostartEntriesFromRegistry(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); - //FIXME: What about HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Userinit - //FIXME: Common Startup (startmenu) - - return TRUE; - } - - return 0; -} - -void -GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName ) -{ - HKEY hKey; - DWORD Index, dwValues, retVal, dwType; - DWORD dwValueLength, dwDataLength = MAX_VALUE_NAME; - TCHAR Data[MAX_VALUE_NAME]; - TCHAR lpValueName[MAX_KEY_LENGTH]; - TCHAR Path[MAX_KEY_LENGTH + 5]; - LV_ITEM item; - - if (RegOpenKeyEx(hRootKey, KeyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - if (RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwValues, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) - { - for (Index = 0, retVal = ERROR_SUCCESS; Index < dwValues; Index++) - { - dwValueLength = MAX_VALUE_NAME; - dwDataLength = MAX_VALUE_NAME; - retVal = RegEnumValue(hKey, Index, lpValueName, &dwValueLength, NULL, &dwType, (LPBYTE)Data, &dwDataLength); - if (retVal == ERROR_SUCCESS) - { - memset(&item, 0, sizeof(LV_ITEM)); - item.mask = LVIF_TEXT; - item.iImage = 0; - item.pszText = lpValueName; - item.iItem = ListView_GetItemCount(hStartupListCtrl); - item.lParam = 0; - ListView_InsertItem(hStartupListCtrl, &item); - - if (dwType == REG_SZ) - { - GetLongPathName(Data, Data, sizeof(Data)); - item.pszText = Data; - item.iSubItem = 1; - SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - - if (hRootKey == HKEY_LOCAL_MACHINE) - _tcscpy(Path, _T("HKLM\\")); - if (hRootKey == HKEY_CURRENT_USER) - _tcscpy(Path, _T("HKCU\\")); - - _tcscat(Path, KeyName); - item.pszText = Path; - item.iSubItem = 2; - SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - } - } - RegCloseKey(hKey); - } - -} +#include <precomp.h> + +HWND hStartupPage; +HWND hStartupListCtrl; +HWND hStartupDialog; + +void GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName ); + +INT_PTR CALLBACK +StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + LV_COLUMN column; + TCHAR szTemp[256]; + DWORD dwStyle; + + switch (message) { + case WM_INITDIALOG: + + hStartupListCtrl = GetDlgItem(hDlg, IDC_STARTUP_LIST); + hStartupDialog = hDlg; + + dwStyle = SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; + SendMessage(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + + // Initialize the application page's controls + column.mask = LVCF_TEXT | LVCF_WIDTH; + + LoadString(hInst, IDS_STARTUP_COLUMN_ELEMENT, szTemp, 256); + column.pszText = szTemp; + column.cx = 150; + ListView_InsertColumn(hStartupListCtrl, 0, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_STARTUP_COLUMN_CMD, szTemp, 256); + column.pszText = szTemp; + column.cx = 150; + ListView_InsertColumn(hStartupListCtrl, 1, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_STARTUP_COLUMN_PATH, szTemp, 256); + column.pszText = szTemp; + column.cx = 250; + ListView_InsertColumn(hStartupListCtrl, 2, &column); + + GetAutostartEntriesFromRegistry(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); + GetAutostartEntriesFromRegistry(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); + //FIXME: What about HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Userinit + //FIXME: Common Startup (startmenu) + + return TRUE; + } + + return 0; +} + +void +GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName ) +{ + HKEY hKey; + DWORD Index, dwValues, retVal, dwType; + DWORD dwValueLength, dwDataLength = MAX_VALUE_NAME; + TCHAR Data[MAX_VALUE_NAME]; + TCHAR lpValueName[MAX_KEY_LENGTH]; + TCHAR Path[MAX_KEY_LENGTH + 5]; + LV_ITEM item; + + if (RegOpenKeyEx(hRootKey, KeyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwValues, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + for (Index = 0, retVal = ERROR_SUCCESS; Index < dwValues; Index++) + { + dwValueLength = MAX_VALUE_NAME; + dwDataLength = MAX_VALUE_NAME; + retVal = RegEnumValue(hKey, Index, lpValueName, &dwValueLength, NULL, &dwType, (LPBYTE)Data, &dwDataLength); + if (retVal == ERROR_SUCCESS) + { + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT; + item.iImage = 0; + item.pszText = lpValueName; + item.iItem = ListView_GetItemCount(hStartupListCtrl); + item.lParam = 0; + ListView_InsertItem(hStartupListCtrl, &item); + + if (dwType == REG_SZ) + { + GetLongPathName(Data, Data, sizeof(Data)); + item.pszText = Data; + item.iSubItem = 1; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + + if (hRootKey == HKEY_LOCAL_MACHINE) + _tcscpy(Path, _T("HKLM\\")); + if (hRootKey == HKEY_CURRENT_USER) + _tcscpy(Path, _T("HKCU\\")); + + _tcscat(Path, KeyName); + item.pszText = Path; + item.iSubItem = 2; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + } + } + RegCloseKey(hKey); + } + +} Property changes on: trunk/reactos/subsys/system/msconfig/startuppage.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/startuppage.h --- trunk/reactos/subsys/system/msconfig/startuppage.h 2005-11-10 22:46:41 UTC (rev 19126) +++ trunk/reactos/subsys/system/msconfig/startuppage.h 2005-11-10 23:02:14 UTC (rev 19127) @@ -1,4 +1,4 @@ -extern HWND hStartupPage; -extern HWND hStartupPageListCtrl; - -INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +extern HWND hStartupPage; +extern HWND hStartupPageListCtrl; + +INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); Property changes on: trunk/reactos/subsys/system/msconfig/startuppage.h ___________________________________________________________________ Name: svn:eol-style + native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs