Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 17737: Getting tired of seeing "? ros"
by gvg＠svn.reactos.com 08 Sep '05

08 Sep '05

Getting tired of seeing "? ros" Property changes on: trunk/reactos ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.zip *.iso *.cab *.bat *.log makefile.auto config.xml obj-* output-* doxy-doc cd reactos + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.zip *.iso *.cab *.bat *.log makefile.auto config.xml obj-* output-* doxy-doc cd reactos ros

1 0

[gvg] 17736: Translate partition 0 to active partition. Fixes bug 181.
by gvg＠svn.reactos.com 08 Sep '05

08 Sep '05

Translate partition 0 to active partition. Fixes bug 181. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/machine.c Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h 2005-09-08 08:29:01 UTC (rev 17736) @@ -34,6 +34,7 @@ extern BOOL i386DiskGetBootPath(char *BootPath, unsigned Size); extern VOID i386DiskGetBootDevice(PULONG BootDevice); extern BOOL i386DiskBootingFromFloppy(VOID); +extern BOOL i386DiskNormalizeSystemPath(char *SystemPath, unsigned Size); #endif /* __I386_I386_H_ */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-09-08 08:29:01 UTC (rev 17736) @@ -165,6 +165,7 @@ memcpy(Buffer, Ptr, BufferSize); +#ifdef DEBUG DbgPrint((DPRINT_DISK, "size of buffer: %x\n", Ptr[0])); DbgPrint((DPRINT_DISK, "information flags: %x\n", Ptr[1])); DbgPrint((DPRINT_DISK, "number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2])); @@ -194,6 +195,7 @@ { DbgPrint((DPRINT_HB, "signature: %x\n", Ptr[15])); } +#endif return TRUE; } @@ -202,6 +204,7 @@ { PARTITION_TABLE_ENTRY PartitionTableEntry; UCHAR VolumeType; + ULONG ActivePartition; DbgPrint((DPRINT_FILESYSTEM, "FsOpenVolume() DriveNumber: 0x%x PartitionNumber: 0x%x\n", i386BootDrive, i386BootPartition)); @@ -234,7 +237,7 @@ if (i386BootPartition == 0) { // Partition requested was zero which means the boot partition - if (! DiskGetActivePartitionEntry(i386BootDrive, &PartitionTableEntry)) + if (! DiskGetActivePartitionEntry(i386BootDrive, &PartitionTableEntry, &ActivePartition)) { /* Try partition-less disk */ *StartSector = 0; @@ -460,6 +463,46 @@ return TRUE; } +BOOL +i386DiskNormalizeSystemPath(char *SystemPath, unsigned Size) +{ + CHAR BootPath[256]; + ULONG PartitionNumber; + ULONG DriveNumber; + PARTITION_TABLE_ENTRY PartEntry; + char *p; + + if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) + { + return FALSE; + } + + if (0 != PartitionNumber) + { + return TRUE; + } + + if (! DiskGetActivePartitionEntry(DriveNumber, + &PartEntry, + &PartitionNumber) || + PartitionNumber < 1 || 9 < PartitionNumber) + { + return FALSE; + } + + p = SystemPath; + while ('\0' != *p && 0 != strnicmp(p, "partition(", 10)) { + p++; + } + p = strchr(p, ')'); + if (NULL == p || '0' != *(p - 1)) { + return FALSE; + } + *(p - 1) = '0' + PartitionNumber; + + return TRUE; +} + #endif /* defined __i386__ */ /* EOF */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-09-08 08:29:01 UTC (rev 17736) @@ -54,6 +54,7 @@ MachVtbl.DiskGetBootPath = i386DiskGetBootPath; MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = i386DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = PcDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-09-08 08:29:01 UTC (rev 17736) @@ -52,6 +52,7 @@ MachVtbl.DiskGetBootPath = i386DiskGetBootPath; MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = i386DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = XboxDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; _____ Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-09-08 08:29:01 UTC (rev 17736) @@ -26,12 +26,14 @@ #include <machine.h> -BOOL DiskGetActivePartitionEntry(ULONG DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) +BOOL DiskGetActivePartitionEntry(ULONG DriveNumber, + PPARTITION_TABLE_ENTRY PartitionTableEntry, + ULONG *ActivePartition) { ULONG BootablePartitionCount = 0; - ULONG ActivePartition = 0; MASTER_BOOT_RECORD MasterBootRecord; + *ActivePartition = 0; // Read master boot record if (!DiskReadBootRecord(DriveNumber, 0, &MasterBootRecord)) { @@ -42,22 +44,22 @@ if (MasterBootRecord.PartitionTable[0].BootIndicator == 0x80) { BootablePartitionCount++; - ActivePartition = 0; + *ActivePartition = 1; } if (MasterBootRecord.PartitionTable[1].BootIndicator == 0x80) { BootablePartitionCount++; - ActivePartition = 1; + *ActivePartition = 2; } if (MasterBootRecord.PartitionTable[2].BootIndicator == 0x80) { BootablePartitionCount++; - ActivePartition = 2; + *ActivePartition = 3; } if (MasterBootRecord.PartitionTable[3].BootIndicator == 0x80) { BootablePartitionCount++; - ActivePartition = 3; + *ActivePartition = 4; } // Make sure there was only one bootable partition @@ -73,7 +75,9 @@ } // Copy the partition table entry - RtlCopyMemory(PartitionTableEntry, &MasterBootRecord.PartitionTable[ActivePartition], sizeof(PARTITION_TABLE_ENTRY)); + RtlCopyMemory(PartitionTableEntry, + &MasterBootRecord.PartitionTable[*ActivePartition - 1], + sizeof(PARTITION_TABLE_ENTRY)); return TRUE; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h --- trunk/reactos/boot/freeldr/freeldr/include/disk.h 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h 2005-09-08 08:29:01 UTC (rev 17736) @@ -130,7 +130,7 @@ // Fixed Disk Partition Management Functions // //////////////////////////////////////////////////////////////////////// /////////////// -BOOL DiskGetActivePartitionEntry(ULONG DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); +BOOL DiskGetActivePartitionEntry(ULONG DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry, ULONG *ActivePartition); BOOL DiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOL DiskGetFirstPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOL DiskGetFirstExtendedPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h --- trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-09-08 08:29:01 UTC (rev 17736) @@ -61,6 +61,7 @@ BOOL (*DiskGetBootPath)(char *BootPath, unsigned Size); VOID (*DiskGetBootDevice)(PULONG BootDevice); BOOL (*DiskBootingFromFloppy)(VOID); + BOOL (*DiskNormalizeSystemPath)(char *SystemPath, unsigned Size); BOOL (*DiskReadLogicalSectors)(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOL (*DiskGetPartitionEntry)(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOL (*DiskGetDriveGeometry)(ULONG DriveNumber, PGEOMETRY DriveGeometry); @@ -97,6 +98,7 @@ #define MachDiskGetBootPath(Path, Size) MachVtbl.DiskGetBootPath((Path), (Size)) #define MachDiskGetBootDevice(BootDevice) MachVtbl.DiskGetBootDevice(BootDevice) #define MachDiskBootingFromFloppy() MachVtbl.DiskBootingFromFloppy() +#define MachDiskNormalizeSystemPath(Path, Size) MachVtbl.DiskNormalizeSystemPath((Path), (Size)) #define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) MachVtbl.DiskReadLogicalSectors((Drive), (Start), (Count), (Buf)) #define MachDiskGetPartitionEntry(Drive, Part, Entry) MachVtbl.DiskGetPartitionEntry((Drive), (Part), (Entry)) #define MachDiskGetDriveGeometry(Drive, Geom) MachVtbl.DiskGetDriveGeometry((Drive), (Geom)) _____ Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c 2005-09-08 08:29:01 UTC (rev 17736) @@ -81,6 +81,11 @@ } // Open the boot volume + if (!MachDiskNormalizeSystemPath(LinuxBootPath, sizeof(LinuxBootPath))) + { + UiMessageBox("Invalid boot path"); + goto LinuxBootFailed; + } if (!FsOpenSystemVolume(LinuxBootPath, NULL, NULL)) { UiMessageBox("Failed to open boot drive."); _____ Modified: trunk/reactos/boot/freeldr/freeldr/machine.c --- trunk/reactos/boot/freeldr/freeldr/machine.c 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/machine.c 2005-09-08 08:29:01 UTC (rev 17736) @@ -42,6 +42,7 @@ #undef MachDiskGetBootPath #undef MachDiskGetBootDevice #undef MachDiskBootingFromFloppy +#undef MachDiskNormalizeSystemPath #undef MachDiskReadLogicalSectors #undef MachDiskGetPartitionEntry #undef MachDiskGetDriveGeometry @@ -192,6 +193,12 @@ } BOOL +MachDiskNormalizeSystemPath(char *SystemPath, unsigned Size) +{ + return MachVtbl.DiskNormalizeSystemPath(SystemPath, Size); +} + +BOOL MachDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) { return MachVtbl.DiskReadLogicalSectors(DriveNumber, SectorNumber, SectorCount, Buffer); _____ Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c --- trunk/reactos/boot/freeldr/freeldr/miscboot.c 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c 2005-09-08 08:29:01 UTC (rev 17736) @@ -54,6 +54,12 @@ return; } + if (!MachDiskNormalizeSystemPath(FileName, sizeof(FileName))) + { + UiMessageBox("Invalid path to boot sector file"); + return; + } + if (!FsOpenSystemVolume(FileName, FileName, NULL)) { UiMessageBox("Failed to open boot drive."); _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c --- trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c 2005-09-08 08:29:01 UTC (rev 17736) @@ -73,7 +73,7 @@ p = p + 11; *BootPartition = atoi(p); p = strchr(p, ')'); - if ((p == NULL) || (*BootPartition == 0)) + if (p == NULL) return FALSE; p++; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-09-08 06:52:01 UTC (rev 17735) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-09-08 08:29:01 UTC (rev 17736) @@ -671,6 +671,12 @@ } else { + if (! MachDiskNormalizeSystemPath(SystemPath, + sizeof(SystemPath))) + { + UiMessageBox("Invalid system path"); + return; + } /* copy system path into kernel command line */ strcpy(reactos_kernel_cmdline, SystemPath); }

1 0

[ion] 17735: - Move s(w)printf to rtl (cannot be shared in string because of differences with the CRT implementation). - Fix build errors due to previous commits (sorry).
by ion＠svn.reactos.com 08 Sep '05

08 Sep '05

- Move s(w)printf to rtl (cannot be shared in string because of differences with the CRT implementation). - Fix build errors due to previous commits (sorry). Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/lib/crt/crt.xml Deleted: trunk/reactos/lib/crt/ctype/ Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/ntdll/stdio/ Modified: trunk/reactos/lib/rtl/rtl.xml Added: trunk/reactos/lib/rtl/sprintf.c Added: trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/string/ctype.c Added: trunk/reactos/lib/string/scanf.h Added: trunk/reactos/lib/string/sscanf.c Modified: trunk/reactos/lib/string/string.xml Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Deleted: trunk/reactos/ntoskrnl/rtl/ctype.c Deleted: trunk/reactos/ntoskrnl/rtl/sprintf.c Deleted: trunk/reactos/ntoskrnl/rtl/stdlib.c Deleted: trunk/reactos/ntoskrnl/rtl/swprintf.c _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-09-08 05:03:34 UTC (rev 17734) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-09-08 06:52:01 UTC (rev 17735) @@ -2013,4 +2013,29 @@ NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation); + +static __inline struct _PEB* NtCurrentPeb (void) +{ + struct _PEB * pPeb; + +#if defined(__GNUC__) + + __asm__ __volatile__ + ( + "movl %%fs:0x30, %0\n" /* fs:30h == Teb->Peb */ + : "=r" (pPeb) /* can't have two memory operands */ + : /* no inputs */ + ); + +#elif defined(_MSC_VER) + + __asm mov eax, fs:0x30; + __asm mov pPeb, eax + +#else +#error Unknown compiler for inline assembler #endif + + return pPeb; +} +#endif _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-09-08 05:03:34 UTC (rev 17734) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-09-08 06:52:01 UTC (rev 17735) @@ -4350,29 +4350,4 @@ VOID ); - -static __inline struct _PEB* NtCurrentPeb (void) -{ - struct _PEB * pPeb; - -#if defined(__GNUC__) - - __asm__ __volatile__ - ( - "movl %%fs:0x30, %0\n" /* fs:30h == Teb->Peb */ - : "=r" (pPeb) /* can't have two memory operands */ - : /* no inputs */ - ); - -#elif defined(_MSC_VER) - - __asm mov eax, fs:0x30; - __asm mov pPeb, eax - -#else -#error Unknown compiler for inline assembler #endif - - return pPeb; -} -#endif _____ Modified: trunk/reactos/lib/crt/crt.xml --- trunk/reactos/lib/crt/crt.xml 2005-09-08 05:03:34 UTC (rev 17734) +++ trunk/reactos/lib/crt/crt.xml 2005-09-08 06:52:01 UTC (rev 17735) @@ -22,17 +22,6 @@ <file>putch.c</file> <file>ungetch.c</file> </directory> - <directory name="ctype"> - <file>ctype.c</file> - <file>isalnum.c</file> - <file>isascii.c</file> - <file>iscntrl.c</file> - <file>isgraph.c</file> - <file>isprint.c</file> - <file>ispunct.c</file> - <file>isupper.c</file> - <file>isctype.c</file> - </directory> <directory name="direct"> <file>chdir.c</file> <file>chdrive.c</file> _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 05:03:34 UTC (rev 17734) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 06:52:01 UTC (rev 17735) @@ -37,11 +37,6 @@ <file>libsupp.c</file> <file>version.c</file> </directory> - <directory name="stdio"> - <file>sprintf.c</file> - <file>sscanf.c</file> - <file>swprintf.c</file> - </directory> <directory name="def"> <file>ntdll.rc</file> </directory> _____ Modified: trunk/reactos/lib/rtl/rtl.xml --- trunk/reactos/lib/rtl/rtl.xml 2005-09-08 05:03:34 UTC (rev 17734) +++ trunk/reactos/lib/rtl/rtl.xml 2005-09-08 06:52:01 UTC (rev 17735) @@ -51,6 +51,8 @@ <file>sd.c</file> <file>security.c</file> <file>sid.c</file> + <file>sprintf.c</file> + <file>swprintf.c</file> <file>splaytree.c</file> <file>thread.c</file> <file>time.c</file> _____ Added: trunk/reactos/lib/rtl/sprintf.c --- trunk/reactos/lib/rtl/sprintf.c 2005-09-08 05:03:34 UTC (rev 17734) +++ trunk/reactos/lib/rtl/sprintf.c 2005-09-08 06:52:01 UTC (rev 17735) @@ -0,0 +1,545 @@ +/* + * PROGRAMMERS: David Welch + * Eric Kohl + * + */ + +/* + * linux/lib/vsprintf.c + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ +/* + * Wirzenius wrote this portably, Torvalds fucked it up :-) + */ +#include <rtl.h> + +#define ZEROPAD 1 /* pad with zero */ +#define SIGN 2 /* unsigned/signed long */ +#define PLUS 4 /* show plus */ +#define SPACE 8 /* space if plus */ +#define LEFT 16 /* left justified */ +#define SPECIAL 32 /* 0x */ +#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ + + +static +__inline +int +do_div(long long *n, int base) +{ + int a; + a = ((unsigned long long) *n) % (unsigned) base; + *n = ((unsigned long long) *n) / (unsigned) base; + return a; +} + + +static int skip_atoi(const char **s) +{ + int i=0; + + while (isdigit(**s)) + i = i*10 + *((*s)++) - '0'; + return i; +} + + +static char * +number(char * buf, char * end, long long num, int base, int size, int precision, int type) +{ + char c,sign,tmp[66]; + const char *digits; + const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; + const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + int i; + + digits = (type & LARGE) ? large_digits : small_digits; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return 0; + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) { + if (num < 0) { + sign = '-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + if (type & SPECIAL) { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + i = 0; + if (num == 0) + tmp[i++]='0'; + else while (num != 0) + tmp[i++] = digits[do_div(&num,base)]; + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) { + while(size-->0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + } + if (sign) { + if (buf <= end) + *buf = sign; + ++buf; + } + if (type & SPECIAL) { + if (base==8) { + if (buf <= end) + *buf = '0'; + ++buf; + } else if (base==16) { + if (buf <= end) + *buf = '0'; + ++buf; + if (buf <= end) + *buf = digits[33]; + ++buf; + } + } + if (!(type & LEFT)) { + while (size-- > 0) { + if (buf <= end) + *buf = c; + ++buf; + } + } + while (i < precision--) { + if (buf <= end) + *buf = '0'; + ++buf; + } + while (i-- > 0) { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + return buf; +} + +static char* +string(char* buf, char* end, const char* s, int len, int field_width, int precision, int flags) +{ + int i; + if (s == NULL) + { + s = "<NULL>"; + len = 6; + } + else + { + if (len == -1) + { + len = 0; + while ((unsigned int)len < (unsigned int)precision && s[len]) + len++; + } + else + { + if ((unsigned int)len > (unsigned int)precision) + len = precision; + } + } + if (!(flags & LEFT)) + while (len < field_width--) + { + if (buf <= end) + *buf = ' '; + ++buf; + } + for (i = 0; i < len; ++i) + { + if (buf <= end) + *buf = *s++; + ++buf; + } + while (len < field_width--) + { + if (buf <= end) + *buf = ' '; + ++buf; + } + return buf; +} + +static char* +stringw(char* buf, char* end, const wchar_t* sw, int len, int field_width, int precision, int flags) +{ + int i; + if (sw == NULL) + { + sw = L"<NULL>"; + len = 6; + } + else + { + if (len == -1) + { + len = 0; + while ((unsigned int)len < (unsigned int)precision && sw[len]) + len++; + } + else + { + if ((unsigned int)len > (unsigned int)precision) + len = precision; + } + } + if (!(flags & LEFT)) + while (len < field_width--) + { + if (buf <= end) + *buf = ' '; + ++buf; + } + for (i = 0; i < len; ++i) + { + if (buf <= end) + *buf = (unsigned char)(*sw++); + ++buf; + } + while (len < field_width--) + { + if (buf <= end) + *buf = ' '; + ++buf; + } + return buf; +} + +/* + * @implemented + */ +int _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args) +{ + int len; + unsigned long long num; + int base; + char *str, *end; + const char *s; + const wchar_t *sw; + + int flags; /* flags to number() */ + + int field_width; /* width of output field */ + int precision; /* min. # of digits for integers; max + number of chars for from string */ + int qualifier; /* 'h', 'l', 'L', 'I' or 'w' for integer fields */ + + str = buf; + end = buf + cnt - 1; + if (end < buf - 1) { + end = ((void *) -1); + cnt = end - buf + 1; + } + + for ( ; *fmt ; ++fmt) { + if (*fmt != '%') { + if (str <= end) + *str = *fmt; + ++str; + continue; + } + + /* process flags */ + flags = 0; + repeat: + ++fmt; /* this also skips first '%' */ + switch (*fmt) { + case '-': flags |= LEFT; goto repeat; + case '+': flags |= PLUS; goto repeat; + case ' ': flags |= SPACE; goto repeat; + case '#': flags |= SPECIAL; goto repeat; + case '0': flags |= ZEROPAD; goto repeat; + } + + /* get field width */ + field_width = -1; + if (isdigit(*fmt)) + field_width = skip_atoi(&fmt); + else if (*fmt == '*') { + ++fmt; + /* it's the next argument */ + field_width = va_arg(args, int); + if (field_width < 0) { + field_width = -field_width; + flags |= LEFT; + } + } + + /* get the precision */ + precision = -1; + if (*fmt == '.') { + ++fmt; + if (isdigit(*fmt)) + precision = skip_atoi(&fmt); + else if (*fmt == '*') { + ++fmt; + /* it's the next argument */ + precision = va_arg(args, int); + } + if (precision < 0) + precision = 0; + } + + /* get the conversion qualifier */ + qualifier = -1; + if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { + qualifier = *fmt; + ++fmt; + } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { + qualifier = *fmt; + fmt += 3; + } + + /* default base */ + base = 10; + + switch (*fmt) { + case 'c': /* finished */ + if (!(flags & LEFT)) + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + if (qualifier == 'l' || qualifier == 'w') { + if (str <= end) + *str = (unsigned char)(wchar_t) va_arg(args, int); + ++str; + } else { + if (str <= end) + *str = (unsigned char) va_arg(args, int); + ++str; + } + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + continue; + + case 'C': /* finished */ + if (!(flags & LEFT)) + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + if (qualifier == 'h') { + if (str <= end) + *str = (unsigned char) va_arg(args, int); + ++str; + } else { + if (str <= end) + *str = (unsigned char)(wchar_t) va_arg(args, int); + ++str; + } + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + continue; + + case 's': /* finished */ + if (qualifier == 'l' || qualifier == 'w') { + /* print unicode string */ + sw = va_arg(args, wchar_t *); + str = stringw(str, end, sw, -1, field_width, precision, flags); + } else { + /* print ascii string */ + s = va_arg(args, char *); + str = string(str, end, s, -1, field_width, precision, flags); + } + continue; + + case 'S': + if (qualifier == 'h') { + /* print ascii string */ + s = va_arg(args, char *); + str = string(str, end, s, -1, field_width, precision, flags); + } else { + /* print unicode string */ + sw = va_arg(args, wchar_t *); + str = stringw(str, end, sw, -1, field_width, precision, flags); + } + continue; + + case 'Z': + if (qualifier == 'w') { + /* print counted unicode string */ + PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); + if ((pus == NULL) || (pus->Buffer == NULL)) { + sw = NULL; + len = -1; + } else { + sw = pus->Buffer; + len = pus->Length / sizeof(WCHAR); + } + str = stringw(str, end, sw, len, field_width, precision, flags); + } else { + /* print counted ascii string */ + PANSI_STRING pus = va_arg(args, PANSI_STRING); + if ((pus == NULL) || (pus->Buffer == NULL)) { + s = NULL; + len = -1; + } else { + s = pus->Buffer; + len = pus->Length; + } + str = string(str, end, s, len, field_width, precision, flags); + } + continue; + + case 'p': + if (field_width == -1) { + field_width = 2 * sizeof(void *); + flags |= ZEROPAD; + } + str = number(str, end, + (unsigned long) va_arg(args, void *), 16, + field_width, precision, flags); + continue; + + case 'n': + /* FIXME: What does C99 say about the overflow case here? */ + if (qualifier == 'l') { + long * ip = va_arg(args, long *); + *ip = (str - buf); + } else { + int * ip = va_arg(args, int *); + *ip = (str - buf); + } + continue; + + /* integer number formats - set up the flags and "break" */ + case 'o': + base = 8; + break; + + case 'b': + base = 2; + break; + + case 'X': + flags |= LARGE; + case 'x': + base = 16; + break; + + case 'd': + case 'i': + flags |= SIGN; + case 'u': + break; + + default: + if (*fmt != '%') { + if (str <= end) + *str = '%'; + ++str; + } + if (*fmt) { + if (str <= end) + *str = *fmt; + ++str; + } else + --fmt; + continue; + } + + if (qualifier == 'I') + num = va_arg(args, unsigned long long); + else if (qualifier == 'l') { + if (flags & SIGN) + num = va_arg(args, long); + else + num = va_arg(args, unsigned long); + } + else if (qualifier == 'h') { + if (flags & SIGN) + num = va_arg(args, int); + else + num = va_arg(args, unsigned int); + } + else { + if (flags & SIGN) + num = va_arg(args, int); + else + num = va_arg(args, unsigned int); + } + str = number(str, end, num, base, field_width, precision, flags); + } + if (str <= end) + *str = '\0'; + else if (cnt > 0) + /* don't write out a null byte if the buf size is zero */ + *end = '\0'; + return str-buf; +} + + +/* + * @implemented + */ +int sprintf(char * buf, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=_vsnprintf(buf,MAXLONG,fmt,args); + va_end(args); + return i; +} + + +/* + * @implemented + */ +int _snprintf(char * buf, size_t cnt, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=_vsnprintf(buf,cnt,fmt,args); + va_end(args); + return i; +} + + +/* + * @implemented + */ +int vsprintf(char *buf, const char *fmt, va_list args) +{ + return _vsnprintf(buf,MAXLONG,fmt,args); +} + +/* EOF */ _____ Added: trunk/reactos/lib/rtl/swprintf.c --- trunk/reactos/lib/rtl/swprintf.c 2005-09-08 05:03:34 UTC (rev 17734) +++ trunk/reactos/lib/rtl/swprintf.c 2005-09-08 06:52:01 UTC (rev 17735) @@ -0,0 +1,545 @@ +/* + * PROGRAMMERS: David Welch + * Eric Kohl + * + * TODO: + * - Verify the implementation of '%Z'. + */ + +/* + * linux/lib/vsprintf.c + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ +/* + * Wirzenius wrote this portably, Torvalds fucked it up :-) + */ + +#include <rtl.h> + +#define ZEROPAD 1 /* pad with zero */ +#define SIGN 2 /* unsigned/signed long */ +#define PLUS 4 /* show plus */ +#define SPACE 8 /* space if plus */ +#define LEFT 16 /* left justified */ +#define SPECIAL 32 /* 0x */ +#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ + + +static +__inline +int +do_div(long long *n, int base) +{ + int a; + a = ((unsigned long long) *n) % (unsigned) base; + *n = ((unsigned long long) *n) / (unsigned) base; + return a; +} + + +static int skip_atoi(const wchar_t **s) +{ + int i=0; + + while (iswdigit(**s)) + i = i*10 + *((*s)++) - L'0'; + return i; +} + + +static wchar_t * +number(wchar_t * buf, wchar_t * end, long long num, int base, int size, int precision, int type) +{ + wchar_t c, sign, tmp[66]; + const wchar_t *digits; + const wchar_t *small_digits = L"0123456789abcdefghijklmnopqrstuvwxyz"; + const wchar_t *large_digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + int i; + + digits = (type & LARGE) ? large_digits : small_digits; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return 0; + c = (type & ZEROPAD) ? L'0' : L' '; + sign = 0; + if (type & SIGN) { + if (num < 0) { + sign = L'-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = L'+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + if (type & SPECIAL) { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + i = 0; + if (num == 0) + tmp[i++] = L'0'; + else while (num != 0) + tmp[i++] = digits[do_div(&num,base)]; + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) { + while(size-->0) { + if (buf <= end) + *buf = L' '; + ++buf; + } + } + if (sign) { + if (buf <= end) + *buf = sign; + ++buf; + } + if (type & SPECIAL) { + if (base==8) { + if (buf <= end) + *buf = L'0'; + ++buf; + } else if (base==16) { + if (buf <= end) + *buf = L'0'; + ++buf; + if (buf <= end) + *buf = digits[33]; + ++buf; + } + } + if (!(type & LEFT)) { + while (size-- > 0) { + if (buf <= end) + *buf = c; + ++buf; + } + } + while (i < precision--) { + if (buf <= end) + *buf = L'0'; + ++buf; + } + while (i-- > 0) { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) { + if (buf <= end) + *buf = L' '; + ++buf; + } + return buf; +} + +static wchar_t* +string(wchar_t* buf, wchar_t* end, const char* s, int len, int field_width, int precision, int flags) +{ + int i; + if (s == NULL) + { + s = "<NULL>"; + len = 6; + } + else + { + if (len == -1) + { + len = 0; + while ((unsigned int)len < (unsigned int)precision && s[len]) + len++; + } + else + { + if ((unsigned int)len > (unsigned int)precision) + len = precision; + } + } + if (!(flags & LEFT)) + while (len < field_width--) + { + if (buf <= end) + *buf = L' '; + ++buf; + } + for (i = 0; i < len; ++i) + { + if (buf <= end) + *buf = *s++; + ++buf; + } + while (len < field_width--) + { + if (buf <= end) + *buf = L' '; + ++buf; + } + return buf; +} + +static wchar_t* +stringw(wchar_t* buf, wchar_t* end, const wchar_t* sw, int len, int field_width, int precision, int flags) +{ + int i; + if (sw == NULL) + { + sw = L"<NULL>"; + len = 6; + } + else + { + if (len == -1) + { + len = 0; + while ((unsigned int)len < (unsigned int)precision && sw[len]) + len++; + } + else + { + if ((unsigned int)len > (unsigned int)precision) + len = precision; + } + } + if (!(flags & LEFT)) + while (len < field_width--) + { + if (buf <= end) + *buf = L' '; + buf++; + } + for (i = 0; i < len; ++i) + { + if (buf <= end) + *buf = *sw++; + buf++; + } + while (len < field_width--) + { + if (buf <= end) + *buf = L' '; + buf++; + } + return buf; +} + +/* + * @implemented + */ +int _vsnwprintf(wchar_t *buf, size_t cnt, const wchar_t *fmt, va_list args) +{ + int len; + unsigned long long num; + int base; + wchar_t * str, * end; + const char *s; + const wchar_t *sw; + + int flags; /* flags to number() */ + + int field_width; /* width of output field */ + int precision; /* min. # of digits for integers; max + number of chars for from string */ + int qualifier; /* 'h', 'l', 'L', 'w' or 'I' for integer fields */ + + str = buf; + end = buf + cnt - 1; + if (end < buf - 1) { + end = ((void *) -1); + cnt = end - buf + 1; + } + + for ( ; *fmt ; ++fmt) { + if (*fmt != L'%') { + if (str <= end) + *str = *fmt; + ++str; + continue; + } + + /* process flags */ + flags = 0; + repeat: + ++fmt; /* this also skips first '%' */ + switch (*fmt) { + case L'-': flags |= LEFT; goto repeat; + case L'+': flags |= PLUS; goto repeat; + case L' ': flags |= SPACE; goto repeat; + case L'#': flags |= SPECIAL; goto repeat; + case L'0': flags |= ZEROPAD; goto repeat; + } + + /* get field width */ + field_width = -1; + if (iswdigit(*fmt)) + field_width = skip_atoi(&fmt); + else if (*fmt == L'*') { + ++fmt; + /* it's the next argument */ + field_width = va_arg(args, int); + if (field_width < 0) { + field_width = -field_width; + flags |= LEFT; + } + } + + /* get the precision */ + precision = -1; + if (*fmt == L'.') { + ++fmt; + if (iswdigit(*fmt)) + precision = skip_atoi(&fmt); + else if (*fmt == L'*') { + ++fmt; + /* it's the next argument */ + precision = va_arg(args, int); + } + if (precision < 0) + precision = 0; + } + + /* get the conversion qualifier */ + qualifier = -1; + if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') { + qualifier = *fmt; + ++fmt; + } else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') { + qualifier = *fmt; + fmt += 3; + } + + /* default base */ + base = 10; + + switch (*fmt) { + case L'c': [truncated at 1000 lines; 2962 more skipped]

1 0

[ion] 17734: Share more duplicated functions
by ion＠svn.reactos.com 08 Sep '05

08 Sep '05

Share more duplicated functions Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/ntdll/stdlib/ Added: trunk/reactos/lib/string/abs.c Added: trunk/reactos/lib/string/atoi.c Added: trunk/reactos/lib/string/atoi64.c Added: trunk/reactos/lib/string/atol.c Added: trunk/reactos/lib/string/bsearch.c Added: trunk/reactos/lib/string/itoa.c Added: trunk/reactos/lib/string/itow.c Added: trunk/reactos/lib/string/labs.c Added: trunk/reactos/lib/string/lfind.c Added: trunk/reactos/lib/string/mbstowcs.c Added: trunk/reactos/lib/string/rand.c Added: trunk/reactos/lib/string/splitp.c Modified: trunk/reactos/lib/string/string.xml Added: trunk/reactos/lib/string/strtol.c Added: trunk/reactos/lib/string/strtoul.c Added: trunk/reactos/lib/string/wcstol.c Added: trunk/reactos/lib/string/wcstombs.c Added: trunk/reactos/lib/string/wcstoul.c Added: trunk/reactos/lib/string/wtoi.c Added: trunk/reactos/lib/string/wtoi64.c Added: trunk/reactos/lib/string/wtol.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-09-08 05:03:34 UTC (rev 17734) @@ -11,6 +11,8 @@ /* DEPENDENCIES **************************************************************/ #include <ntnls.h> +#include "extypes.h" +#include "rtltypes.h" /* PROTOTYPES ****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 05:03:34 UTC (rev 17734) @@ -42,27 +42,6 @@ <file>sscanf.c</file> <file>swprintf.c</file> </directory> - <directory name="stdlib"> - <file>abs.c</file> - <file>atoi64.c</file> - <file>atoi.c</file> - <file>atol.c</file> - <file>bsearch.c</file> - <file>itoa.c</file> - <file>itow.c</file> - <file>labs.c</file> - <file>lfind.c</file> - <file>mbstowcs.c</file> - <file>splitp.c</file> - <file>strtol.c</file> - <file>strtoul.c</file> - <file>wcstol.c</file> - <file>wcstombs.c</file> - <file>wcstoul.c</file> - <file>wtoi64.c</file> - <file>wtoi.c</file> - <file>wtol.c</file> - </directory> <directory name="def"> <file>ntdll.rc</file> </directory> _____ Added: trunk/reactos/lib/string/abs.c --- trunk/reactos/lib/string/abs.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/abs.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,10 @@ +#include <string.h> + +/* + * @implemented + */ +int +abs(int j) +{ + return j<0 ? -j : j; +} _____ Added: trunk/reactos/lib/string/atoi.c --- trunk/reactos/lib/string/atoi.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/atoi.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,11 @@ +#include <string.h> +#include <stdlib.h> + +/* + * @implemented + */ +int +atoi(const char *str) +{ + return (int)strtol(str, 0, 10); +} _____ Added: trunk/reactos/lib/string/atoi64.c --- trunk/reactos/lib/string/atoi64.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/atoi64.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,36 @@ +#include <string.h> +#include <ctype.h> + +/* + * @implemented + */ +__int64 +_atoi64 (const char *nptr) +{ + int c; + __int64 value; + int sign; + + while (isspace((int)*nptr)) + ++nptr; + + c = (int)*nptr++; + sign = c; + if (c == '-' || c == '+') + c = (int)*nptr++; + + value = 0; + + while (isdigit(c)) + { + value = 10 * value + (c - '0'); + c = (int)*nptr++; + } + + if (sign == '-') + return -value; + else + return value; +} + +/* EOF */ _____ Added: trunk/reactos/lib/string/atol.c --- trunk/reactos/lib/string/atol.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/atol.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,11 @@ +#include <string.h> +#include <stdlib.h> + +/* + * @implemented + */ +long +atol(const char *str) +{ + return strtol(str, 0, 10); +} _____ Added: trunk/reactos/lib/string/bsearch.c --- trunk/reactos/lib/string/bsearch.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/bsearch.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,27 @@ +#include <string.h> + +/* + * @implemented + */ +void * +bsearch(const void *key, const void *base0, size_t nelem, + size_t size, int (*cmp)(const void *ck, const void *ce)) +{ + char *base = (char *)base0; + int lim, cmpval; + void *p; + + for (lim = nelem; lim != 0; lim >>= 1) + { + p = base + (lim >> 1) * size; + cmpval = (*cmp)(key, p); + if (cmpval == 0) + return p; + if (cmpval > 0) + { /* key > p: move right */ + base = (char *)p + size; + lim--; + } /* else move left */ + } + return 0; +} _____ Added: trunk/reactos/lib/string/itoa.c --- trunk/reactos/lib/string/itoa.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/itoa.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,167 @@ +#include <string.h> +#include <stdlib.h> + +/* + * @implemented + */ +char * +_i64toa(__int64 value, char *string, int radix) +{ + char tmp[65]; + char *tp = tmp; + __int64 i; + unsigned __int64 v; + __int64 sign; + char *sp; + + if (radix > 36 || radix <= 1) + { + return 0; + } + + sign = (radix == 10 && value < 0); + if (sign) + v = -value; + else + v = (unsigned __int64)value; + while (v || tp == tmp) + { + i = v % radix; + v = v / radix; + if (i < 10) + *tp++ = i+'0'; + else + *tp++ = i + 'a' - 10; + } + + sp = string; + if (sign) + *sp++ = '-'; + while (tp > tmp) + *sp++ = *--tp; + *sp = 0; + return string; +} + + +/* + * @implemented + */ +char * +_ui64toa(unsigned __int64 value, char *string, int radix) +{ + char tmp[65]; + char *tp = tmp; + __int64 i; + unsigned __int64 v; + char *sp; + + if (radix > 36 || radix <= 1) + { + return 0; + } + + v = (unsigned __int64)value; + while (v || tp == tmp) + { + i = v % radix; + v = v / radix; + if (i < 10) + *tp++ = i+'0'; + else + *tp++ = i + 'a' - 10; + } + + sp = string; + while (tp > tmp) + *sp++ = *--tp; + *sp = 0; + return string; +} + + +/* + * @implemented + */ +char * +_itoa(int value, char *string, int radix) +{ + return _ltoa(value, string, radix); +} + + +/* + * @implemented + */ +char * +_ltoa(long value, char *string, int radix) +{ + unsigned long val; + int negative; + char buffer[33]; + char *pos; + int digit; + + if (value < 0 && radix == 10) { + negative = 1; + val = -value; + } else { + negative = 0; + val = value; + } /* if */ + + pos = &buffer[32]; + *pos = '\0'; + + do { + digit = val % radix; + val = val / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (val != 0L); + + if (negative) { + *--pos = '-'; + } /* if */ + + memcpy(string, pos, &buffer[32] - pos + 1); + return string; +} + + +/* + * @implemented + */ +char * +_ultoa(unsigned long value, char *string, int radix) +{ + char tmp[33]; + char *tp = tmp; + long i; + unsigned long v = value; + char *sp; + + if (radix > 36 || radix <= 1) + { + return 0; + } + + while (v || tp == tmp) + { + i = v % radix; + v = v / radix; + if (i < 10) + *tp++ = i+'0'; + else + *tp++ = i + 'a' - 10; + } + + sp = string; + while (tp > tmp) + *sp++ = *--tp; + *sp = 0; + return string; +} _____ Added: trunk/reactos/lib/string/itow.c --- trunk/reactos/lib/string/itow.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/itow.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,200 @@ +#include <string.h> + +/* + * @implemented + */ +wchar_t * +_i64tow(__int64 value, wchar_t *string, int radix) +{ + wchar_t tmp[65]; + wchar_t *tp = tmp; + __int64 i; + unsigned __int64 v; + __int64 sign; + wchar_t *sp; + + if (radix > 36 || radix <= 1) + { + return 0; + } + + sign = (radix == 10 && value < 0); + if (sign) + v = -value; + else + v = (unsigned __int64)value; + while (v || tp == tmp) + { + i = v % radix; + v = v / radix; + if (i < 10) + *tp++ = i+L'0'; + else + *tp++ = i + L'a' - 10; + } + + sp = string; + if (sign) + *sp++ = L'-'; + while (tp > tmp) + *sp++ = *--tp; + *sp = 0; + return string; +} + + +/* + * @implemented + */ +wchar_t * +_ui64tow(unsigned __int64 value, wchar_t *string, int radix) +{ + wchar_t tmp[65]; + wchar_t *tp = tmp; + __int64 i; + unsigned __int64 v; + wchar_t *sp; + + if (radix > 36 || radix <= 1) + { + return 0; + } + + v = (unsigned __int64)value; + while (v || tp == tmp) + { + i = v % radix; + v = v / radix; + if (i < 10) + *tp++ = i+L'0'; + else + *tp++ = i + L'a' - 10; + } + + sp = string; + while (tp > tmp) + *sp++ = *--tp; + *sp = 0; + return string; +} + + +/* + * @implemented + */ +wchar_t * +_itow(int value, wchar_t *string, int radix) +{ + wchar_t tmp[33]; + wchar_t *tp = tmp; + int i; + unsigned v; + int sign; + wchar_t *sp; + + if (radix > 36 || radix <= 1) + { + return 0; + } + + sign = (radix == 10 && value < 0); + if (sign) + v = -value; + else + v = (unsigned)value; + while (v || tp == tmp) + { + i = v % radix; + v = v / radix; + if (i < 10) + *tp++ = i+L'0'; + else + *tp++ = i + L'a' - 10; + } + + sp = string; + if (sign) + *sp++ = L'-'; + while (tp > tmp) + *sp++ = *--tp; + *sp = 0; + return string; +} + + +/* + * @implemented + */ +wchar_t * +_ltow(long value, wchar_t *string, int radix) +{ + wchar_t tmp[33]; + wchar_t *tp = tmp; + long i; + unsigned long v; + int sign; + wchar_t *sp; + + if (radix > 36 || radix <= 1) + { + return 0; + } + + sign = (radix == 10 && value < 0); + if (sign) + v = -value; + else + v = (unsigned long)value; + while (v || tp == tmp) + { + i = v % radix; + v = v / radix; + if (i < 10) + *tp++ = i+L'0'; + else + *tp++ = i + L'a' - 10; + } + + sp = string; + if (sign) + *sp++ = L'-'; + while (tp > tmp) + *sp++ = *--tp; + *sp = 0; + return string; +} + + +/* + * @implemented + */ +wchar_t * +_ultow(unsigned long value, wchar_t *string, int radix) +{ + wchar_t tmp[33]; + wchar_t *tp = tmp; + long i; + unsigned long v = value; + wchar_t *sp; + + if (radix > 36 || radix <= 1) + { + return 0; + } + + while (v || tp == tmp) + { + i = v % radix; + v = v / radix; + if (i < 10) + *tp++ = i+L'0'; + else + *tp++ = i + L'a' - 10; + } + + sp = string; + while (tp > tmp) + *sp++ = *--tp; + *sp = 0; + return string; +} _____ Added: trunk/reactos/lib/string/labs.c --- trunk/reactos/lib/string/labs.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/labs.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,9 @@ +#include <string.h> +/* + * @implemented + */ +long +labs(long j) +{ + return j<0 ? -j : j; +} _____ Added: trunk/reactos/lib/string/lfind.c --- trunk/reactos/lib/string/lfind.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/lfind.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,20 @@ +#include <string.h> +/* + * @implemented + */ +void *_lfind(const void *key, const void *base, size_t *nelp, + size_t width, int (*compar)(const void *, const void *)) +{ + char* char_base = (char*)base; + size_t i; + + for (i = 0; i < *nelp; i++) + { + if (compar(key, char_base) == 0) + return char_base; + + char_base += width; + } + + return NULL; +} _____ Added: trunk/reactos/lib/string/mbstowcs.c --- trunk/reactos/lib/string/mbstowcs.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/mbstowcs.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,61 @@ +#include <windows.h> +#define NTOS_MODE_USER +#define _NTSYSTEM_ +#include <ndk/umtypes.h> +#include <ndk/rtlfuncs.h> +#include <string.h> + +/* + * @implemented + */ +int mbtowc (wchar_t *wchar, const char *mbchar, size_t count) +{ + NTSTATUS Status; + ULONG Size; + + if (wchar == NULL) + return 0; + + Status = RtlMultiByteToUnicodeN (wchar, + sizeof(WCHAR), + &Size, + (char *)mbchar, + count); + if (!NT_SUCCESS(Status)) + return -1; + + return (int)Size; +} + +/* + * @implemented + */ +size_t mbstowcs (wchar_t *wcstr, const char *mbstr, size_t count) +{ + NTSTATUS Status; + ULONG Size; + ULONG Length; + + Length = strlen (mbstr); + + if (wcstr == NULL) + { + RtlMultiByteToUnicodeSize (&Size, + (char *)mbstr, + Length); + + return (size_t)Size; + } + + Status = RtlMultiByteToUnicodeN (wcstr, + count, + &Size, + (char *)mbstr, + Length); + if (!NT_SUCCESS(Status)) + return -1; + + return (size_t)Size; +} + +/* EOF */ _____ Added: trunk/reactos/lib/string/rand.c --- trunk/reactos/lib/string/rand.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/rand.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,29 @@ +#include <stdlib.h> + +#if defined(__GNUC__) +static unsigned long long next = 0; +#else +static unsigned __int64 next = 0; +#endif + +/* + * @implemented + */ +int rand(void) +{ +#if defined(__GNUC__) + next = next * 0x5deece66dLL + 11; +#else + next = next * 0x5deece66di64 + 11; +#endif + return (int)((next >> 16) & RAND_MAX); +} + + +/* + * @implemented + */ +void srand(unsigned seed) +{ + next = seed; +} _____ Added: trunk/reactos/lib/string/splitp.c --- trunk/reactos/lib/string/splitp.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/splitp.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,50 @@ +#include <string.h> +/* + * @implemented + */ +void _splitpath(const char* path, char* drive, char* dir, char* fname, char* ext) +{ + char* tmp_drive; + char* tmp_dir; + char* tmp_ext; + + tmp_drive = (char*)strchr(path,':'); + if (drive) { + if (tmp_drive) { + strncpy(drive,tmp_drive-1,2); + *(drive+2) = 0; + } else { + *drive = 0; + } + } + if (!tmp_drive) { + tmp_drive = (char*)path - 1; + } + + tmp_dir = (char*)strrchr(path,'\\'); + if (dir) { + if (tmp_dir) { + strncpy(dir,tmp_drive+1,tmp_dir-tmp_drive); + *(dir+(tmp_dir-tmp_drive)) = 0; + } else { + *dir =0; + } + } + + tmp_ext = (char*)strrchr(path,'.'); + if (!tmp_ext) { + tmp_ext = (char*)path+strlen(path); + } + if (ext) { + strcpy(ext,tmp_ext); + } + + if (tmp_dir) { + strncpy(fname,tmp_dir+1,tmp_ext-tmp_dir-1); + *(fname+(tmp_ext-tmp_dir-1)) = 0; + } else { + strncpy(fname,tmp_drive+1,tmp_ext-tmp_drive-1); + *(fname+(tmp_ext-path))=0; + } +} + _____ Modified: trunk/reactos/lib/string/string.xml --- trunk/reactos/lib/string/string.xml 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/string.xml 2005-09-08 05:03:34 UTC (rev 17734) @@ -76,4 +76,24 @@ <file>wstring.c</file> <file>wcsrev.c</file> <file>wcsnset.c</file> + <file>abs.c</file> + <file>atoi64.c</file> + <file>atoi.c</file> + <file>atol.c</file> + <file>bsearch.c</file> + <file>itoa.c</file> + <file>itow.c</file> + <file>labs.c</file> + <file>lfind.c</file> + <file>mbstowcs.c</file> + <file>splitp.c</file> + <file>strtol.c</file> + <file>strtoul.c</file> + <file>wcstol.c</file> + <file>wcstombs.c</file> + <file>wcstoul.c</file> + <file>wtoi64.c</file> + <file>wtoi.c</file> + <file>wtol.c</file> + <file>rand.c</file> </module> _____ Added: trunk/reactos/lib/string/strtol.c --- trunk/reactos/lib/string/strtol.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/strtol.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,90 @@ +#include <string.h> +#include <limits.h> +#include <ctype.h> + +/* + * @implemented + */ +long +strtol(const char *nptr, char **endptr, int base) +{ + const char *s = nptr; + unsigned long acc; + int c; + unsigned long cutoff; + int neg = 0, any, cutlim; + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + do { + c = *s++; + } while (isspace(c)); + if (c == '-') + { + neg = 1; + c = *s++; + } + else if (c == '+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) + { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + + /* + * Compute the cutoff value between legal numbers and illegal + * numbers. That is the largest legal value, divided by the + * base. An input number that is greater than this value, if + * followed by a legal input character, is too big. One that + * is equal to this value may be valid or not; the limit + * between valid and invalid numbers is then based on the last + * digit. For instance, if the range for longs is + * [-2147483648..2147483647] and the input base is 10, + * cutoff will be set to 214748364 and cutlim to either + * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated + * a value > 214748364, or equal but the next digit is > 7 (or 8), + * the number is too big, and we will return a range error. + * + * Set any if any `digits' consumed; make it negative to indicate + * overflow. + */ + cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX; + cutlim = cutoff % (unsigned long)base; + cutoff /= (unsigned long)base; + for (acc = 0, any = 0;; c = *s++) + { + if (isdigit(c)) + c -= '0'; + else if (isalpha(c)) + c -= isupper(c) ? 'A' - 10 : 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) + any = -1; + else + { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) + { + acc = neg ? LONG_MIN : LONG_MAX; + } + else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (char *)s - 1 : (char *)nptr; + return acc; +} _____ Added: trunk/reactos/lib/string/strtoul.c --- trunk/reactos/lib/string/strtoul.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/strtoul.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,73 @@ +#include <string.h> +#include <limits.h> +#include <ctype.h> + +/* + * Convert a string to an unsigned long integer. + * + * Ignores `locale' stuff. Assumes that the upper and lower case + * alphabets and digits are each contiguous. + * + * @implemented + */ +unsigned long +strtoul(const char *nptr, char **endptr, int base) +{ + const char *s = nptr; + unsigned long acc; + int c; + unsigned long cutoff; + int neg = 0, any, cutlim; + + /* + * See strtol for comments as to the logic used. + */ + do { + c = *s++; + } while (isspace(c)); + if (c == '-') + { + neg = 1; + c = *s++; + } + else if (c == '+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) + { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + cutoff = (unsigned long)ULONG_MAX / (unsigned long)base; + cutlim = (unsigned long)ULONG_MAX % (unsigned long)base; + for (acc = 0, any = 0;; c = *s++) + { + if (isdigit(c)) + c -= '0'; + else if (isalpha(c)) + c -= isupper(c) ? 'A' - 10 : 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) + { + acc = ULONG_MAX; + } + else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (char *)s - 1 : (char *)nptr; + return acc; +} _____ Added: trunk/reactos/lib/string/wcstol.c --- trunk/reactos/lib/string/wcstol.c 2005-09-08 04:27:02 UTC (rev 17733) +++ trunk/reactos/lib/string/wcstol.c 2005-09-08 05:03:34 UTC (rev 17734) @@ -0,0 +1,90 @@ +#include <string.h> +#include <ctype.h> +#include <limits.h> + +/* + * @implemented + */ +long +wcstol(const wchar_t *nptr, wchar_t **endptr, int base) +{ + const wchar_t *s = nptr; + unsigned long acc; + int c; + unsigned long cutoff; + int neg = 0, any, cutlim; + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + do { + c = *s++; + } while (iswctype(c, _SPACE)); + if (c == '-') + { + neg = 1; + c = *s++; + } + else if (c == L'+') + c = *s++; + if ((base == 0 || base == 16) && + c == L'0' && (*s == L'x' || *s == L'X')) + { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == L'0' ? 8 : 10; + + /* + * Compute the cutoff value between legal numbers and illegal + * numbers. That is the largest legal value, divided by the + * base. An input number that is greater than this value, if + * followed by a legal input character, is too big. One that + * is equal to this value may be valid or not; the limit + * between valid and invalid numbers is then based on the last + * digit. For instance, if the range for longs is + * [-2147483648..2147483647] and the input base is 10, + * cutoff will be set to 214748364 and cutlim to either + * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated + * a value > 214748364, or equal but the next digit is > 7 (or 8), + * the number is too big, and we will return a range error. + * + * Set any if any `digits' consumed; make it negative to indicate + * overflow. [truncated at 1000 lines; 263 more skipped]

1 0

[ion] 17733: Don't duplicate string and ctype functions 2 (or even 3) times... we have stringlib for that
by ion＠svn.reactos.com 08 Sep '05

08 Sep '05

Don't duplicate string and ctype functions 2 (or even 3) times... we have stringlib for that Modified: trunk/reactos/lib/kjs/ksrc/compat.c Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/ntdll/string/ Added: trunk/reactos/lib/string/ctype.c Added: trunk/reactos/lib/string/memicmp.c Added: trunk/reactos/lib/string/stricmp.c Modified: trunk/reactos/lib/string/string.xml Added: trunk/reactos/lib/string/strlwr.c Added: trunk/reactos/lib/string/strnicmp.c Added: trunk/reactos/lib/string/strrev.c Added: trunk/reactos/lib/string/strset.c Added: trunk/reactos/lib/string/strstr.c Added: trunk/reactos/lib/string/strupr.c Added: trunk/reactos/lib/string/wcsnset.c Added: trunk/reactos/lib/string/wcsrev.c Added: trunk/reactos/lib/string/wstring.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Deleted: trunk/reactos/ntoskrnl/rtl/string.c Deleted: trunk/reactos/ntoskrnl/rtl/wstring.c _____ Modified: trunk/reactos/lib/kjs/ksrc/compat.c --- trunk/reactos/lib/kjs/ksrc/compat.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/kjs/ksrc/compat.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -12,10 +12,6 @@ __kernel_abort(); } -int isalnum( int x ) { return isalpha(x) || isdigit(x); } -int iscntrl( int x ) { return 32 > x; } -int ispunct( int x ) { return !isspace(x) && !isalnum(x) && !iscntrl(x) && !isspace(x); } - static int belongs_to_base( int x, int base ) { if( x >= '0' && '9' >= x ) { if( base > x - '0' ) return x - '0'; _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 04:27:02 UTC (rev 17733) @@ -12,6 +12,7 @@ <library>intrlck</library> <library>string</library> <linkerflag>-lgcc</linkerflag> + <linkerflag>-nostdlib</linkerflag> <linkerflag>-nostartfiles</linkerflag> <directory name="csr"> <file>api.c</file> @@ -62,16 +63,6 @@ <file>wtoi.c</file> <file>wtol.c</file> </directory> - <directory name="string"> - <file>ctype.c</file> - <file>memicmp.c</file> - <file>stricmp.c</file> - <file>strlwr.c</file> - <file>strnicmp.c</file> - <file>strstr.c</file> - <file>strupr.c</file> - <file>wstring.c</file> - </directory> <directory name="def"> <file>ntdll.rc</file> </directory> _____ Copied: trunk/reactos/lib/string/ctype.c (from rev 17732, trunk/reactos/lib/ntdll/string/ctype.c) --- trunk/reactos/lib/ntdll/string/ctype.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/ctype.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,507 @@ +#include <string.h> +#include <ctype.h> + +#undef _pctype + +#define upalpha ('A' - 'a') + + +unsigned short _ctype[] = { + 0, /* <EOF>, 0xFFFF */ + _CONTROL, /* CTRL+@, 0x00 */ + _CONTROL, /* CTRL+A, 0x01 */ + _CONTROL, /* CTRL+B, 0x02 */ + _CONTROL, /* CTRL+C, 0x03 */ + _CONTROL, /* CTRL+D, 0x04 */ + _CONTROL, /* CTRL+E, 0x05 */ + _CONTROL, /* CTRL+F, 0x06 */ + _CONTROL, /* CTRL+G, 0x07 */ + _CONTROL, /* CTRL+H, 0x08 */ + _CONTROL | _SPACE, /* CTRL+I, 0x09 */ + _CONTROL | _SPACE, /* CTRL+J, 0x0a */ + _CONTROL | _SPACE, /* CTRL+K, 0x0b */ + _CONTROL | _SPACE, /* CTRL+L, 0x0c */ + _CONTROL | _SPACE, /* CTRL+M, 0x0d */ + _CONTROL, /* CTRL+N, 0x0e */ + _CONTROL, /* CTRL+O, 0x0f */ + _CONTROL, /* CTRL+P, 0x10 */ + _CONTROL, /* CTRL+Q, 0x11 */ + _CONTROL, /* CTRL+R, 0x12 */ + _CONTROL, /* CTRL+S, 0x13 */ + _CONTROL, /* CTRL+T, 0x14 */ + _CONTROL, /* CTRL+U, 0x15 */ + _CONTROL, /* CTRL+V, 0x16 */ + _CONTROL, /* CTRL+W, 0x17 */ + _CONTROL, /* CTRL+X, 0x18 */ + _CONTROL, /* CTRL+Y, 0x19 */ + _CONTROL, /* CTRL+Z, 0x1a */ + _CONTROL, /* CTRL+[, 0x1b */ + _CONTROL, /* CTRL+\, 0x1c */ + _CONTROL, /* CTRL+], 0x1d */ + _CONTROL, /* CTRL+^, 0x1e */ + _CONTROL, /* CTRL+_, 0x1f */ + _SPACE | _BLANK, /* ` ', 0x20 */ + _PUNCT, /* `!', 0x21 */ + _PUNCT, /* 0x22 */ + _PUNCT, /* `#', 0x23 */ + _PUNCT, /* `$', 0x24 */ + _PUNCT, /* `%', 0x25 */ + _PUNCT, /* `&', 0x26 */ + _PUNCT, /* 0x27 */ + _PUNCT, /* `(', 0x28 */ + _PUNCT, /* `)', 0x29 */ + _PUNCT, /* `*', 0x2a */ + _PUNCT, /* `+', 0x2b */ + _PUNCT, /* `,', 0x2c */ + _PUNCT, /* `-', 0x2d */ + _PUNCT, /* `.', 0x2e */ + _PUNCT, /* `/', 0x2f */ + _DIGIT | _HEX, /* `0', 0x30 */ + _DIGIT | _HEX, /* `1', 0x31 */ + _DIGIT | _HEX, /* `2', 0x32 */ + _DIGIT | _HEX, /* `3', 0x33 */ + _DIGIT | _HEX, /* `4', 0x34 */ + _DIGIT | _HEX, /* `5', 0x35 */ + _DIGIT | _HEX, /* `6', 0x36 */ + _DIGIT | _HEX, /* `7', 0x37 */ + _DIGIT | _HEX, /* `8', 0x38 */ + _DIGIT | _HEX, /* `9', 0x39 */ + _PUNCT, /* `:', 0x3a */ + _PUNCT, /* `;', 0x3b */ + _PUNCT, /* `<', 0x3c */ + _PUNCT, /* `=', 0x3d */ + _PUNCT, /* `>', 0x3e */ + _PUNCT, /* `?', 0x3f */ + _PUNCT, /* `@', 0x40 */ + _UPPER | _HEX, /* `A', 0x41 */ + _UPPER | _HEX, /* `B', 0x42 */ + _UPPER | _HEX, /* `C', 0x43 */ + _UPPER | _HEX, /* `D', 0x44 */ + _UPPER | _HEX, /* `E', 0x45 */ + _UPPER | _HEX, /* `F', 0x46 */ + _UPPER, /* `G', 0x47 */ + _UPPER, /* `H', 0x48 */ + _UPPER, /* `I', 0x49 */ + _UPPER, /* `J', 0x4a */ + _UPPER, /* `K', 0x4b */ + _UPPER, /* `L', 0x4c */ + _UPPER, /* `M', 0x4d */ + _UPPER, /* `N', 0x4e */ + _UPPER, /* `O', 0x4f */ + _UPPER, /* `P', 0x50 */ + _UPPER, /* `Q', 0x51 */ + _UPPER, /* `R', 0x52 */ + _UPPER, /* `S', 0x53 */ + _UPPER, /* `T', 0x54 */ + _UPPER, /* `U', 0x55 */ + _UPPER, /* `V', 0x56 */ + _UPPER, /* `W', 0x57 */ + _UPPER, /* `X', 0x58 */ + _UPPER, /* `Y', 0x59 */ + _UPPER, /* `Z', 0x5a */ + _PUNCT, /* `[', 0x5b */ + _PUNCT, /* 0x5c */ + _PUNCT, /* `]', 0x5d */ + _PUNCT, /* `^', 0x5e */ + _PUNCT, /* `_', 0x5f */ + _PUNCT, /* 0x60 */ + _LOWER | _HEX, /* `a', 0x61 */ + _LOWER | _HEX, /* `b', 0x62 */ + _LOWER | _HEX, /* `c', 0x63 */ + _LOWER | _HEX, /* `d', 0x64 */ + _LOWER | _HEX, /* `e', 0x65 */ + _LOWER | _HEX, /* `f', 0x66 */ + _LOWER, /* `g', 0x67 */ + _LOWER, /* `h', 0x68 */ + _LOWER, /* `i', 0x69 */ + _LOWER, /* `j', 0x6a */ + _LOWER, /* `k', 0x6b */ + _LOWER, /* `l', 0x6c */ + _LOWER, /* `m', 0x6d */ + _LOWER, /* `n', 0x6e */ + _LOWER, /* `o', 0x6f */ + _LOWER, /* `p', 0x70 */ + _LOWER, /* `q', 0x71 */ + _LOWER, /* `r', 0x72 */ + _LOWER, /* `s', 0x73 */ + _LOWER, /* `t', 0x74 */ + _LOWER, /* `u', 0x75 */ + _LOWER, /* `v', 0x76 */ + _LOWER, /* `w', 0x77 */ + _LOWER, /* `x', 0x78 */ + _LOWER, /* `y', 0x79 */ + _LOWER, /* `z', 0x7a */ + _PUNCT, /* `{', 0x7b */ + _PUNCT, /* `|', 0x7c */ + _PUNCT, /* `}', 0x7d */ + _PUNCT, /* `~', 0x7e */ + _CONTROL, /* 0x7f */ + 0, /* 0x80 */ + 0, /* 0x81 */ + 0, /* 0x82 */ + 0, /* 0x83 */ + 0, /* 0x84 */ + 0, /* 0x85 */ + 0, /* 0x86 */ + 0, /* 0x87 */ + 0, /* 0x88 */ + 0, /* 0x89 */ + 0, /* 0x8a */ + 0, /* 0x8b */ + 0, /* 0x8c */ + 0, /* 0x8d */ + 0, /* 0x8e */ + 0, /* 0x8f */ + 0, /* 0x90 */ + 0, /* 0x91 */ + 0, /* 0x92 */ + 0, /* 0x93 */ + 0, /* 0x94 */ + 0, /* 0x95 */ + 0, /* 0x96 */ + 0, /* 0x97 */ + 0, /* 0x98 */ + 0, /* 0x99 */ + 0, /* 0x9a */ + 0, /* 0x9b */ + 0, /* 0x9c */ + 0, /* 0x9d */ + 0, /* 0x9e */ + 0, /* 0x9f */ + 0, /* 0xa0 */ + 0, /* 0xa1 */ + 0, /* 0xa2 */ + 0, /* 0xa3 */ + 0, /* 0xa4 */ + 0, /* 0xa5 */ + 0, /* 0xa6 */ + 0, /* 0xa7 */ + 0, /* 0xa8 */ + 0, /* 0xa9 */ + 0, /* 0xaa */ + 0, /* 0xab */ + 0, /* 0xac */ + 0, /* 0xad */ + 0, /* 0xae */ + 0, /* 0xaf */ + 0, /* 0xb0 */ + 0, /* 0xb1 */ + 0, /* 0xb2 */ + 0, /* 0xb3 */ + 0, /* 0xb4 */ + 0, /* 0xb5 */ + 0, /* 0xb6 */ + 0, /* 0xb7 */ + 0, /* 0xb8 */ + 0, /* 0xb9 */ + 0, /* 0xba */ + 0, /* 0xbb */ + 0, /* 0xbc */ + 0, /* 0xbd */ + 0, /* 0xbe */ + 0, /* 0xbf */ + 0, /* 0xc0 */ + 0, /* 0xc1 */ + 0, /* 0xc2 */ + 0, /* 0xc3 */ + 0, /* 0xc4 */ + 0, /* 0xc5 */ + 0, /* 0xc6 */ + 0, /* 0xc7 */ + 0, /* 0xc8 */ + 0, /* 0xc9 */ + 0, /* 0xca */ + 0, /* 0xcb */ + 0, /* 0xcc */ + 0, /* 0xcd */ + 0, /* 0xce */ + 0, /* 0xcf */ + 0, /* 0xd0 */ + 0, /* 0xd1 */ + 0, /* 0xd2 */ + 0, /* 0xd3 */ + 0, /* 0xd4 */ + 0, /* 0xd5 */ + 0, /* 0xd6 */ + 0, /* 0xd7 */ + 0, /* 0xd8 */ + 0, /* 0xd9 */ + 0, /* 0xda */ + 0, /* 0xdb */ + 0, /* 0xdc */ + 0, /* 0xdd */ + 0, /* 0xde */ + 0, /* 0xdf */ + 0, /* 0xe0 */ + 0, /* 0xe1 */ + 0, /* 0xe2 */ + 0, /* 0xe3 */ + 0, /* 0xe4 */ + 0, /* 0xe5 */ + 0, /* 0xe6 */ + 0, /* 0xe7 */ + 0, /* 0xe8 */ + 0, /* 0xe9 */ + 0, /* 0xea */ + 0, /* 0xeb */ + 0, /* 0xec */ + 0, /* 0xed */ + 0, /* 0xee */ + 0, /* 0xef */ + 0, /* 0xf0 */ + 0, /* 0xf1 */ + 0, /* 0xf2 */ + 0, /* 0xf3 */ + 0, /* 0xf4 */ + 0, /* 0xf5 */ + 0, /* 0xf6 */ + 0, /* 0xf7 */ + 0, /* 0xf8 */ + 0, /* 0xf9 */ + 0, /* 0xfa */ + 0, /* 0xfb */ + 0, /* 0xfc */ + 0, /* 0xfd */ + 0, /* 0xfe */ + 0 /* 0xff */ +}; + +unsigned short *_pctype = _ctype + 1; +unsigned short *_pwctype = _ctype + 1; + +int _isctype (int c, int ctypeFlags) +{ + return (_pctype[(unsigned char)(c & 0xFF)] & ctypeFlags); +} + +/* + * @implemented + */ +int iswctype(wint_t wc, wctype_t wctypeFlags) +{ + return (_pwctype[(unsigned char)(wc & 0xFF)] & wctypeFlags); +} + +/* + * @implemented + */ +int isalpha(int c) +{ + return(_isctype(c, _ALPHA)); +} + +/* + * @implemented + */ +int isalnum(int c) +{ + return(_isctype(c, _ALPHA | _DIGIT)); +} + +/* + * @implemented + */ +int __isascii(int c) +{ + return ((unsigned char)c <= 0x7f); +} + +/* + * @implemented + */ +int iscntrl(int c) +{ + return(_isctype(c, _CONTROL)); +} + +/* + * @implemented + */ +int __iscsym(int c) +{ + return(isalnum(c)||(c == '_')); +} + +/* + * @implemented + */ +int __iscsymf(int c) +{ + return(isalpha(c)||(c == '_')); +} + +/* + * @implemented + */ +int isdigit(int c) +{ + return(_isctype(c, _DIGIT)); +} + +/* + * @implemented + */ +int isgraph(int c) +{ + return (_isctype (c, _PUNCT | _ALPHA | _DIGIT)); +} + +/* + * @implemented + */ +int islower(int c) +{ + return (_isctype (c, _LOWER)); +} + +/* + * @implemented + */ +int isprint(int c) +{ + return (_isctype (c, _BLANK | _PUNCT | _ALPHA | _DIGIT)); +} + +/* + * @implemented + */ +int ispunct(int c) +{ + return (_isctype (c, _PUNCT)); +} + +/* + * @implemented + */ +int isspace(int c) +{ + return (_isctype (c, _SPACE)); +} + +/* + * @implemented + */ +int isupper(int c) +{ + return (_isctype (c, _UPPER)); +} + +/* + * @implemented + */ +int isxdigit(int c) +{ + return (_isctype (c, _HEX)); +} + + +/* + * @implemented + */ +int iswalpha(wint_t c) +{ + return (iswctype (c, _ALPHA)); +} + +/* + * @implemented + */ +int iswdigit(wint_t c) +{ + return (iswctype (c, _DIGIT)); +} + +/* + * @implemented + */ +int iswlower(wint_t c) +{ + return (iswctype (c, _LOWER)); +} + +/* + * @implemented + */ +int iswspace(wint_t c) +{ + return (iswctype (c, _SPACE)); +} + +/* + * @implemented + */ +int iswxdigit(wint_t c) +{ + return (iswctype (c, _HEX)); +} + + +/* + * @implemented + */ +int __toascii(int c) +{ + return((unsigned)(c) & 0x7f); +} + +/* + * @implemented + */ +int _tolower(int c) +{ + if (_isctype (c, _UPPER)) + return (c - upalpha); + return(c); +} + +/* + * @implemented + */ +int _toupper(int c) +{ + if (_isctype (c, _LOWER)) + return (c + upalpha); + return(c); +} + +/* + * @implemented + */ +int tolower(int c) +{ + if (_isctype (c, _UPPER)) + return (c - upalpha); + return(c); +} + +/* + * @implemented + */ +int toupper(int c) +{ + if (_isctype (c, _LOWER)) + return (c + upalpha); + return(c); +} + +/* + * @implemented + */ +wchar_t towlower(wchar_t c) +{ + if (iswctype (c, _UPPER)) + return (c - upalpha); + return(c); +} + +/* + * @implemented + */ +wchar_t towupper(wchar_t c) +{ + if (iswctype (c, _LOWER)) + return (c + upalpha); + return(c); +} + +/* EOF */ _____ Copied: trunk/reactos/lib/string/memicmp.c (from rev 17732, trunk/reactos/lib/ntdll/string/memicmp.c) --- trunk/reactos/lib/ntdll/string/memicmp.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/memicmp.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,22 @@ +#include <string.h> +#include <ctype.h> + +/* + * @implemented + */ +int +_memicmp(const void *s1, const void *s2, size_t n) +{ + if (n != 0) + { + const unsigned char *p1 = s1, *p2 = s2; + + do { + if (toupper(*p1) != toupper(*p2)) + return (*p1 - *p2); + p1++; + p2++; + } while (--n != 0); + } + return 0; +} _____ Copied: trunk/reactos/lib/string/stricmp.c (from rev 17732, trunk/reactos/lib/ntdll/string/stricmp.c) --- trunk/reactos/lib/ntdll/string/stricmp.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/stricmp.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,27 @@ +#include <string.h> +#include <ctype.h> + +/* + * @implemented + */ +int +_stricmp(const char *s1, const char *s2) +{ + while (toupper(*s1) == toupper(*s2)) + { + if (*s1 == 0) + return 0; + s1++; + s2++; + } + return toupper(*(unsigned const char *)s1) - toupper(*(unsigned const char *)(s2)); +} + +/* + * @implemented + */ +int +_strcmpi(const char *s1, const char *s2) +{ + return _stricmp(s1,s2); +} _____ Modified: trunk/reactos/lib/string/string.xml --- trunk/reactos/lib/string/string.xml 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/string.xml 2005-09-08 04:27:02 UTC (rev 17733) @@ -59,9 +59,21 @@ The current implemention of rbuild generates a dependency rule for each occurence of a file. --> + <file>ctype.c</file> <file>memccpy.c</file> <file>memcmp.c</file> + <file>memicmp.c</file> <file>strcspn.c</file> + <file>stricmp.c</file> + <file>strnicmp.c</file> + <file>strlwr.c</file> + <file>strrev.c</file> + <file>strset.c</file> + <file>strstr.c</file> + <file>strupr.c</file> <file>strpbrk.c</file> <file>strspn.c</file> + <file>wstring.c</file> + <file>wcsrev.c</file> + <file>wcsnset.c</file> </module> _____ Copied: trunk/reactos/lib/string/strlwr.c (from rev 17732, trunk/reactos/lib/ntdll/string/strlwr.c) --- trunk/reactos/lib/ntdll/string/strlwr.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/strlwr.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,17 @@ +#include <string.h> +#include <ctype.h> + + +/* + * @implemented + */ +char * _strlwr(char *x) +{ + char *y=x; + + while (*y) { + *y=tolower(*y); + y++; + } + return x; +} _____ Copied: trunk/reactos/lib/string/strnicmp.c (from rev 17732, trunk/reactos/lib/ntdll/string/strnicmp.c) --- trunk/reactos/lib/ntdll/string/strnicmp.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/strnicmp.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,20 @@ +#include <string.h> +#include <ctype.h> + +/* + + * @implemented + */ +int _strnicmp(const char *s1, const char *s2, size_t n) +{ + + if (n == 0) + return 0; + do { + if (toupper(*s1) != toupper(*s2++)) + return toupper(*(unsigned const char *)s1) - toupper(*(unsigned const char *)--s2); + if (*s1++ == 0) + break; + } while (--n != 0); + return 0; +} _____ Added: trunk/reactos/lib/string/strrev.c --- trunk/reactos/lib/string/strrev.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/strrev.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,24 @@ +#include <string.h> + +/* + * @implemented + */ +char * _strrev(char *s) +{ + char *e; + char a; + + e = s; + while (*e) + e++; + + while (s<e) + { + a = *s; + *s = *e; + *e = a; + s++; + e--; + } + return s; +} _____ Added: trunk/reactos/lib/string/strset.c --- trunk/reactos/lib/string/strset.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/strset.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,33 @@ +#include <string.h> + +/* + * @implemented + */ +char* _strnset(char* szToFill, int szFill, size_t sizeMaxFill) +{ + char *t = szToFill; + int i = 0; + while (*szToFill != 0 && i < (int) sizeMaxFill) + { + *szToFill = szFill; + szToFill++; + i++; + + } + return t; +} + +/* + * @implemented + */ +char* _strset(char* szToFill, int szFill) +{ + char *t = szToFill; + while (*szToFill != 0) + { + *szToFill = szFill; + szToFill++; + + } + return t; +} _____ Copied: trunk/reactos/lib/string/strstr.c (from rev 17732, trunk/reactos/lib/ntdll/string/strstr.c) --- trunk/reactos/lib/ntdll/string/strstr.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/strstr.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,24 @@ +#include <string.h> + +/* + * @implemented + */ +char * +strstr(const char *s, const char *find) +{ + char c, sc; + size_t len; + + if ((c = *find++) != 0) + { + len = strlen(find); + do { + do { + if ((sc = *s++) == 0) + return 0; + } while (sc != c); + } while (strncmp(s, find, len) != 0); + s--; + } + return (char *)s; +} _____ Copied: trunk/reactos/lib/string/strupr.c (from rev 17732, trunk/reactos/lib/ntdll/string/strupr.c) --- trunk/reactos/lib/ntdll/string/strupr.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/strupr.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,17 @@ +#include <string.h> +#include <ctype.h> + + +/* + * @implemented + */ +char *_strupr(char *x) +{ + char *y=x; + + while (*y) { + *y=toupper(*y); + y++; + } + return x; +} _____ Added: trunk/reactos/lib/string/wcsnset.c --- trunk/reactos/lib/string/wcsnset.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/wcsnset.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,17 @@ +#include <string.h> + +/* + * @implemented + */ +wchar_t *_wcsnset (wchar_t* wsToFill, wchar_t wcFill, size_t sizeMaxFill) +{ + wchar_t *t = wsToFill; + int i = 0; + while( *wsToFill != 0 && i < (int) sizeMaxFill) + { + *wsToFill = wcFill; + wsToFill++; + i++; + } + return t; +} _____ Added: trunk/reactos/lib/string/wcsrev.c --- trunk/reactos/lib/string/wcsrev.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/wcsrev.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,22 @@ +#include <string.h> + +/* + * @implemented + */ +wchar_t *_wcsrev(wchar_t *s) +{ + wchar_t *e; + wchar_t a; + e=s; + while (*e) + e++; + while (s<e) + { + a=*s; + *s=*e; + *e=a; + s++; + e--; + } + return s; +} _____ Copied: trunk/reactos/lib/string/wstring.c (from rev 17732, trunk/reactos/lib/ntdll/string/wstring.c) --- trunk/reactos/lib/ntdll/string/wstring.c 2005-09-08 02:29:30 UTC (rev 17732) +++ trunk/reactos/lib/string/wstring.c 2005-09-08 04:27:02 UTC (rev 17733) @@ -0,0 +1,154 @@ +#include <string.h> +#include <ctype.h> + +/* FUNCTIONS *****************************************************************/ + +int _wcsicmp (const wchar_t* cs, const wchar_t * ct) +{ + while (towlower(*cs) == towlower(*ct)) + { + if (*cs == 0) + return 0; + cs++; + ct++; + } + return towlower(*cs) - towlower(*ct); +} + + +/* + * @implemented + */ +wchar_t *_wcslwr (wchar_t *x) +{ + wchar_t *y=x; + + while (*y) { + *y=towlower(*y); + y++; + } + return x; +} + + +/* + * @implemented + */ +int _wcsnicmp (const wchar_t * cs, const wchar_t * ct, size_t count) +{ + if (count == 0) + return 0; + do { + if (towupper(*cs) != towupper(*ct++)) + return towupper(*cs) - towupper(*--ct); + if (*cs++ == 0) + break; + } while (--count != 0); + return 0; +} + + +/* + * @implemented + */ +wchar_t *_wcsupr(wchar_t *x) +{ + wchar_t *y=x; + + while (*y) { + *y=towupper(*y); + y++; + } + return x; +} + +/* + * @implemented + */ +size_t wcscspn(const wchar_t *str,const wchar_t *reject) +{ + wchar_t *s; + wchar_t *t; + s=(wchar_t *)str; + do { + t=(wchar_t *)reject; + while (*t) { + if (*t==*s) + break; + t++; + } + if (*t) + break; + s++; + } while (*s); + return s-str; /* nr of wchars */ +} + +/* + * @implemented + */ +wchar_t *wcspbrk(const wchar_t *s1, const wchar_t *s2) +{ + const wchar_t *scanp; + int c, sc; + + while ((c = *s1++) != 0) + { + for (scanp = s2; (sc = *scanp++) != 0;) + if (sc == c) + { + return (wchar_t *)(--s1); + } + } + return 0; +} + +/* + * @implemented + */ +size_t wcsspn(const wchar_t *str,const wchar_t *accept) +{ + wchar_t *s; + wchar_t *t; + s=(wchar_t *)str; + do { + t=(wchar_t *)accept; + while (*t) { + if (*t==*s) + break; + t++; + } + if (!*t) + break; + s++; + } while (*s); + return s-str; /* nr of wchars */ +} + + +/* + * @implemented + */ +wchar_t *wcsstr(const wchar_t *s,const wchar_t *b) +{ + wchar_t *x; + wchar_t *y; + wchar_t *c; + x=(wchar_t *)s; + while (*x) { + if (*x==*b) { + y=x; [truncated at 1000 lines; 399 more skipped]

1 0

[ion] 17732: - Move more stuff to /rtl
by ion＠svn.reactos.com 08 Sep '05

08 Sep '05

- Move more stuff to /rtl - Bring back Ki* callbacks into ntdll. Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/ntdll/inc/ntdllp.h Modified: trunk/reactos/lib/ntdll/ldr/startup.c Added: trunk/reactos/lib/ntdll/main/dispatch.c Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/ntdll/rtl/critical.c Deleted: trunk/reactos/lib/ntdll/rtl/exception.c Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Deleted: trunk/reactos/lib/ntdll/rtl/path.c Deleted: trunk/reactos/lib/rtl/apc.c Deleted: trunk/reactos/lib/rtl/callback.c Added: trunk/reactos/lib/rtl/critical.c Modified: trunk/reactos/lib/rtl/heap.c Added: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/rtl.xml Added: trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-08 00:09:32 UTC (rev 17731) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-08 02:29:30 UTC (rev 17732) @@ -317,7 +317,6 @@ RtlAreBitsClear@12 RtlAreBitsSet@12 RtlAssert@16 -RtlBaseProcessStartRoutine DATA ;RtlCaptureStackBackTrace RtlCharToInteger@12 RtlCheckRegistryKey@8 _____ Modified: trunk/reactos/lib/ntdll/inc/ntdllp.h --- trunk/reactos/lib/ntdll/inc/ntdllp.h 2005-09-08 00:09:32 UTC (rev 17731) +++ trunk/reactos/lib/ntdll/inc/ntdllp.h 2005-09-08 02:29:30 UTC (rev 17732) @@ -27,50 +27,11 @@ (STDCALL *PDLLMAIN_FUNC)(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved); -VOID -STDCALL -RtlpInitDeferedCriticalSection( - VOID -); + #if defined(KDBG) || defined(DBG) VOID LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule); #endif extern HANDLE WindowsApiPort; -NTSTATUS -STDCALL -RtlpWaitForCriticalSection( - PRTL_CRITICAL_SECTION CriticalSection -); - -VOID -STDCALL -RtlpUnWaitCriticalSection( - PRTL_CRITICAL_SECTION CriticalSection -); - -VOID -STDCALL -RtlpCreateCriticalSectionSem( - PRTL_CRITICAL_SECTION CriticalSection -); - -VOID -STDCALL -RtlpInitDeferedCriticalSection( - VOID -); - -VOID -STDCALL -RtlpFreeDebugInfo( - PRTL_CRITICAL_SECTION_DEBUG DebugInfo -); - -PRTL_CRITICAL_SECTION_DEBUG -STDCALL -RtlpAllocateDebugInfo( - VOID -); /* EOF */ _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-09-08 00:09:32 UTC (rev 17731) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-09-08 02:29:30 UTC (rev 17732) @@ -17,6 +17,7 @@ VOID RtlInitializeHeapManager (VOID); VOID LdrpInitLoader(VOID); +VOID STDCALL RtlpInitDeferedCriticalSection(VOID); /* GLOBALS *******************************************************************/ _____ Added: trunk/reactos/lib/ntdll/main/dispatch.c --- trunk/reactos/lib/ntdll/main/dispatch.c 2005-09-08 00:09:32 UTC (rev 17731) +++ trunk/reactos/lib/ntdll/main/dispatch.c 2005-09-08 02:29:30 UTC (rev 17732) @@ -0,0 +1,121 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: User-mode APC support + * FILE: lib/ntdll/main/dispatch.c + * PROGRAMER: David Welch <welch(a)cwcom.net> + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument, + ULONG ArgumentLength); + +EXCEPTION_DISPOSITION +RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context); + +ULONG +RtlpDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context); +/* FUNCTIONS ****************************************************************/ + +/* + * @implemented + */ +VOID +STDCALL +KiUserApcDispatcher(PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + PIO_STATUS_BLOCK Iosb, + ULONG Reserved, + PCONTEXT Context) +{ + /* + * Call the APC + */ + //DPRINT1("ITS ME\n"); + ApcRoutine(ApcContext, + Iosb, + Reserved); + /* + * Switch back to the interrupted context + */ + //DPRINT1("switch back\n"); + NtContinue(Context, 1); +} + +/* + * @implemented + */ +VOID +STDCALL +KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord, + PCONTEXT Context) +{ + EXCEPTION_RECORD NestedExceptionRecord; + NTSTATUS Status; + + if(RtlpExecuteVectoredExceptionHandlers(ExceptionRecord, + Context) != ExceptionContinueExecution) + { + Status = NtContinue(Context, FALSE); + } + else + { + if(RtlpDispatchException(ExceptionRecord, Context) != ExceptionContinueExecution) + { + Status = NtContinue(Context, FALSE); + } + else + { + Status = NtRaiseException(ExceptionRecord, Context, FALSE); + } + } + + NestedExceptionRecord.ExceptionCode = Status; + NestedExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; + NestedExceptionRecord.ExceptionRecord = ExceptionRecord; + NestedExceptionRecord.NumberParameters = Status; + + RtlRaiseException(&NestedExceptionRecord); +} + +/* + * @implemented + */ +VOID +STDCALL +KiRaiseUserExceptionDispatcher(VOID) +{ + EXCEPTION_RECORD ExceptionRecord; + + ExceptionRecord.ExceptionCode = ((PTEB)NtCurrentTeb())->ExceptionCode; + ExceptionRecord.ExceptionFlags = 0; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.NumberParameters = 0; + + RtlRaiseException(&ExceptionRecord); +} + +/* + * @implemented + */ +VOID +STDCALL +KiUserCallbackDispatcher(ULONG RoutineIndex, + PVOID Argument, + ULONG ArgumentLength) +{ + PPEB Peb; + NTSTATUS Status; + KERNEL_CALLBACK_FUNCTION Callback; + + Peb = NtCurrentPeb(); + Callback = (KERNEL_CALLBACK_FUNCTION)Peb->KernelCallbackTable[RoutineIndex]; + Status = Callback(Argument, ArgumentLength); + ZwCallbackReturn(NULL, 0, Status); +} _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 00:09:32 UTC (rev 17731) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 02:29:30 UTC (rev 17732) @@ -29,13 +29,11 @@ <file>utils.c</file> </directory> <directory name="main"> + <file>dispatch.c</file> <file>dllmain.c</file> </directory> <directory name="rtl"> - <file>critical.c</file> - <file>exception.c</file> <file>libsupp.c</file> - <file>path.c</file> <file>version.c</file> </directory> <directory name="stdio"> _____ Deleted: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-09-08 00:09:32 UTC (rev 17731) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-09-08 02:29:30 UTC (rev 17732) @@ -1,693 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/ntdll/rtl/critical.c - * PURPOSE: Critical sections - * UPDATE HISTORY: - * Created 30/09/98 - * Rewritten ROS version, based on WINE code plus - * some fixes useful only for ROS right now - 03/01/05 - */ - -/* INCLUDES ******************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -#define MAX_STATIC_CS_DEBUG_OBJECTS 64 - -static RTL_CRITICAL_SECTION RtlCriticalSectionLock; -static LIST_ENTRY RtlCriticalSectionList; -static BOOLEAN RtlpCritSectInitialized = FALSE; -static RTL_CRITICAL_SECTION_DEBUG RtlpStaticDebugInfo[MAX_STATIC_CS_DEBUG_OBJECTS]; -static BOOLEAN RtlpDebugInfoFreeList[MAX_STATIC_CS_DEBUG_OBJECTS]; - -/*++ - * RtlDeleteCriticalSection - * @implemented NT4 - * - * Deletes a Critical Section - * - * Params: - * CriticalSection - Critical section to delete. - * - * Returns: - * STATUS_SUCCESS, or error value returned by NtClose. - * - * Remarks: - * The critical section members should not be read after this call. - * - *--*/ -NTSTATUS -STDCALL -RtlDeleteCriticalSection( - PRTL_CRITICAL_SECTION CriticalSection) -{ - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("Deleting Critical Section: %x\n", CriticalSection); - /* Close the Event Object Handle if it exists */ - if (CriticalSection->LockSemaphore) { - - /* In case NtClose fails, return the status */ - Status = NtClose(CriticalSection->LockSemaphore); - - } - - /* Protect List */ - RtlEnterCriticalSection(&RtlCriticalSectionLock); - - /* Remove it from the list */ - RemoveEntryList(&CriticalSection->DebugInfo->ProcessLocksList); - - /* Unprotect */ - RtlLeaveCriticalSection(&RtlCriticalSectionLock); - - /* Free it */ - RtlpFreeDebugInfo(CriticalSection->DebugInfo); - - /* Wipe it out */ - RtlZeroMemory(CriticalSection, sizeof(RTL_CRITICAL_SECTION)); - - /* Return */ - return Status; -} - -/*++ - * RtlSetCriticalSectionSpinCount - * @implemented NT4 - * - * Sets the spin count for a critical section. - * - * Params: - * CriticalSection - Critical section to set the spin count for. - * - * SpinCount - Spin count for the critical section. - * - * Returns: - * STATUS_SUCCESS. - * - * Remarks: - * SpinCount is ignored on single-processor systems. - * - *--*/ -DWORD -STDCALL -RtlSetCriticalSectionSpinCount( - PRTL_CRITICAL_SECTION CriticalSection, - ULONG SpinCount - ) -{ - ULONG OldCount = CriticalSection->SpinCount; - - /* Set to parameter if MP, or to 0 if this is Uniprocessor */ - CriticalSection->SpinCount = (NtCurrentPeb()->NumberOfProcessors > 1) ? SpinCount : 0; - return OldCount; -} - -/*++ - * RtlEnterCriticalSection - * @implemented NT4 - * - * Waits to gain ownership of the critical section. - * - * Params: - * CriticalSection - Critical section to wait for. - * - * Returns: - * STATUS_SUCCESS. - * - * Remarks: - * Uses a fast-path unless contention happens. - * - *--*/ -NTSTATUS -STDCALL -RtlEnterCriticalSection( - PRTL_CRITICAL_SECTION CriticalSection) -{ - HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; - - /* Try to Lock it */ - if (InterlockedIncrement(&CriticalSection->LockCount) != 0) { - - /* - * We've failed to lock it! Does this thread - * actually own it? - */ - if (Thread == CriticalSection->OwningThread) { - - /* You own it, so you'll get it when you're done with it! No need to - use the interlocked functions as only the thread who already owns - the lock can modify this data. */ - CriticalSection->RecursionCount++; - return STATUS_SUCCESS; - } - - /* NOTE - CriticalSection->OwningThread can be NULL here because changing - this information is not serialized. This happens when thread a - acquires the lock (LockCount == 0) and thread b tries to - acquire it as well (LockCount == 1) but thread a hasn't had a - chance to set the OwningThread! So it's not an error when - OwningThread is NULL here! */ - - /* We don't own it, so we must wait for it */ - RtlpWaitForCriticalSection(CriticalSection); - } - - /* Lock successful. Changing this information has not to be serialized because - only one thread at a time can actually change it (the one who acquired - the lock)! */ - CriticalSection->OwningThread = Thread; - CriticalSection->RecursionCount = 1; - return STATUS_SUCCESS; -} - -/*++ - * RtlInitializeCriticalSection - * @implemented NT4 - * - * Initialises a new critical section. - * - * Params: - * CriticalSection - Critical section to initialise - * - * Returns: - * STATUS_SUCCESS. - * - * Remarks: - * Simply calls RtlInitializeCriticalSectionAndSpinCount - * - *--*/ -NTSTATUS -STDCALL -RtlInitializeCriticalSection( - PRTL_CRITICAL_SECTION CriticalSection) -{ - /* Call the Main Function */ - return RtlInitializeCriticalSectionAndSpinCount(CriticalSection, 0); -} - -/*++ - * RtlInitializeCriticalSectionAndSpinCount - * @implemented NT4 - * - * Initialises a new critical section. - * - * Params: - * CriticalSection - Critical section to initialise - * - * SpinCount - Spin count for the critical section. - * - * Returns: - * STATUS_SUCCESS. - * - * Remarks: - * SpinCount is ignored on single-processor systems. - * - *--*/ -NTSTATUS -STDCALL -RtlInitializeCriticalSectionAndSpinCount ( - PRTL_CRITICAL_SECTION CriticalSection, - ULONG SpinCount) -{ - PRTL_CRITICAL_SECTION_DEBUG CritcalSectionDebugData; - - /* First things first, set up the Object */ - DPRINT("Initializing Critical Section: %x\n", CriticalSection); - CriticalSection->LockCount = -1; - CriticalSection->RecursionCount = 0; - CriticalSection->OwningThread = 0; - CriticalSection->SpinCount = (NtCurrentPeb()->NumberOfProcessors > 1) ? SpinCount : 0; - CriticalSection->LockSemaphore = 0; - - /* Allocate the Debug Data */ - CritcalSectionDebugData = RtlpAllocateDebugInfo(); - DPRINT("Allocated Debug Data: %x inside Process: %x\n", - CritcalSectionDebugData, - NtCurrentTeb()->Cid.UniqueProcess); - - if (!CritcalSectionDebugData) { - - /* This is bad! */ - DPRINT1("Couldn't allocate Debug Data for: %x\n", CriticalSection); - return STATUS_NO_MEMORY; - } - - /* Set it up */ - CritcalSectionDebugData->Type = RTL_CRITSECT_TYPE; - CritcalSectionDebugData->ContentionCount = 0; - CritcalSectionDebugData->EntryCount = 0; - CritcalSectionDebugData->CriticalSection = CriticalSection; - CriticalSection->DebugInfo = CritcalSectionDebugData; - - /* - * Add it to the List of Critical Sections owned by the process. - * If we've initialized the Lock, then use it. If not, then probably - * this is the lock initialization itself, so insert it directly. - */ - if ((CriticalSection != &RtlCriticalSectionLock) && (RtlpCritSectInitialized)) { - - DPRINT("Securely Inserting into ProcessLocks: %x, %x, %x\n", - &CritcalSectionDebugData->ProcessLocksList, - CriticalSection, - &RtlCriticalSectionList); - - /* Protect List */ - RtlEnterCriticalSection(&RtlCriticalSectionLock); - - /* Add this one */ - InsertTailList(&RtlCriticalSectionList, &CritcalSectionDebugData->ProcessLocksList); - - /* Unprotect */ - RtlLeaveCriticalSection(&RtlCriticalSectionLock); - - } else { - - DPRINT("Inserting into ProcessLocks: %x, %x, %x\n", - &CritcalSectionDebugData->ProcessLocksList, - CriticalSection, - &RtlCriticalSectionList); - - /* Add it directly */ - InsertTailList(&RtlCriticalSectionList, &CritcalSectionDebugData->ProcessLocksList); - } - - return STATUS_SUCCESS; -} - -/*++ - * RtlLeaveCriticalSection - * @implemented NT4 - * - * Releases a critical section and makes if available for new owners. - * - * Params: - * CriticalSection - Critical section to release. - * - * Returns: - * STATUS_SUCCESS. - * - * Remarks: - * If another thread was waiting, the slow path is entered. - * - *--*/ -NTSTATUS -STDCALL -RtlLeaveCriticalSection( - PRTL_CRITICAL_SECTION CriticalSection) -{ -#ifndef NDEBUG - HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; - - /* In win this case isn't checked. However it's a valid check so it should only - be performed in debug builds! */ - if (Thread != CriticalSection->OwningThread) - { - DPRINT1("Releasing critical section not owned!\n"); - return STATUS_INVALID_PARAMETER; - } -#endif - - /* Decrease the Recursion Count. No need to do this atomically because only - the thread who holds the lock can call this function (unless the program - is totally screwed... */ - if (--CriticalSection->RecursionCount) { - - /* Someone still owns us, but we are free. This needs to be done atomically. */ - InterlockedDecrement(&CriticalSection->LockCount); - - } else { - - /* Nobody owns us anymore. No need to do this atomically. See comment - above. */ - CriticalSection->OwningThread = 0; - - /* Was someone wanting us? This needs to be done atomically. */ - if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) { - - /* Let him have us */ - RtlpUnWaitCriticalSection(CriticalSection); - } - } - - /* Sucessful! */ - return STATUS_SUCCESS; -} - -/*++ - * RtlTryEnterCriticalSection - * @implemented NT4 - * - * Attemps to gain ownership of the critical section without waiting. - * - * Params: - * CriticalSection - Critical section to attempt acquiring. - * - * Returns: - * TRUE if the critical section has been acquired, FALSE otherwise. - * - * Remarks: - * None - * - *--*/ -BOOLEAN -STDCALL -RtlTryEnterCriticalSection( - PRTL_CRITICAL_SECTION CriticalSection) -{ - /* Try to take control */ - if (InterlockedCompareExchange(&CriticalSection->LockCount, - 0, - -1) == -1) { - - /* It's ours */ - CriticalSection->OwningThread = NtCurrentTeb()->Cid.UniqueThread; - CriticalSection->RecursionCount = 1; - return TRUE; - - } else if (CriticalSection->OwningThread == NtCurrentTeb()->Cid.UniqueThread) { - - /* It's already ours */ - InterlockedIncrement(&CriticalSection->LockCount); - CriticalSection->RecursionCount++; - return TRUE; - } - - /* It's not ours */ - return FALSE; -} - -/*++ - * RtlpWaitForCriticalSection - * - * Slow path of RtlEnterCriticalSection. Waits on an Event Object. - * - * Params: - * CriticalSection - Critical section to acquire. - * - * Returns: - * STATUS_SUCCESS, or raises an exception if a deadlock is occuring. - * - * Remarks: - * None - * - *--*/ -NTSTATUS -STDCALL -RtlpWaitForCriticalSection( - PRTL_CRITICAL_SECTION CriticalSection) -{ - NTSTATUS Status; - EXCEPTION_RECORD ExceptionRecord; - BOOLEAN LastChance = FALSE; - LARGE_INTEGER Timeout; - - /* Wait 2.5 minutes */ - Timeout.QuadPart = 150000L * (ULONGLONG)10000; - Timeout.QuadPart = -Timeout.QuadPart; - /* ^^ HACK HACK HACK. Good way: - Timeout = &NtCurrentPeb()->CriticalSectionTimeout */ - - /* Do we have an Event yet? */ - if (!CriticalSection->LockSemaphore) { - RtlpCreateCriticalSectionSem(CriticalSection); - } - - /* Increase the Debug Entry count */ - DPRINT("Waiting on Critical Section Event: %x %x\n", - CriticalSection, - CriticalSection->LockSemaphore); - CriticalSection->DebugInfo->EntryCount++; - - for (;;) { - - /* Increase the number of times we've had contention */ - CriticalSection->DebugInfo->ContentionCount++; - - /* Wait on the Event */ - Status = NtWaitForSingleObject(CriticalSection->LockSemaphore, - FALSE, - &Timeout); - - /* We have Timed out */ - if (Status == STATUS_TIMEOUT) { - - /* Is this the 2nd time we've timed out? */ - if (LastChance) { - - DPRINT1("Deadlock: %x\n", CriticalSection); - - /* Yes it is, we are raising an exception */ - ExceptionRecord.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; - ExceptionRecord.ExceptionFlags = 0; - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.ExceptionAddress = RtlRaiseException; - ExceptionRecord.NumberParameters = 1; - ExceptionRecord.ExceptionInformation[0] = (ULONG_PTR)CriticalSection; - RtlRaiseException(&ExceptionRecord); - - } - - /* One more try */ - LastChance = TRUE; - - } else { - - /* If we are here, everything went fine */ - return STATUS_SUCCESS; - } - } -} - -/*++ - * RtlpUnWaitCriticalSection - * - * Slow path of RtlLeaveCriticalSection. Fires an Event Object. - * - * Params: - * CriticalSection - Critical section to release. - * - * Returns: - * None. Raises an exception if the system call failed. - * - * Remarks: - * None - * - *--*/ -VOID -STDCALL -RtlpUnWaitCriticalSection( - PRTL_CRITICAL_SECTION CriticalSection) - -{ - NTSTATUS Status; - - /* Do we have an Event yet? */ - if (!CriticalSection->LockSemaphore) { - RtlpCreateCriticalSectionSem(CriticalSection); - } - - /* Signal the Event */ - DPRINT("Signaling Critical Section Event: %x, %x\n", - CriticalSection, - CriticalSection->LockSemaphore); - Status = NtSetEvent(CriticalSection->LockSemaphore, NULL); - - if (!NT_SUCCESS(Status)) { - - /* We've failed */ - DPRINT1("Signaling Failed for: %x, %x, %x\n", - CriticalSection, - CriticalSection->LockSemaphore, - Status); - RtlRaiseStatus(Status); - } -} - -/*++ - * RtlpCreateCriticalSectionSem - * - * Checks if an Event has been created for the critical section. - * - * Params: - * None - * - * Returns: - * None. Raises an exception if the system call failed. - * - * Remarks: - * None - * - *--*/ -VOID -STDCALL -RtlpCreateCriticalSectionSem( - PRTL_CRITICAL_SECTION CriticalSection) -{ - HANDLE hEvent = CriticalSection->LockSemaphore; - HANDLE hNewEvent; - NTSTATUS Status; - - /* Chevk if we have an event */ - if (!hEvent) { - - /* No, so create it */ - if (!NT_SUCCESS(Status = NtCreateEvent(&hNewEvent, - EVENT_ALL_ACCESS, - NULL, - SynchronizationEvent, - FALSE))) { - - /* We failed, this is bad... */ - DPRINT1("Failed to Create Event!\n"); - InterlockedDecrement(&CriticalSection->LockCount); - RtlRaiseStatus(Status); - return; - } - DPRINT("Created Event: %x \n", hNewEvent); - - if ((hEvent = InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphor e, - (PVOID)hNewEvent, - 0))) { - - /* Some just created an event */ - DPRINT("Closing already created event: %x\n", hNewEvent); - NtClose(hNewEvent); - } - } - - return; -} - -/*++ - * RtlpInitDeferedCriticalSection - * - * Initializes the Critical Section implementation. - * - * Params: - * None - * - * Returns: - * None. - * - * Remarks: - * After this call, the Process Critical Section list is protected. - * - *--*/ -VOID -STDCALL -RtlpInitDeferedCriticalSection( - VOID) -{ - - /* Initialize the Process Critical Section List */ - InitializeListHead(&RtlCriticalSectionList); - - /* Initialize the CS Protecting the List */ - RtlInitializeCriticalSection(&RtlCriticalSectionLock); - - /* It's now safe to enter it */ - RtlpCritSectInitialized = TRUE; -} - -/*++ - * RtlpAllocateDebugInfo - * - * Finds or allocates memory for a Critical Section Debug Object - * - * Params: - * None - * - * Returns: - * A pointer to an empty Critical Section Debug Object. - * - * Remarks: - * For optimization purposes, the first 64 entries can be cached. From - * then on, future Critical Sections will allocate memory from the heap. - * - *--*/ -PRTL_CRITICAL_SECTION_DEBUG -STDCALL -RtlpAllocateDebugInfo( - VOID) -{ - ULONG i; - - /* Try to allocate from our buffer first */ - for (i = 0; i < MAX_STATIC_CS_DEBUG_OBJECTS; i++) { - - /* Check if Entry is free */ - if (!RtlpDebugInfoFreeList[i]) { - - /* Mark entry in use */ - DPRINT("Using entry: %d. Buffer: %x\n", i, &RtlpStaticDebugInfo[i]); - RtlpDebugInfoFreeList[i] = TRUE; - - /* Use free entry found */ - return &RtlpStaticDebugInfo[i]; - } - - } - - /* We are out of static buffer, allocate dynamic */ - return RtlAllocateHeap(NtCurrentPeb()->ProcessHeap, - 0, - sizeof(RTL_CRITICAL_SECTION_DEBUG)); -} - -/*++ - * RtlpFreeDebugInfo - * - * Frees the memory for a Critical Section Debug Object - * - * Params: - * DebugInfo - Pointer to Critical Section Debug Object to free. - * - * Returns: - * None. - * - * Remarks: - * If the pointer is part of the static buffer, then the entry is made - * free again. If not, the object is de-allocated from the heap. - * - *--*/ -VOID -STDCALL -RtlpFreeDebugInfo( - PRTL_CRITICAL_SECTION_DEBUG DebugInfo) -{ - ULONG EntryId; - - /* Is it part of our cached entries? */ - if ((DebugInfo >= RtlpStaticDebugInfo) && - (DebugInfo <= &RtlpStaticDebugInfo[MAX_STATIC_CS_DEBUG_OBJECTS-1])) { - - /* Yes. zero it out */ - RtlZeroMemory(DebugInfo, sizeof(RTL_CRITICAL_SECTION_DEBUG)); - - /* Mark as free */ - EntryId = (DebugInfo - RtlpStaticDebugInfo); - DPRINT("Freeing from Buffer: %x. Entry: %d inside Process: %x\n", - DebugInfo, - EntryId, - NtCurrentTeb()->Cid.UniqueProcess); - RtlpDebugInfoFreeList[EntryId] = FALSE; - - } else { - - /* It's a dynamic one, so free from the heap */ - DPRINT("Freeing from Heap: %x inside Process: %x\n", - DebugInfo, - NtCurrentTeb()->Cid.UniqueProcess); - RtlFreeHeap(NtCurrentPeb()->ProcessHeap, 0, DebugInfo); - - } -} - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/exception.c --- trunk/reactos/lib/ntdll/rtl/exception.c 2005-09-08 00:09:32 UTC (rev 17731) +++ trunk/reactos/lib/ntdll/rtl/exception.c 2005-09-08 02:29:30 UTC (rev 17732) @@ -1,221 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: User-mode exception support - * FILE: lib/ntdll/rtl/exception.c - * PROGRAMERS: David Welch <welch(a)cwcom.net> - * Skywing <skywing(a)valhallalegends.com> - * KJK::Hyperion <noog(a)libero.it> - * UPDATES: Skywing, 09/11/2003: Implemented RtlRaiseException and - * KiUserRaiseExceptionDispatcher. - * KJK::Hyperion, 22/06/2003: Moved common parts to rtl - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock; -static LIST_ENTRY RtlpVectoredExceptionHead; - -typedef struct _RTL_VECTORED_EXCEPTION_HANDLER -{ - LIST_ENTRY ListEntry; - PVECTORED_EXCEPTION_HANDLER VectoredHandler; -} RTL_VECTORED_EXCEPTION_HANDLER, *PRTL_VECTORED_EXCEPTION_HANDLER; - -/* FIXME - stupid ld won't resolve RtlDecodePointer! Since their implementation - is the same just use RtlEncodePointer for now! */ -#define RtlDecodePointer RtlEncodePointer - -/* FUNCTIONS ***************************************************************/ - -VOID STDCALL -RtlBaseProcessStart(PTHREAD_START_ROUTINE StartAddress, - PVOID Parameter); - -__declspec(dllexport) -PRTL_BASE_PROCESS_START_ROUTINE RtlBaseProcessStartRoutine = RtlBaseProcessStart; - -ULONG -RtlpDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context); - -EXCEPTION_DISPOSITION -RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) -{ - PLIST_ENTRY CurrentEntry; - PRTL_VECTORED_EXCEPTION_HANDLER veh; - PVECTORED_EXCEPTION_HANDLER VectoredHandler; - EXCEPTION_POINTERS ExceptionInfo; - - ExceptionInfo.ExceptionRecord = ExceptionRecord; - ExceptionInfo.ContextRecord = Context; - - if(RtlpVectoredExceptionHead.Flink != &RtlpVectoredExceptionHead) - { - RtlEnterCriticalSection(&RtlpVectoredExceptionLock); - for(CurrentEntry = RtlpVectoredExceptionHead.Flink; - CurrentEntry != &RtlpVectoredExceptionHead; - CurrentEntry = CurrentEntry->Flink) - { - veh = CONTAINING_RECORD(CurrentEntry, - RTL_VECTORED_EXCEPTION_HANDLER, - ListEntry); - VectoredHandler = RtlDecodePointer(veh->VectoredHandler); - if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) - { - RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); [truncated at 1000 lines; 3575 more skipped]

1 0

[ion] 17731: - Part one of major RTL cleanup. Merge duplicated code and stick everything in lib\rtl that used to be in ntdll. Also cleanup the file headers, copyright information and includes.
by ion＠svn.reactos.com 08 Sep '05

08 Sep '05

- Part one of major RTL cleanup. Merge duplicated code and stick everything in lib\rtl that used to be in ntdll. Also cleanup the file headers, copyright information and includes. Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/ntdll/rtl/apc.c Deleted: trunk/reactos/lib/ntdll/rtl/callback.c Deleted: trunk/reactos/lib/ntdll/rtl/crc32.c Deleted: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c Deleted: trunk/reactos/lib/ntdll/rtl/handle.c Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Deleted: trunk/reactos/lib/ntdll/rtl/math.c Deleted: trunk/reactos/lib/ntdll/rtl/message.c Deleted: trunk/reactos/lib/ntdll/rtl/misc.c Deleted: trunk/reactos/lib/ntdll/rtl/process.c Deleted: trunk/reactos/lib/ntdll/rtl/propvar.c Deleted: trunk/reactos/lib/ntdll/rtl/rangelist.c Deleted: trunk/reactos/lib/ntdll/rtl/resource.c Deleted: trunk/reactos/lib/ntdll/rtl/secobj.c Deleted: trunk/reactos/lib/ntdll/rtl/teb.c Deleted: trunk/reactos/lib/ntdll/rtl/timerqueue.c Deleted: trunk/reactos/lib/ntdll/rtl/trace.c Added: trunk/reactos/lib/ntdll/rtl/version.c Modified: trunk/reactos/lib/rtl/access.c Modified: trunk/reactos/lib/rtl/acl.c Added: trunk/reactos/lib/rtl/apc.c Modified: trunk/reactos/lib/rtl/atom.c Modified: trunk/reactos/lib/rtl/bit.c Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bootdata.c Added: trunk/reactos/lib/rtl/callback.c Modified: trunk/reactos/lib/rtl/compress.c Added: trunk/reactos/lib/rtl/crc32.c Added: trunk/reactos/lib/rtl/dbgbuffer.c Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/encode.c Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/exception.c Modified: trunk/reactos/lib/rtl/generictable.c Added: trunk/reactos/lib/rtl/handle.c Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/largeint.c Modified: trunk/reactos/lib/rtl/luid.c Added: trunk/reactos/lib/rtl/math.c Modified: trunk/reactos/lib/rtl/mem.c Added: trunk/reactos/lib/rtl/message.c Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/process.c Added: trunk/reactos/lib/rtl/propvar.c Modified: trunk/reactos/lib/rtl/qsort.c Modified: trunk/reactos/lib/rtl/random.c Added: trunk/reactos/lib/rtl/rangelist.c Modified: trunk/reactos/lib/rtl/registry.c Added: trunk/reactos/lib/rtl/resource.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/rtl.xml Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/security.c Modified: trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/time.c Added: trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/lib/rtl/timezone.c Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicodeprefix.c Modified: trunk/reactos/lib/rtl/version.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Deleted: trunk/reactos/ntoskrnl/rtl/message.c Deleted: trunk/reactos/ntoskrnl/rtl/rangelist.c _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 00:09:32 UTC (rev 17731) @@ -32,25 +32,11 @@ <file>dllmain.c</file> </directory> <directory name="rtl"> - <file>apc.c</file> - <file>callback.c</file> - <file>crc32.c</file> <file>critical.c</file> - <file>dbgbuffer.c</file> <file>exception.c</file> - <file>handle.c</file> <file>libsupp.c</file> - <file>math.c</file> - <file>message.c</file> - <file>misc.c</file> <file>path.c</file> - <file>process.c</file> - <file>propvar.c</file> - <file>rangelist.c</file> - <file>resource.c</file> - <file>secobj.c</file> - <file>teb.c</file> - <file>timerqueue.c</file> + <file>version.c</file> </directory> <directory name="stdio"> <file>sprintf.c</file> _____ Deleted: trunk/reactos/lib/ntdll/rtl/apc.c --- trunk/reactos/lib/ntdll/rtl/apc.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/apc.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,55 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2000 David Welch <welch(a)cwcom.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS kernel - * PURPOSE: User-mode APC support - * FILE: lib/ntdll/rtl/apc.c - * PROGRAMER: David Welch <welch(a)cwcom.net> - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ***************************************************************/ - -VOID STDCALL -KiUserApcDispatcher(PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - PIO_STATUS_BLOCK Iosb, - ULONG Reserved, - PCONTEXT Context) -{ - /* - * Call the APC - */ - //DPRINT1("ITS ME\n"); - ApcRoutine(ApcContext, - Iosb, - Reserved); - /* - * Switch back to the interrupted context - */ - //DPRINT1("switch back\n"); - NtContinue(Context, 1); -} - _____ Deleted: trunk/reactos/lib/ntdll/rtl/callback.c --- trunk/reactos/lib/ntdll/rtl/callback.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/callback.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,35 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: User-mode callback support - * FILE: lib/ntdll/rtl/callback.c - * PROGRAMER: David Welch <welch(a)cwcom.net> - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> -/* TYPES *********************************************************************/ - -typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument, - ULONG ArgumentLength); - -/* FUNCTIONS *****************************************************************/ - -VOID STDCALL -KiUserCallbackDispatcher(ULONG RoutineIndex, - PVOID Argument, - ULONG ArgumentLength) -{ - PPEB Peb; - NTSTATUS Status; - KERNEL_CALLBACK_FUNCTION Callback; - - Peb = NtCurrentPeb(); - Callback = (KERNEL_CALLBACK_FUNCTION)Peb->KernelCallbackTable[RoutineIndex]; - Status = Callback(Argument, ArgumentLength); - ZwCallbackReturn(NULL, 0, Status); -} _____ Deleted: trunk/reactos/lib/ntdll/rtl/crc32.c --- trunk/reactos/lib/ntdll/rtl/crc32.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/crc32.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,109 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: crc32 functions - * FILE: lib/ntdll/rtl/crc32.c - * PROGRAMER: Steven Edwards - * REVISION HISTORY: - * 11/15/2000: Created - */ - -/* This work is based off of rtl.c in Wine. - * Please give credit where credit is due: - * - * Copyright 2003 Thomas Mertes - * Crc32 code Copyright 1986 Gary S. Brown (Public domain) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> -/* FUNCTIONS ****************************************************************/ - -/* CRC polynomial 0xedb88320 */ -static const ULONG CrcTable[256] = -{ - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - -/********************************************************************* - * RtlComputeCrc32 [NTDLL.@] - * - * Calculate the CRC32 checksum of a block of bytes - * - * PARAMS - * Initial [I] Initial CRC value - * Data [I] Data block - * Length [I] Length of the byte block - * - * RETURNS - * The cumulative CRC32 of Initial and Length bytes of the Data block. - * - * @implemented - */ -ULONG STDCALL -RtlComputeCrc32 (IN ULONG Initial, - IN PUCHAR Data, - IN ULONG Length) -{ - ULONG CrcValue; - -#ifdef DBG - DbgPrint("(%lu,%p,%lu)\n", Initial, Data, Length); -#endif - - CrcValue = ~Initial; - while (Length > 0) - { - CrcValue = CrcTable[(CrcValue ^ *Data) & 0xff] ^ (CrcValue >> 8); - Data++; - Length--; - } - return ~CrcValue; -} - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c --- trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,424 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* - * - * PROJECT: ReactOS kernel - * PURPOSE: User-mode Debug Buffer support - * FILE: lib/ntdll/rtl/dbgbuffer.c - * PROGRAMER: James Tabor - * Fixme: Add Process and Thread event pair support. - * Start Locks and Heap support. - * Test: Create remote thread to help query remote - * processes and use view mapping to read them. - * - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ***************************************************************/ - -/* - * @unimplemented - */ -PDEBUG_BUFFER STDCALL -RtlCreateQueryDebugBuffer(IN ULONG Size, - IN BOOLEAN EventPair) -{ - NTSTATUS Status; - PDEBUG_BUFFER Buf = NULL; - ULONG SectionSize = 100 * PAGE_SIZE; - - Status = NtAllocateVirtualMemory( NtCurrentProcess(), - (PVOID)&Buf, - 0, - &SectionSize, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - Buf->SectionBase = Buf; - Buf->SectionSize = SectionSize; - - DPRINT("RtlCQDB: BA: %x BS: %d\n", Buf->SectionBase, Buf->SectionSize); - - return Buf; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -RtlDestroyQueryDebugBuffer(IN PDEBUG_BUFFER Buf) -{ - NTSTATUS Status = STATUS_SUCCESS; - - if (NULL != Buf) - { - Status = NtFreeVirtualMemory( NtCurrentProcess(), - (PVOID)&Buf, - &Buf->SectionSize, - MEM_RELEASE); - } - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlDQDB: Failed to free VM!\n"); - } - return Status; -} - -/* - * Based on lib/epsapi/enum/modules.c by KJK::Hyperion. - * - */ -NTSTATUS STDCALL -RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, - IN PMODULE_INFORMATION ModuleInformation OPTIONAL, - IN ULONG Size OPTIONAL, - OUT PULONG ReturnedSize) -{ - PROCESS_BASIC_INFORMATION pbiInfo; - PPEB_LDR_DATA ppldLdrData; - LDR_DATA_TABLE_ENTRY lmModule; - PLIST_ENTRY pleListHead; - PLIST_ENTRY pleCurEntry; - - PDEBUG_MODULE_INFORMATION ModulePtr = NULL; - NTSTATUS Status = STATUS_SUCCESS; - ULONG UsedSize = sizeof(ULONG); - ANSI_STRING AnsiString; - PCHAR p; - - DPRINT("RtlpQueryRemoteProcessModules Start\n"); - - /* query the process basic information (includes the PEB address) */ - Status = NtQueryInformationProcess ( ProcessHandle, - ProcessBasicInformation, - &pbiInfo, - sizeof(PROCESS_BASIC_INFORMATION), - NULL); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT("NtQueryInformationProcess 1 &x \n", Status); - return Status; - } - - if (ModuleInformation == NULL || Size == 0) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - ModuleInformation->ModuleCount = 0; - ModulePtr = &ModuleInformation->ModuleEntry[0]; - Status = STATUS_SUCCESS; - } - - /* get the address of the PE Loader data */ - Status = NtReadVirtualMemory ( ProcessHandle, - &(pbiInfo.PebBaseAddress->Ldr), - &ppldLdrData, - sizeof(ppldLdrData), - NULL ); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT("NtReadVirtualMemory 1 %x \n", Status); - return Status; - } - - - /* head of the module list: the last element in the list will point to this */ - pleListHead = &ppldLdrData->InLoadOrderModuleList; - - /* get the address of the first element in the list */ - Status = NtReadVirtualMemory ( ProcessHandle, - &(ppldLdrData->InLoadOrderModuleList.Flink), - &pleCurEntry, - sizeof(pleCurEntry), - NULL ); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT("NtReadVirtualMemory 2 %x \n", Status); - return Status; - } - - while(pleCurEntry != pleListHead) - { - - UNICODE_STRING Unicode; - WCHAR Buffer[256 * sizeof(WCHAR)]; - - /* read the current module */ - Status = NtReadVirtualMemory ( ProcessHandle, - CONTAINING_RECORD(pleCurEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList), - &lmModule, - sizeof(LDR_DATA_TABLE_ENTRY), - NULL ); - - /* Import module name from remote Process user space. */ - Unicode.Length = lmModule.FullDllName.Length; - Unicode.MaximumLength = lmModule.FullDllName.MaximumLength; - Unicode.Buffer = Buffer; - - Status = NtReadVirtualMemory ( ProcessHandle, - lmModule.FullDllName.Buffer, - Unicode.Buffer, - Unicode.Length, - NULL ); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT( "NtReadVirtualMemory 3 %x \n", Status); - return Status; - } - - DPRINT(" Module %wZ\n", &Unicode); - - if (UsedSize > Size) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else if (ModuleInformation != NULL) - { - ModulePtr->Reserved[0] = ModulePtr->Reserved[1] = 0; // FIXME: ?? - ModulePtr->Base = lmModule.DllBase; - ModulePtr->Size = lmModule.SizeOfImage; - ModulePtr->Flags = lmModule.Flags; - ModulePtr->Index = 0; // FIXME: ?? - ModulePtr->Unknown = 0; // FIXME: ?? - ModulePtr->LoadCount = lmModule.LoadCount; - - AnsiString.Length = 0; - AnsiString.MaximumLength = 256; - AnsiString.Buffer = ModulePtr->ImageName; - RtlUnicodeStringToAnsiString(&AnsiString, - &Unicode, - FALSE); - - p = strrchr(ModulePtr->ImageName, '\\'); - if (p != NULL) - ModulePtr->ModuleNameOffset = p - ModulePtr->ImageName + 1; - else - ModulePtr->ModuleNameOffset = 0; - - ModulePtr++; - ModuleInformation->ModuleCount++; - } - UsedSize += sizeof(DEBUG_MODULE_INFORMATION); - - /* address of the next module in the list */ - pleCurEntry = lmModule.InLoadOrderModuleList.Flink; - } - - if (ReturnedSize != 0) - *ReturnedSize = UsedSize; - - DPRINT("RtlpQueryRemoteProcessModules End\n"); - - /* success */ - return (STATUS_SUCCESS); -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -RtlQueryProcessDebugInformation(IN ULONG ProcessId, - IN ULONG DebugInfoMask, - IN OUT PDEBUG_BUFFER Buf) -{ - NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG) NtCurrentTeb()->Cid.UniqueProcess; - - Buf->InfoClassMask = DebugInfoMask; - Buf->SizeOfInfo = sizeof(DEBUG_BUFFER); - - DPRINT("QueryProcessDebugInformation Start\n"); - -/* - Currently ROS can not read-only from kenrel space, and doesn't - check for boundaries inside kernel space that are page protected - from every one but the kernel. aka page 0 - 2 - */ -if (ProcessId <= 1) - { - Status = STATUS_ACCESS_VIOLATION; - } -else -if (Pid == ProcessId) - { - if (DebugInfoMask & PDI_MODULES) - { - PMODULE_INFORMATION Mp; - ULONG ReturnSize = 0; - ULONG MSize; - - Mp = (PMODULE_INFORMATION)(Buf + Buf->SizeOfInfo); - - /* I like this better than the do & while loop. */ - Status = LdrQueryProcessModuleInformation( NULL, - 0 , - &ReturnSize); - Status = LdrQueryProcessModuleInformation( Mp, - ReturnSize , - &ReturnSize); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - MSize = Mp->ModuleCount * (sizeof(MODULE_INFORMATION) + 8); - Buf->ModuleInformation = Mp; - Buf->SizeOfInfo = Buf->SizeOfInfo + MSize; - } - - if (DebugInfoMask & PDI_HEAPS) - { - PHEAP_INFORMATION Hp; - ULONG HSize; - - Hp = (PHEAP_INFORMATION)(Buf + Buf->SizeOfInfo); - HSize = sizeof(HEAP_INFORMATION); - if (DebugInfoMask & PDI_HEAP_TAGS) - { - } - if (DebugInfoMask & PDI_HEAP_BLOCKS) - { - } - Buf->HeapInformation = Hp; - Buf->SizeOfInfo = Buf->SizeOfInfo + HSize; - - } - - if (DebugInfoMask & PDI_LOCKS) - { - PLOCK_INFORMATION Lp; - ULONG LSize; - - Lp = (PLOCK_INFORMATION)(Buf + Buf->SizeOfInfo); - LSize = sizeof(LOCK_INFORMATION); - Buf->LockInformation = Lp; - Buf->SizeOfInfo = Buf->SizeOfInfo + LSize; - } - - DPRINT("QueryProcessDebugInformation end \n"); - DPRINT("QueryDebugInfo : %d\n", Buf->SizeOfInfo); -} -else -{ - HANDLE hProcess; - CLIENT_ID ClientId; - OBJECT_ATTRIBUTES ObjectAttributes; - - Buf->Unknown[0] = (ULONG)NtCurrentProcess(); - - ClientId.UniqueThread = 0; - ClientId.UniqueProcess = (HANDLE)ProcessId; - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - - Status = NtOpenProcess( &hProcess, - (PROCESS_ALL_ACCESS), - &ObjectAttributes, - &ClientId ); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - if (DebugInfoMask & PDI_MODULES) - { - PMODULE_INFORMATION Mp; - ULONG ReturnSize = 0; - ULONG MSize; - - Mp = (PMODULE_INFORMATION)(Buf + Buf->SizeOfInfo); - - Status = RtlpQueryRemoteProcessModules( hProcess, - NULL, - 0, - &ReturnSize); - - Status = RtlpQueryRemoteProcessModules( hProcess, - Mp, - ReturnSize , - &ReturnSize); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - MSize = Mp->ModuleCount * (sizeof(MODULE_INFORMATION) + 8); - Buf->ModuleInformation = Mp; - Buf->SizeOfInfo = Buf->SizeOfInfo + MSize; - } - - if (DebugInfoMask & PDI_HEAPS) - { - PHEAP_INFORMATION Hp; - ULONG HSize; - - Hp = (PHEAP_INFORMATION)(Buf + Buf->SizeOfInfo); - HSize = sizeof(HEAP_INFORMATION); - if (DebugInfoMask & PDI_HEAP_TAGS) - { - } - if (DebugInfoMask & PDI_HEAP_BLOCKS) - { - } - Buf->HeapInformation = Hp; - Buf->SizeOfInfo = Buf->SizeOfInfo + HSize; - - } - - if (DebugInfoMask & PDI_LOCKS) - { - PLOCK_INFORMATION Lp; - ULONG LSize; - - Lp = (PLOCK_INFORMATION)(Buf + Buf->SizeOfInfo); - LSize = sizeof(LOCK_INFORMATION); - Buf->LockInformation = Lp; - Buf->SizeOfInfo = Buf->SizeOfInfo + LSize; - } - - DPRINT("QueryProcessDebugInformation end \n"); - DPRINT("QueryDebugInfo : %d\n", Buf->SizeOfInfo); -} - return Status; - -} - -/* EOL */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/handle.c --- trunk/reactos/lib/ntdll/rtl/handle.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/handle.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,193 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Handle table - * FILE: lib/ntdll/rtl/handle.c - * PROGRAMER: Eric Kohl <ekohl(a)rz-online.de> - */ - -/* INCLUDES ******************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -VOID STDCALL -RtlInitializeHandleTable(ULONG TableSize, - ULONG HandleSize, - PRTL_HANDLE_TABLE HandleTable) -{ - /* initialize handle table */ - memset(HandleTable, - 0, - sizeof(RTL_HANDLE_TABLE)); - HandleTable->MaximumNumberOfHandles = TableSize; - HandleTable->SizeOfHandleTableEntry = HandleSize; -} - - -/* - * @implemented - */ -VOID STDCALL -RtlDestroyHandleTable(PRTL_HANDLE_TABLE HandleTable) -{ - PVOID ArrayPointer; - ULONG ArraySize; - - /* free handle array */ - if (HandleTable->CommittedHandles) - { - ArrayPointer = (PVOID)HandleTable->CommittedHandles; - ArraySize = HandleTable->SizeOfHandleTableEntry * HandleTable->MaximumNumberOfHandles; - NtFreeVirtualMemory(NtCurrentProcess(), - &ArrayPointer, - &ArraySize, - MEM_RELEASE); - } -} - - -/* - * @implemented - */ -PRTL_HANDLE_TABLE_ENTRY STDCALL -RtlAllocateHandle(PRTL_HANDLE_TABLE HandleTable, - PULONG Index) -{ - PRTL_HANDLE_TABLE_ENTRY *pp_new, *pph, ph; - NTSTATUS Status; - PRTL_HANDLE_TABLE_ENTRY retval; - PVOID ArrayPointer; - ULONG ArraySize; - - pp_new = &HandleTable->FreeHandles; - - if (HandleTable->FreeHandles == NULL) - { - /* no free handle available */ - if (HandleTable->UnCommittedHandles == NULL) - { - /* allocate handle array */ - ArraySize = HandleTable->SizeOfHandleTableEntry * HandleTable->MaximumNumberOfHandles; - ArrayPointer = NULL; - - /* FIXME - only reserve handles here! */ - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - (PVOID*)&ArrayPointer, - 0, - &ArraySize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - return NULL; - - /* update handle array pointers */ - HandleTable->FreeHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; - HandleTable->MaxReservedHandles = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)ArrayPointer + ArraySize); - HandleTable->CommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; - HandleTable->UnCommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; - } - - /* FIXME - should check if handles need to be committed */ - - /* build free list in handle array */ - ph = HandleTable->FreeHandles; - pph = pp_new; - while (ph < HandleTable->MaxReservedHandles) - { - *pph = ph; - pph = &ph->NextFree; - ph = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)ph + HandleTable->SizeOfHandleTableEntry); - } - *pph = 0; - } - - /* remove handle from free list */ - retval = *pp_new; - *pp_new = retval->NextFree; - retval->NextFree = NULL; - - if (Index) - *Index = ((ULONG)((ULONG_PTR)retval - (ULONG_PTR)HandleTable->CommittedHandles) / - HandleTable->SizeOfHandleTableEntry); - - return retval; -} - - -/* - * @implemented - */ -BOOLEAN STDCALL -RtlFreeHandle(PRTL_HANDLE_TABLE HandleTable, - PRTL_HANDLE_TABLE_ENTRY Handle) -{ -#if DBG - /* check if handle is valid */ - if (RtlIsValidHandle(HandleTable, Handle)) - return FALSE; -#endif - - /* clear handle */ - memset(Handle, 0, HandleTable->SizeOfHandleTableEntry); - - /* add handle to free list */ - Handle->NextFree = HandleTable->FreeHandles; - HandleTable->FreeHandles = Handle; - - return TRUE; -} - - -/* - * @implemented - */ -BOOLEAN STDCALL -RtlIsValidHandle(PRTL_HANDLE_TABLE HandleTable, - PRTL_HANDLE_TABLE_ENTRY Handle) -{ - if ((HandleTable != NULL) - && (Handle >= HandleTable->CommittedHandles) - && (Handle < HandleTable->MaxReservedHandles) - && (Handle->Flags & RTL_HANDLE_VALID)) - return TRUE; - return FALSE; -} - - -/* - * @implemented - */ -BOOLEAN STDCALL -RtlIsValidIndexHandle(IN PRTL_HANDLE_TABLE HandleTable, - IN ULONG Index, - OUT PRTL_HANDLE_TABLE_ENTRY *Handle) -{ - PRTL_HANDLE_TABLE_ENTRY InternalHandle; - - DPRINT("RtlIsValidIndexHandle(HandleTable %p Index %x Handle %p)\n", HandleTable, Index, Handle); - - if (HandleTable == NULL) - return FALSE; - - DPRINT("Handles %p HandleSize %x\n", - HandleTable->CommittedHandles, HandleTable->SizeOfHandleTableEntry); - - InternalHandle = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)HandleTable->CommittedHandles + - (HandleTable->SizeOfHandleTableEntry * Index)); - if (!RtlIsValidHandle(HandleTable, InternalHandle)) - return FALSE; - - DPRINT("InternalHandle %p\n", InternalHandle); - - if (Handle != NULL) - *Handle = InternalHandle; - - return TRUE; -} - -/* EOF */ _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,14 +1,13 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/rtl/libsup.c * PURPOSE: Rtl library support routines * PROGRAMMER: Gunnar Dalsnes - * UPDATE HISTORY: - * */ +/* INCLUDES *****************************************************************/ + #include <ntdll.h> #define NDEBUG #include <debug.h> @@ -16,13 +15,54 @@ /* FUNCTIONS ***************************************************************/ KPROCESSOR_MODE +STDCALL RtlpGetMode() { return UserMode; } +PPEB +STDCALL +RtlpCurrentPeb(VOID) +{ + return NtCurrentPeb(); +} + +/* + * @implemented + */ +VOID STDCALL +RtlAcquirePebLock(VOID) +{ + PPEB Peb = NtCurrentPeb (); + Peb->FastPebLockRoutine (Peb->FastPebLock); +} + + +/* + * @implemented + */ +VOID STDCALL +RtlReleasePebLock(VOID) +{ + PPEB Peb = NtCurrentPeb (); + Peb->FastPebUnlockRoutine (Peb->FastPebLock); +} + +/* +* @implemented +*/ +ULONG +STDCALL +RtlGetNtGlobalFlags(VOID) +{ + PPEB pPeb = NtCurrentPeb(); + return pPeb->NtGlobalFlag; +} + PVOID +STDCALL RtlpAllocateMemory(UINT Bytes, ULONG Tag) { @@ -35,6 +75,7 @@ VOID +STDCALL RtlpFreeMemory(PVOID Mem, ULONG Tag) { _____ Deleted: trunk/reactos/lib/ntdll/rtl/math.c --- trunk/reactos/lib/ntdll/rtl/math.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/math.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,221 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -double atan (double __x); -double ceil (double __x); -double cos (double __x); -double fabs (double __x); -double floor (double __x); -double log (double __x); -double __log2 (double __x); -double pow (double __x, double __y); -double sin (double __x); -double sqrt (double __x); -double tan (double __x); - -int _fltused = 0x9875; - -double atan (double __x) [truncated at 1000 lines; 7082 more skipped]

1 0

[gdalsnes] 17730: indent with astyle v1.15.3: --style=ansi -c -s3 -S --convert-tabs
by gdalsnes＠svn.reactos.com 07 Sep '05

07 Sep '05

indent with astyle v1.15.3: --style=ansi -c -s3 -S --convert-tabs Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c Modified: trunk/reactos/subsys/win32k/ntuser/caret.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/clipboard.c Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/guicheck.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/metric.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsys/win32k/ntuser/object.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/prop.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/ssec.c Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c Modified: trunk/reactos/subsys/win32k/ntuser/timer.c Modified: trunk/reactos/subsys/win32k/ntuser/useratom.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-07 21:05:16 UTC (rev 17729) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-07 21:25:42 UTC (rev 17730) @@ -59,13 +59,13 @@ NTSTATUS FASTCALL InitAcceleratorImpl(VOID) { - return(STATUS_SUCCESS); + return(STATUS_SUCCESS); } NTSTATUS FASTCALL CleanupAcceleratorImpl(VOID) { - return(STATUS_SUCCESS); + return(STATUS_SUCCESS); } @@ -73,7 +73,7 @@ PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel) { PACCELERATOR_TABLE Accel= UserGetObject(&gHandleTable, hAccel, otAccel); - + if (Accel) { ASSERT(USER_BODY_TO_HEADER(Accel)->RefCount >= 0); @@ -92,132 +92,132 @@ int STDCALL NtUserCopyAcceleratorTable( - HACCEL hAccel, - LPACCEL Entries, - int EntriesCount) + HACCEL hAccel, + LPACCEL Entries, + int EntriesCount) { - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE Accel; - NTSTATUS Status; - int Ret; - DECLARE_RETURN(int); + PWINSTATION_OBJECT WindowStation; + PACCELERATOR_TABLE Accel; + NTSTATUS Status; + int Ret; + DECLARE_RETURN(int); - DPRINT("Enter NtUserCopyAcceleratorTable\n"); - UserEnterShared(); + DPRINT("Enter NtUserCopyAcceleratorTable\n"); + UserEnterShared(); - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - RETURN(0); - } + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), + UserMode, + 0, + &WindowStation); - if (!(Accel = UserGetAccelObject(hAccel))) - { - ObDereferenceObject(WindowStation); - RETURN(0); - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(STATUS_ACCESS_DENIED); + RETURN(0); + } - if(Entries) - { - Ret = min(EntriesCount, Accel->Count); - Status = MmCopyToCaller(Entries, Accel->Table, Ret * sizeof(ACCEL)); - if (!NT_SUCCESS(Status)) - { + if (!(Accel = UserGetAccelObject(hAccel))) + { ObDereferenceObject(WindowStation); - SetLastNtError(Status); RETURN(0); - } - } - else - { - Ret = Accel->Count; - } + } - ObDereferenceObject(WindowStation); + if(Entries) + { + Ret = min(EntriesCount, Accel->Count); + Status = MmCopyToCaller(Entries, Accel->Table, Ret * sizeof(ACCEL)); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(WindowStation); + SetLastNtError(Status); + RETURN(0); + } + } + else + { + Ret = Accel->Count; + } - RETURN(Ret); - + ObDereferenceObject(WindowStation); + + RETURN(Ret); + CLEANUP: - DPRINT("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } HACCEL STDCALL NtUserCreateAcceleratorTable( - LPACCEL Entries, - SIZE_T EntriesCount) + LPACCEL Entries, + SIZE_T EntriesCount) { - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE Accel; - NTSTATUS Status; - HACCEL hAccel; - DECLARE_RETURN(HACCEL); + PWINSTATION_OBJECT WindowStation; + PACCELERATOR_TABLE Accel; + NTSTATUS Status; + HACCEL hAccel; + DECLARE_RETURN(HACCEL); - DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", + DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", Entries, EntriesCount); - UserEnterExclusive(); + UserEnterExclusive(); - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - RETURN( FALSE ); - } + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), + UserMode, + 0, + &WindowStation); - Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); - - if (Accel == NULL) - { - ObDereferenceObject(WindowStation); - SetLastNtError(STATUS_NO_MEMORY); - RETURN( (HACCEL) 0 ); - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(STATUS_ACCESS_DENIED); + RETURN( FALSE ); + } - Accel->Count = EntriesCount; - if (Accel->Count > 0) - { - Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); - if (Accel->Table == NULL) - { - ObmDeleteObject(hAccel, otAccel); - ObDereferenceObject(WindowStation); - SetLastNtError(Status); - RETURN( (HACCEL) 0); - } + Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); - Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); - if (!NT_SUCCESS(Status)) - { - ExFreePool(Accel->Table); - ObmDeleteObject(hAccel, otAccel); + if (Accel == NULL) + { ObDereferenceObject(WindowStation); - SetLastNtError(Status); - RETURN((HACCEL) 0); - } - } + SetLastNtError(STATUS_NO_MEMORY); + RETURN( (HACCEL) 0 ); + } - ObDereferenceObject(WindowStation); + Accel->Count = EntriesCount; + if (Accel->Count > 0) + { + Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); + if (Accel->Table == NULL) + { + ObmDeleteObject(hAccel, otAccel); + ObDereferenceObject(WindowStation); + SetLastNtError(Status); + RETURN( (HACCEL) 0); + } - /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ + Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); + if (!NT_SUCCESS(Status)) + { + ExFreePool(Accel->Table); + ObmDeleteObject(hAccel, otAccel); + ObDereferenceObject(WindowStation); + SetLastNtError(Status); + RETURN((HACCEL) 0); + } + } - RETURN(hAccel); - + ObDereferenceObject(WindowStation); + + /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ + + RETURN(hAccel); + CLEANUP: - DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", - Entries, EntriesCount,_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", + Entries, EntriesCount,_ret_); + UserLeave(); + END_CLEANUP; } @@ -225,219 +225,224 @@ BOOLEAN STDCALL NtUserDestroyAcceleratorTable( - HACCEL hAccel) + HACCEL hAccel) { - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE Accel; - NTSTATUS Status; - DECLARE_RETURN(BOOLEAN); + PWINSTATION_OBJECT WindowStation; + PACCELERATOR_TABLE Accel; + NTSTATUS Status; + DECLARE_RETURN(BOOLEAN); - /* FIXME: If the handle table is from a call to LoadAcceleratorTable, decrement it's - usage count (and return TRUE). - FIXME: Destroy only tables created using CreateAcceleratorTable. - */ + /* FIXME: If the handle table is from a call to LoadAcceleratorTable, decrement it's + usage count (and return TRUE). + FIXME: Destroy only tables created using CreateAcceleratorTable. + */ - DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel); - UserEnterExclusive(); + DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel); + UserEnterExclusive(); - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - DPRINT1("E1\n"); - RETURN( FALSE); - } + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), + UserMode, + 0, + &WindowStation); - if (!(Accel = UserGetAccelObject(hAccel))) - { - ObDereferenceObject(WindowStation); - RETURN( FALSE); - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(STATUS_ACCESS_DENIED); + DPRINT1("E1\n"); + RETURN( FALSE); + } - ObmDeleteObject(hAccel, otAccel); + if (!(Accel = UserGetAccelObject(hAccel))) + { + ObDereferenceObject(WindowStation); + RETURN( FALSE); + } - if (Accel->Table != NULL) - { - ExFreePool(Accel->Table); - } + ObmDeleteObject(hAccel, otAccel); - ObDereferenceObject(WindowStation); + if (Accel->Table != NULL) + { + ExFreePool(Accel->Table); + } - RETURN( TRUE); - + ObDereferenceObject(WindowStation); + + RETURN( TRUE); + CLEANUP: - DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel,_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel,_ret_); + UserLeave(); + END_CLEANUP; } -static +static BOOLEAN FASTCALL co_IntTranslateAccelerator( - PWINDOW_OBJECT Window, - UINT message, - WPARAM wParam, - LPARAM lParam, - BYTE fVirt, - WORD key, - WORD cmd) + PWINDOW_OBJECT Window, + UINT message, + WPARAM wParam, + LPARAM lParam, + BYTE fVirt, + WORD key, + WORD cmd) { - UINT mesg = 0; + UINT mesg = 0; - ASSERT_REFS_CO(Window); + ASSERT_REFS_CO(Window); - DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", - Window->hSelf, message, wParam, lParam, fVirt, key, cmd); + DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", + Window->hSelf, message, wParam, lParam, fVirt, key, cmd); - if (wParam != key) - { + if (wParam != key) + { DPRINT("T0\n"); return FALSE; - } + } - if (message == WM_CHAR) - { + if (message == WM_CHAR) + { if (!(fVirt & FALT) && !(fVirt & FVIRTKEY)) - { - DPRINT("found accel for WM_CHAR: ('%c')\n", wParam & 0xff); - goto found; - } - } - else - { + { + DPRINT("found accel for WM_CHAR: ('%c')\n", wParam & 0xff); + goto found; + } + } + else + { if ((fVirt & FVIRTKEY) > 0) - { - INT mask = 0; - DPRINT("found accel for virt_key %04x (scan %04x)\n", - wParam, 0xff & HIWORD(lParam)); + { + INT mask = 0; + DPRINT("found accel for virt_key %04x (scan %04x)\n", + wParam, 0xff & HIWORD(lParam)); - DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n", - UserGetKeyState(VK_SHIFT)); - DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n", - UserGetKeyState(VK_CONTROL)); - DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n", - UserGetKeyState(VK_MENU)); + DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n", + UserGetKeyState(VK_SHIFT)); + DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n", + UserGetKeyState(VK_CONTROL)); + DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n", + UserGetKeyState(VK_MENU)); - if (UserGetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT; - if (UserGetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL; - if (UserGetKeyState(VK_MENU) & 0x8000) mask |= FALT; - if (mask == (fVirt & (FSHIFT | FCONTROL | FALT))) goto found; - DPRINT("but incorrect SHIFT/CTRL/ALT-state\n"); - } + if (UserGetKeyState(VK_SHIFT) & 0x8000) + mask |= FSHIFT; + if (UserGetKeyState(VK_CONTROL) & 0x8000) + mask |= FCONTROL; + if (UserGetKeyState(VK_MENU) & 0x8000) + mask |= FALT; + if (mask == (fVirt & (FSHIFT | FCONTROL | FALT))) + goto found; + DPRINT("but incorrect SHIFT/CTRL/ALT-state\n"); + } else - { - if (!(lParam & 0x01000000)) /* no special_key */ - { - if ((fVirt & FALT) && (lParam & 0x20000000)) - { /* ^^ ALT pressed */ - DPRINT("found accel for Alt-%c\n", wParam & 0xff); - goto found; - } + { + if (!(lParam & 0x01000000)) /* no special_key */ + { + if ((fVirt & FALT) && (lParam & 0x20000000)) + { /* ^^ ALT pressed */ + DPRINT("found accel for Alt-%c\n", wParam & 0xff); + goto found; } - } - } + } + } + } - DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = FALSE\n", - Window->hSelf, message, wParam, lParam, fVirt, key, cmd); + DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = FALSE\n", + Window->hSelf, message, wParam, lParam, fVirt, key, cmd); - return FALSE; + return FALSE; - found: - if (message == WM_KEYUP || message == WM_SYSKEYUP) - mesg = 1; - else if (IntGetCaptureWindow()) - mesg = 2; - else if (!IntIsWindowVisible(Window->hSelf)) /* FIXME: WINE IsWindowEnabled == IntIsWindowVisible? */ - mesg = 3; - else - { +found: + if (message == WM_KEYUP || message == WM_SYSKEYUP) + mesg = 1; + else if (IntGetCaptureWindow()) + mesg = 2; + else if (!IntIsWindowVisible(Window->hSelf)) /* FIXME: WINE IsWindowEnabled == IntIsWindowVisible? */ + mesg = 3; + else + { #if 0 - HMENU hMenu, hSubMenu, hSysMenu; - UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; + HMENU hMenu, hSubMenu, hSysMenu; + UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; - hMenu = (UserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 : GetMenu(hWnd); - hSysMenu = get_win_sys_menu(hWnd); + hMenu = (UserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 : GetMenu(hWnd); + hSysMenu = get_win_sys_menu(hWnd); - /* find menu item and ask application to initialize it */ - /* 1. in the system menu */ - hSubMenu = hSysMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) - { - co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L); - if(hSubMenu != hSysMenu) + /* find menu item and ask application to initialize it */ + /* 1. in the system menu */ + hSubMenu = hSysMenu; + nPos = cmd; + if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + { + co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L); + if(hSubMenu != hSysMenu) + { + nPos = MENU_FindSubMenu(&hSysMenu, hSubMenu); + TRACE_(accel)("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hSysMenu, hSubMenu, nPos); + co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); + } + uSysStat = GetMenuState(GetSubMenu(hSysMenu, 0), cmd, MF_BYCOMMAND); + } + else /* 2. in the window's menu */ + { + hSubMenu = hMenu; + nPos = cmd; + if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + { + co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); + if(hSubMenu != hMenu) { - nPos = MENU_FindSubMenu(&hSysMenu, hSubMenu); - TRACE_(accel)("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hSysMenu, hSubMenu, nPos); - co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); + nPos = MENU_FindSubMenu(&hMenu, hSubMenu); + TRACE_(accel)("hMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); + co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE)); } - uSysStat = GetMenuState(GetSubMenu(hSysMenu, 0), cmd, MF_BYCOMMAND); - } - else /* 2. in the window's menu */ - { - hSubMenu = hMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) - { - co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); - if(hSubMenu != hMenu) - { - nPos = MENU_FindSubMenu(&hMenu, hSubMenu); - TRACE_(accel)("hMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); - co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE)); - } - uStat = GetMenuState(hMenu, cmd, MF_BYCOMMAND); - } - } + uStat = GetMenuState(hMenu, cmd, MF_BYCOMMAND); + } + } - if (uSysStat != (UINT)-1) - { - if (uSysStat & (MF_DISABLED|MF_GRAYED)) - mesg=4; + if (uSysStat != (UINT)-1) + { + if (uSysStat & (MF_DISABLED|MF_GRAYED)) + mesg=4; + else + mesg=WM_SYSCOMMAND; + } + else + { + if (uStat != (UINT)-1) + { + if (IsIconic(hWnd)) + mesg=5; else - mesg=WM_SYSCOMMAND; - } - else - { - if (uStat != (UINT)-1) { - if (IsIconic(hWnd)) - mesg=5; - else - { - if (uStat & (MF_DISABLED|MF_GRAYED)) - mesg=6; - else - mesg=WM_COMMAND; - } + if (uStat & (MF_DISABLED|MF_GRAYED)) + mesg=6; + else + mesg=WM_COMMAND; } - else - { - mesg=WM_COMMAND; - } - } + } + else + { + mesg=WM_COMMAND; + } + } #else DPRINT1("menu search not implemented"); mesg = WM_COMMAND; #endif - } - if (mesg == WM_COMMAND) - { + } + + if (mesg == WM_COMMAND) + { DPRINT(", sending WM_COMMAND, wParam=%0x\n", 0x10000 | cmd); co_IntSendMessage(Window->hSelf, mesg, 0x10000 | cmd, 0L); - } - else if (mesg == WM_SYSCOMMAND) - { + } + else if (mesg == WM_SYSCOMMAND) + { DPRINT(", sending WM_SYSCOMMAND, wParam=%0x\n", cmd); co_IntSendMessage(Window->hSelf, mesg, cmd, 0x00010000L); - } - else - { + } + else + { /* some reasons for NOT sending the WM_{SYS}COMMAND message: * #0: unknown (please report!) * #1: for WM_KEYUP,WM_SYSKEYUP @@ -449,104 +454,107 @@ */ DPRINT(", but won't send WM_{SYS}COMMAND, reason is #%d\n", mesg); if (mesg == 0) - { - DPRINT1(" unknown reason - please report!"); - } - } + { + DPRINT1(" unknown reason - please report!"); + } + } - DPRINT("IntTranslateAccelerator(hWnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = TRUE\n", - Window->hSelf, message, wParam, lParam, fVirt, key, cmd); + DPRINT("IntTranslateAccelerator(hWnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = TRUE\n", + Window->hSelf, message, wParam, lParam, fVirt, key, cmd); - return TRUE; + return TRUE; } int STDCALL NtUserTranslateAccelerator( - HWND hWnd, - HACCEL hAccel, - LPMSG Message) + HWND hWnd, + HACCEL hAccel, + LPMSG Message) { - PWINSTATION_OBJECT WindowStation = NULL; - PWINDOW_OBJECT Window = NULL; - PACCELERATOR_TABLE Accel = NULL; - NTSTATUS Status; - ULONG i; - DECLARE_RETURN(int); + PWINSTATION_OBJECT WindowStation = NULL; + PWINDOW_OBJECT Window = NULL; + PACCELERATOR_TABLE Accel = NULL; + NTSTATUS Status; + ULONG i; + DECLARE_RETURN(int); - DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n", - hWnd, hAccel, Message); - UserEnterShared(); + DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n", + hWnd, hAccel, Message); + UserEnterShared(); - if (Message == NULL) - { - SetLastNtError(STATUS_INVALID_PARAMETER); + if (Message == NULL) + { + SetLastNtError(STATUS_INVALID_PARAMETER); RETURN( 0); - } + } - if ((Message->message != WM_KEYDOWN) && - (Message->message != WM_SYSKEYDOWN) && - (Message->message != WM_SYSCHAR) && - (Message->message != WM_CHAR)) - { - RETURN( 0); - } + if ((Message->message != WM_KEYDOWN) && + (Message->message != WM_SYSKEYDOWN) && + (Message->message != WM_SYSCHAR) && + (Message->message != WM_CHAR)) + { + RETURN( 0); + } - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - RETURN( 0); - } + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), + UserMode, + 0, + &WindowStation); - if (!(Accel = UserGetAccelObject(hAccel))) - { - RETURN( 0); - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(STATUS_ACCESS_DENIED); + RETURN( 0); + } - UserRefObjectCo(Accel); + if (!(Accel = UserGetAccelObject(hAccel))) + { + RETURN( 0); + } - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN( 0); - } + UserRefObjectCo(Accel); - UserRefObjectCo(Window); - + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN( 0); + } - /* FIXME: Associate AcceleratorTable with the current thread */ + UserRefObjectCo(Window); - for (i = 0; i < Accel->Count; i++) - { + + /* FIXME: Associate AcceleratorTable with the current thread */ + + for (i = 0; i < Accel->Count; i++) + { if (co_IntTranslateAccelerator(Window, Message->message, Message->wParam, Message->lParam, - Accel->Table[i].fVirt, Accel->Table[i].key, - Accel->Table[i].cmd)) - { - DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", - hWnd, hAccel, Message, 1); - RETURN( 1); - } + Accel->Table[i].fVirt, Accel->Table[i].key, + Accel->Table[i].cmd)) + { + DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", + hWnd, hAccel, Message, 1); + RETURN( 1); + } if (((Accel->Table[i].fVirt & 0x80) > 0)) - { - break; - } - } + { + break; + } + } - RETURN( 0); - + RETURN( 0); + CLEANUP: - - if (Window) UserDerefObjectCo(Window); - if (Accel) UserDerefObjectCo(Accel); - if (WindowStation) ObDereferenceObject(WindowStation); + if (Window) + UserDerefObjectCo(Window); + if (Accel) + UserDerefObjectCo(Accel); - DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", - hWnd, hAccel, Message, 0); - UserLeave(); - END_CLEANUP; + if (WindowStation) + ObDereferenceObject(WindowStation); + + DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", + hWnd, hAccel, Message, 0); + UserLeave(); + END_CLEANUP; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/callback.c --- trunk/reactos/subsys/win32k/ntuser/callback.c 2005-09-07 21:05:16 UTC (rev 17729) +++ trunk/reactos/subsys/win32k/ntuser/callback.c 2005-09-07 21:25:42 UTC (rev 17730) @@ -42,368 +42,369 @@ typedef struct _INT_CALLBACK_HEADER { - /* list entry in the W32THREAD structure */ - LIST_ENTRY ListEntry; -} INT_CALLBACK_HEADER, *PINT_CALLBACK_HEADER; + /* list entry in the W32THREAD structure */ + LIST_ENTRY ListEntry; +} +INT_CALLBACK_HEADER, *PINT_CALLBACK_HEADER; PVOID FASTCALL IntCbAllocateMemory(ULONG Size) { - PINT_CALLBACK_HEADER Mem; - PW32THREAD W32Thread; + PINT_CALLBACK_HEADER Mem; + PW32THREAD W32Thread; - if(!(Mem = ExAllocatePoolWithTag(PagedPool, Size + sizeof(INT_CALLBACK_HEADER), - TAG_CALLBACK))) - { - return NULL; - } + if(!(Mem = ExAllocatePoolWithTag(PagedPool, Size + sizeof(INT_CALLBACK_HEADER), + TAG_CALLBACK))) + { + return NULL; + } - W32Thread = PsGetWin32Thread(); - ASSERT(W32Thread); + W32Thread = PsGetWin32Thread(); + ASSERT(W32Thread); - /* insert the callback memory into the thread's callback list */ + /* insert the callback memory into the thread's callback list */ - InsertTailList(&W32Thread->W32CallbackListHead, &Mem->ListEntry); + InsertTailList(&W32Thread->W32CallbackListHead, &Mem->ListEntry); - return (Mem + 1); + return (Mem + 1); } VOID FASTCALL IntCbFreeMemory(PVOID Data) { - PINT_CALLBACK_HEADER Mem; - PW32THREAD W32Thread; + PINT_CALLBACK_HEADER Mem; + PW32THREAD W32Thread; - ASSERT(Data); + ASSERT(Data); - Mem = ((PINT_CALLBACK_HEADER)Data - 1); + Mem = ((PINT_CALLBACK_HEADER)Data - 1); - W32Thread = PsGetWin32Thread(); - ASSERT(W32Thread); + W32Thread = PsGetWin32Thread(); + ASSERT(W32Thread); - /* remove the memory block from the thread's callback list */ - RemoveEntryList(&Mem->ListEntry); + /* remove the memory block from the thread's callback list */ + RemoveEntryList(&Mem->ListEntry); - /* free memory */ - ExFreePool(Mem); + /* free memory */ + ExFreePool(Mem); } VOID FASTCALL IntCleanupThreadCallbacks(PW32THREAD W32Thread) { - PLIST_ENTRY CurrentEntry; - PINT_CALLBACK_HEADER Mem; + PLIST_ENTRY CurrentEntry; + PINT_CALLBACK_HEADER Mem; - while (!IsListEmpty(&W32Thread->W32CallbackListHead)) - { - CurrentEntry = RemoveHeadList(&W32Thread->W32CallbackListHead); - Mem = CONTAINING_RECORD(CurrentEntry, INT_CALLBACK_HEADER, - ListEntry); + while (!IsListEmpty(&W32Thread->W32CallbackListHead)) + { + CurrentEntry = RemoveHeadList(&W32Thread->W32CallbackListHead); + Mem = CONTAINING_RECORD(CurrentEntry, INT_CALLBACK_HEADER, + ListEntry); - /* free memory */ - ExFreePool(Mem); - } + /* free memory */ + ExFreePool(Mem); + } } /* FUNCTIONS *****************************************************************/ VOID STDCALL co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback, - HWND hWnd, - UINT Msg, - ULONG_PTR CompletionCallbackContext, - LRESULT Result) + HWND hWnd, + UINT Msg, + ULONG_PTR CompletionCallbackContext, + LRESULT Result) { - SENDASYNCPROC_CALLBACK_ARGUMENTS Arguments; - NTSTATUS Status; + SENDASYNCPROC_CALLBACK_ARGUMENTS Arguments; + NTSTATUS Status; - Arguments.Callback = CompletionCallback; - Arguments.Wnd = hWnd; - Arguments.Msg = Msg; - Arguments.Context = CompletionCallbackContext; - Arguments.Result = Result; - - UserLeaveCo(); - - Status = NtW32Call(USER32_CALLBACK_SENDASYNCPROC, - &Arguments, - sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS), - NULL, - NULL); - - UserEnterCo(); - - if (!NT_SUCCESS(Status)) - { + Arguments.Callback = CompletionCallback; + Arguments.Wnd = hWnd; + Arguments.Msg = Msg; + Arguments.Context = CompletionCallbackContext; + Arguments.Result = Result; + + UserLeaveCo(); + + Status = NtW32Call(USER32_CALLBACK_SENDASYNCPROC, + &Arguments, + sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS), + NULL, + NULL); + + UserEnterCo(); + + if (!NT_SUCCESS(Status)) + { return; - } - return; + } + return; [truncated at 1000 lines; 41714 more skipped]

1 0

[gdalsnes] 17729: window pointer was incorrectly passed as wparam to co_IntSendMessage instead of hwnd
by gdalsnes＠svn.reactos.com 07 Sep '05

07 Sep '05

window pointer was incorrectly passed as wparam to co_IntSendMessage instead of hwnd Modified: trunk/reactos/subsys/win32k/ntuser/message.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-07 20:59:26 UTC (rev 17728) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-07 21:05:16 UTC (rev 17729) @@ -506,6 +506,7 @@ USHORT *HitTest) { ULONG Result; + PWINDOW_OBJECT Parent; if(*HitTest == (USHORT)HTTRANSPARENT) { @@ -513,7 +514,14 @@ return TRUE; } - Result = co_IntSendMessage(MsgWindow->hSelf, WM_MOUSEACTIVATE, (WPARAM)IntGetParent(MsgWindow), (LPARAM)MAKELONG(*HitTest, Msg->message)); + Parent = IntGetParent(MsgWindow); + /* fixme: abort if no parent ? */ + Result = co_IntSendMessage(MsgWindow->hSelf, + WM_MOUSEACTIVATE, + (WPARAM) (Parent ? Parent->hSelf : NULL), + (LPARAM)MAKELONG(*HitTest, Msg->message) + ); + switch (Result) { case MA_NOACTIVATEANDEAT:

1 0

[gdalsnes] 17728: -replace user object/handle manager with the one from wine. its simpler, faster and more correct.
by gdalsnes＠svn.reactos.com 07 Sep '05

07 Sep '05

-replace user object/handle manager with the one from wine. its simpler, faster and more correct. -convert dozens of functions to take pointers as args, not handles -attempt to simplify/correct refcounting -remove much useless refcounting -make callout refcounts auto undoable (ei. if the thread crash in umode during callback) -misc formatting/naming changes Modified: trunk/reactos/subsys/win32k/eng/window.c Modified: trunk/reactos/subsys/win32k/include/cursoricon.h Modified: trunk/reactos/subsys/win32k/include/object.h Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/include/win32.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/include/winpos.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsys/win32k/ntuser/object.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/eng/window.c --- trunk/reactos/subsys/win32k/eng/window.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/eng/window.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -197,7 +197,7 @@ STDCALL EngCreateWnd( SURFOBJ *pso, - HWND hwnd, + HWND hWnd, WNDOBJCHANGEPROC pfn, FLONG fl, int iPixelFormat) @@ -209,7 +209,7 @@ DECLARE_RETURN(WNDOBJ*); DPRINT("EngCreateWnd: pso = 0x%x, hwnd = 0x%x, pfn = 0x%x, fl = 0x%x, pixfmt = %d\n", - pso, hwnd, pfn, fl, iPixelFormat); + pso, hWnd, pfn, fl, iPixelFormat); calledFromUser = UserIsEntered(); if (!calledFromUser){ @@ -217,7 +217,7 @@ } /* Get window object */ - Window = IntGetWindowObject(hwnd); + Window = UserGetWindowObject(hWnd); if (Window == NULL) { RETURN( NULL); @@ -227,7 +227,6 @@ WndObjInt = EngAllocMem(0, sizeof (WNDGDI), TAG_WNDOBJ); if (WndObjInt == NULL) { - IntReleaseWindowObject(Window); DPRINT1("Failed to allocate memory for a WND structure!\n"); RETURN( NULL); } @@ -236,7 +235,6 @@ WndObjInt->ClientClipObj = NULL; if (!IntEngWndUpdateClipObj(WndObjInt, Window)) { - IntReleaseWindowObject(Window); EngFreeMem(WndObjInt); RETURN( NULL); } @@ -247,7 +245,7 @@ WndObjUser->pvConsumer = NULL; /* Fill internal object */ - WndObjInt->Hwnd = hwnd; + WndObjInt->Hwnd = hWnd; WndObjInt->ChangeProc = pfn; WndObjInt->Flags = fl; WndObjInt->PixelFormat = iPixelFormat; @@ -255,9 +253,6 @@ /* associate object with window */ InsertTailList(&Window->WndObjListHead, &WndObjInt->ListEntry); - /* release resources */ - IntReleaseWindowObject(Window); - DPRINT("EngCreateWnd: SUCCESS!\n"); RETURN( WndObjUser); _____ Modified: trunk/reactos/subsys/win32k/include/cursoricon.h --- trunk/reactos/subsys/win32k/include/cursoricon.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/cursoricon.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -50,7 +50,7 @@ HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange); BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinStaObject); -PCURICON_OBJECT FASTCALL IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HANDLE Handle); +PCURICON_OBJECT FASTCALL IntGetCurIconObject(HANDLE Handle); PCURICON_OBJECT FASTCALL IntCreateCurIconHandle(PWINSTATION_OBJECT WinStaObject); VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process); _____ Modified: trunk/reactos/subsys/win32k/include/object.h --- trunk/reactos/subsys/win32k/include/object.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/object.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -5,106 +5,128 @@ #include <win32k/bitmaps.h> #include <win32k/pen.h> -typedef enum { - otUnknown = 0, - otClass, - otWindow, - otMenu, - otAcceleratorTable, - otCursorIcon, - otHookProc, - otMonitor -} USER_OBJECT_TYPE; +#define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ +#define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ -typedef struct _USER_OBJECT_HEADER -/* - * Header for user object - */ -{ - USER_OBJECT_TYPE Type; - LONG HandleCount; - LONG RefCount; - CSHORT Size; -} USER_OBJECT_HEADER, *PUSER_OBJECT_HEADER; -typedef struct _USER_HANDLE -{ - PVOID ObjectBody; -} USER_HANDLE, *PUSER_HANDLE; +#define USER_HEADER_TO_BODY(ObjectHeader) \ + ((PVOID)(((PUSER_OBJECT_HEADER)ObjectHeader) + 1)) -#define HANDLE_BLOCK_ENTRIES ((PAGE_SIZE-sizeof(LIST_ENTRY))/sizeof(USER_HANDLE)) +#define USER_BODY_TO_HEADER(ObjectBody) \ + ((PUSER_OBJECT_HEADER)(((PUSER_OBJECT_HEADER)ObjectBody) - 1)) -typedef struct _USER_HANDLE_BLOCK + + +typedef struct _USER_HANDLE_ENTRY { - LIST_ENTRY ListEntry; - USER_HANDLE Handles[HANDLE_BLOCK_ENTRIES]; -} USER_HANDLE_BLOCK, *PUSER_HANDLE_BLOCK; + void *ptr; /* pointer to object */ + unsigned short type; /* object type (0 if free) */ + unsigned short generation; /* generation counter */ +} USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; + + typedef struct _USER_HANDLE_TABLE { - LIST_ENTRY ListHead; -} USER_HANDLE_TABLE, *PUSER_HANDLE_TABLE; + PUSER_HANDLE_ENTRY handles; + PUSER_HANDLE_ENTRY freelist; + int nb_handles; + int allocated_handles; +} USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; -ULONG FASTCALL -ObmGetReferenceCount( - PVOID ObjectBody); -ULONG FASTCALL -ObmGetHandleCount( - PVOID ObjectBody); +typedef enum _USER_OBJECT_TYPE +{ + otFree = 0, + otWindow, + otMenu, + otAccel, + otCursor, + otHook, + otMonitor, + otClass //fixme: remove + +} USER_OBJECT_TYPE; -VOID FASTCALL -ObmReferenceObject( - PVOID ObjectBody); -VOID FASTCALL -ObmDereferenceObject( - PVOID ObjectBody); +typedef struct _USER_OBJECT_HEADER +/* + * Header for user object + */ +{ +// USER_OBJECT_TYPE Type; + LONG RefCount; + BOOL destroyed; + HANDLE hSelf; +// CSHORT Size; +} USER_OBJECT_HEADER, *PUSER_OBJECT_HEADER; -NTSTATUS FASTCALL -ObmReferenceObjectByPointer( - PVOID ObjectBody, - USER_OBJECT_TYPE ObjectType); -PVOID FASTCALL -ObmCreateObject( - PUSER_HANDLE_TABLE HandleTable, - PHANDLE Handle, - USER_OBJECT_TYPE ObjectType, - ULONG ObjectSize); +typedef struct _USER_REFERENCE_ENTRY +{ + SINGLE_LIST_ENTRY Entry; + PVOID obj; +} USER_REFERENCE_ENTRY, *PUSER_REFERENCE_ENTRY; -NTSTATUS FASTCALL -ObmCreateHandle( - PUSER_HANDLE_TABLE HandleTable, - PVOID ObjectBody, - PHANDLE HandleReturn); -NTSTATUS FASTCALL -ObmReferenceObjectByHandle( - PUSER_HANDLE_TABLE HandleTable, - HANDLE Handle, - USER_OBJECT_TYPE ObjectType, - PVOID* Object); -NTSTATUS FASTCALL -ObmCloseHandle( - PUSER_HANDLE_TABLE HandleTable, - HANDLE Handle); +#include <malloc.h> -VOID FASTCALL -ObmInitializeHandleTable( - PUSER_HANDLE_TABLE HandleTable); +#define ASSERT_LAST_REF(_obj_) \ +{ \ + PW32THREAD t; \ + PSINGLE_LIST_ENTRY e; \ + PUSER_REFERENCE_ENTRY ref; \ + \ + ASSERT(_obj_); \ + t = PsGetWin32Thread(); \ + ASSERT(t); \ + e = t->ReferencesList.Next; \ + ASSERT(e); \ + ref = CONTAINING_RECORD(e, USER_REFERENCE_ENTRY, Entry); \ + ASSERT(ref); \ + \ + ASSERT(_obj_ == ref->obj); \ + \ +} +#define UserRefObjectCo(_obj_) \ +{ \ + PW32THREAD t; \ + PUSER_REFERENCE_ENTRY ref; \ + \ + ASSERT(_obj_); \ + t = PsGetWin32Thread(); \ + ASSERT(t); \ + ref = (PUSER_REFERENCE_ENTRY)_alloca(sizeof(USER_REFERENCE_ENTRY)); \ + ASSERT(ref); \ + ref->obj = _obj_; \ + ObmReferenceObject(_obj_); \ + \ + PushEntryList(&t->ReferencesList, &ref->Entry); \ + \ +} -VOID FASTCALL -ObmFreeHandleTable( - PUSER_HANDLE_TABLE HandleTable); -PUSER_HANDLE_TABLE FASTCALL -ObmCreateHandleTable(VOID); +#define UserDerefObjectCo(_obj_) \ +{ \ + PW32THREAD t; \ + PSINGLE_LIST_ENTRY e; \ + PUSER_REFERENCE_ENTRY ref; \ + \ + ASSERT(_obj_); \ + t = PsGetWin32Thread(); \ + ASSERT(t); \ + e = PopEntryList(&t->ReferencesList); \ + ASSERT(e); \ + ref = CONTAINING_RECORD(e, USER_REFERENCE_ENTRY, Entry); \ + ASSERT(ref); \ + \ + ASSERT(_obj_ == ref->obj); \ + ObmDereferenceObject(_obj_); \ + \ +} -VOID FASTCALL ObmDestroyHandleTable (PUSER_HANDLE_TABLE HandleTable); - VOID INTERNAL_CALL InitGdiObjectHandleTable (VOID); VOID FASTCALL CreateStockObjects (VOID); _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -1,18 +1,52 @@ #ifndef _WIN32K_USERFUNCS_H #define _WIN32K_USERFUNCS_H -//currently unused -#define ASSERT_REFS(obj) ASSERT(ObmGetReferenceCount(obj) >= 2) -#define UserReferenceWindowObjectCo(o) IntReferenceWindowObject(o) -#define UserDereferenceWindowObjectCo(o) IntReleaseWindowObject(o) +#define ASSERT_REFS_CO(obj) \ +{ \ + LONG ref = USER_BODY_TO_HEADER(obj)->RefCount;\ + if (!(ref >= 1)){ \ + DPRINT1("obj 0x%x, refs %i\n", obj, ref); \ + ASSERT(FALSE); \ + } \ +} -#define UserReferenceAccelObjectCo(o) IntReferenceWindowObject(o) -#define UserDereferenceAccelObjectCo(o) IntReleaseWindowObject(o) +#define DUMP_REFS(obj) DPRINT1("obj 0x%x, refs %i\n",obj, USER_BODY_TO_HEADER(obj)->RefCount) -extern PUSER_HANDLE_TABLE gHandleTable; + +VOID FASTCALL ObmReferenceObject(PVOID obj); +BOOL FASTCALL ObmDereferenceObject(PVOID obj); + +#define IntReferenceWindowObject(o) ObmReferenceObject(o) + +VOID FASTCALL IntReleaseWindowObject(PWINDOW_OBJECT Window); +PWINDOW_OBJECT FASTCALL IntGetWindowObject(HWND hWnd); +PVOID FASTCALL +ObmCreateObject(PUSER_HANDLE_TABLE ht, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); + +BOOL FASTCALL +ObmDeleteObject(HANDLE h, USER_OBJECT_TYPE type ); + +//#define UserRefObjectCo(o) ObmReferenceObject(o) +//#define UserDerefObjectCo(o) ObmDereferenceObject(o) +BOOL FASTCALL ObmCreateHandleTable(); + + +extern USER_HANDLE_TABLE gHandleTable; + + +/******************** HANDLE.C ***************/ + + +PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ); +VOID UserInitHandleTable(PUSER_HANDLE_TABLE ht, PVOID mem, ULONG bytes); +HANDLE UserAllocHandle(PUSER_HANDLE_TABLE ht, PVOID object, USER_OBJECT_TYPE type ); +PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ); +PVOID UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ); +PVOID UserGetNextHandle(PUSER_HANDLE_TABLE ht, HANDLE* handle, USER_OBJECT_TYPE type ); + /*************** WINSTA.C ***************/ HWINSTA FASTCALL UserGetProcessWindowStation(VOID); @@ -25,7 +59,7 @@ /*************** WINPOS.C ***************/ BOOL FASTCALL -UserGetClientOrigin(HWND hWnd, LPPOINT Point); +UserGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point); /*************** FOCUS.C ***************/ @@ -81,7 +115,7 @@ /*************** PAINTING.C ***************/ -BOOL FASTCALL UserValidateRgn(HWND hWnd, HRGN hRgn); +BOOL FASTCALL co_UserValidateRgn(PWINDOW_OBJECT Window, HRGN hRgn); /*************** WINDOW.C ***************/ _____ Modified: trunk/reactos/subsys/win32k/include/win32.h --- trunk/reactos/subsys/win32k/include/win32.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/win32.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -13,6 +13,8 @@ HANDLE hDesktop; DWORD MessagePumpHookValue; BOOLEAN IsExiting; + SINGLE_LIST_ENTRY ReferencesList; + } W32THREAD, *PW32THREAD; #include <poppack.h> _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/window.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -123,15 +123,7 @@ #define IntIsBroadcastHwnd(hWnd) \ (hWnd == HWND_BROADCAST || hWnd == HWND_TOPMOST) -#define IntGetWindowObject(hWnd) \ - IntGetProcessWindowObject(PsGetWin32Thread(), hWnd) -#define IntReferenceWindowObject(WndObj) \ - ObmReferenceObjectByPointer(WndObj, otWindow) - -#define IntReleaseWindowObject(WndObj) \ - ObmDereferenceObject(WndObj) - #define IntWndBelongsToThread(WndObj, W32Thread) \ (((WndObj->OwnerThread && WndObj->OwnerThread->Tcb.Win32Thread)) && \ (WndObj->OwnerThread->Tcb.Win32Thread == W32Thread)) @@ -143,9 +135,6 @@ WndObj->OwnerThread->ThreadsProcess->UniqueProcessId -PWINDOW_OBJECT FASTCALL -IntGetProcessWindowObject(PW32THREAD Thread, HWND hWnd); - BOOL FASTCALL IntIsWindow(HWND hWnd); _____ Modified: trunk/reactos/subsys/win32k/include/winpos.h --- trunk/reactos/subsys/win32k/include/winpos.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/winpos.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -17,7 +17,7 @@ UINT FASTCALL co_WinPosArrangeIconicWindows(PWINDOW_OBJECT parent); BOOL FASTCALL -IntGetClientOrigin(HWND hWnd, LPPOINT Point); +IntGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point); LRESULT FASTCALL co_WinPosGetNonClientSize(HWND Wnd, RECT* WindowRect, RECT* ClientRect); UINT FASTCALL @@ -26,7 +26,7 @@ UINT FASTCALL co_WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos); BOOLEAN FASTCALL -co_WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, +co_WinPosSetWindowPos(PWINDOW_OBJECT Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, INT cy, UINT flags); BOOLEAN FASTCALL co_WinPosShowWindow(PWINDOW_OBJECT Window, INT Cmd); _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -219,11 +219,14 @@ } else { + PSINGLE_LIST_ENTRY e; + DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); Win32Thread->IsExiting = TRUE; HOOK_DestroyThreadHooks(Thread); UnregisterThreadHotKeys(Thread); + /* what if this co_ func crash in umode? what will clean us up then? */ co_DestroyThreadWindows(Thread); IntBlockInput(Win32Thread, FALSE); MsqDestroyMessageQueue(Win32Thread->MessageQueue); @@ -232,6 +235,17 @@ { ObDereferenceObject(Win32Thread->Desktop); } + + /* cleanup user object references stack */ + e = PopEntryList(&Win32Thread->ReferencesList); + while (e) + { + PUSER_REFERENCE_ENTRY ref = CONTAINING_RECORD(e, USER_REFERENCE_ENTRY, Entry); + DPRINT1("thread clean: remove reference obj 0x%x\n",ref->obj); + ObmDereferenceObject(ref->obj); + + e = PopEntryList(&Win32Thread->ReferencesList); + } } RETURN( STATUS_SUCCESS); _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -70,21 +70,19 @@ static -PACCELERATOR_TABLE FASTCALL UserGetAccelObjectNoRef(HACCEL hAccel) +PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel) { - PACCELERATOR_TABLE Accel=NULL; - NTSTATUS Status = ObmReferenceObjectByHandle(gHandleTable, - hAccel, - otAcceleratorTable, - (PVOID*)&Accel); - - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); - return NULL; - } + PACCELERATOR_TABLE Accel= UserGetObject(&gHandleTable, hAccel, otAccel); - ObmDereferenceObject(Accel); + if (Accel) + { + ASSERT(USER_BODY_TO_HEADER(Accel)->RefCount >= 0); + } + else + { + SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); + } + return Accel; } @@ -118,7 +116,7 @@ RETURN(0); } - if (!(Accel = UserGetAccelObjectNoRef(hAccel))) + if (!(Accel = UserGetAccelObject(hAccel))) { ObDereferenceObject(WindowStation); RETURN(0); @@ -177,11 +175,7 @@ RETURN( FALSE ); } - Accel = ObmCreateObject( - gHandleTable, - (PHANDLE)&hAccel, - otAcceleratorTable, - sizeof(ACCELERATOR_TABLE)); + Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); if (Accel == NULL) { @@ -196,7 +190,7 @@ Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); if (Accel->Table == NULL) { - ObmCloseHandle(gHandleTable, hAccel); + ObmDeleteObject(hAccel, otAccel); ObDereferenceObject(WindowStation); SetLastNtError(Status); RETURN( (HACCEL) 0); @@ -206,7 +200,7 @@ if (!NT_SUCCESS(Status)) { ExFreePool(Accel->Table); - ObmCloseHandle(gHandleTable, hAccel); + ObmDeleteObject(hAccel, otAccel); ObDereferenceObject(WindowStation); SetLastNtError(Status); RETURN((HACCEL) 0); @@ -258,13 +252,13 @@ RETURN( FALSE); } - if (!(Accel = UserGetAccelObjectNoRef(hAccel))) + if (!(Accel = UserGetAccelObject(hAccel))) { ObDereferenceObject(WindowStation); RETURN( FALSE); } - ObmCloseHandle(gHandleTable, hAccel); + ObmDeleteObject(hAccel, otAccel); if (Accel->Table != NULL) { @@ -294,7 +288,7 @@ { UINT mesg = 0; - ASSERT_REFS(Window); + ASSERT_REFS_CO(Window); DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", Window->hSelf, message, wParam, lParam, fVirt, key, cmd); @@ -509,19 +503,19 @@ RETURN( 0); } - if (!(Accel = UserGetAccelObjectNoRef(hAccel))) + if (!(Accel = UserGetAccelObject(hAccel))) { RETURN( 0); } - UserReferenceAccelObjectCo(Accel); + UserRefObjectCo(Accel); if (!(Window = UserGetWindowObject(hWnd))) { RETURN( 0); } - UserReferenceWindowObjectCo(Window); + UserRefObjectCo(Window); /* FIXME: Associate AcceleratorTable with the current thread */ @@ -546,8 +540,8 @@ CLEANUP: - if (Window) UserReferenceWindowObjectCo(Window); - if (Accel) UserReferenceAccelObjectCo(Accel); + if (Window) UserDerefObjectCo(Window); + if (Accel) UserDerefObjectCo(Accel); if (WindowStation) ObDereferenceObject(WindowStation); _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -299,7 +299,7 @@ } objectSize = sizeof(WNDCLASS_OBJECT) + lpwcx->cbClsExtra; - ClassObject = ObmCreateObject(NULL, NULL, otClass, objectSize); + ClassObject = ObmCreateObject(&gHandleTable, NULL, otClass, objectSize); if (ClassObject == 0) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -538,22 +538,18 @@ NtUserGetClassLong(HWND hWnd, DWORD Offset, BOOL Ansi) { PWINDOW_OBJECT Window; - LONG Ret; DECLARE_RETURN(DWORD); DPRINT("Enter NtUserGetClassLong\n"); UserEnterExclusive(); - Window = IntGetWindowObject(hWnd); - if (Window == NULL) + if (!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN(0); } - Ret = IntGetClassLong(Window, Offset, Ansi); - IntReleaseWindowObject(Window); - RETURN(Ret); + RETURN(IntGetClassLong(Window, Offset, Ansi)); + CLEANUP: DPRINT("Leave NtUserGetClassLong, ret=%i\n",_ret_); UserLeave(); @@ -565,6 +561,8 @@ { PWINDOW_OBJECT Parent, Owner; + ASSERT_REFS_CO(Window); + if ((int)Offset >= 0) { DPRINT("SetClassLong(%x, %d, %x)\n", Window->hSelf, Offset, dwNewLong); @@ -669,14 +667,18 @@ DPRINT("Enter NtUserSetClassLong\n"); UserEnterExclusive(); - if (!(Window = IntGetWindowObject(hWnd))) + if (!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN(0); } + + UserRefObjectCo(Window); + Ret = IntGetClassLong(Window, Offset, Ansi); co_IntSetClassLong(Window, Offset, dwNewLong, Ansi); - IntReleaseWindowObject(Window); + + UserDerefObjectCo(Window); + RETURN(Ret); CLEANUP: _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -71,21 +71,36 @@ return TRUE; } -PCURICON_OBJECT FASTCALL -IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HANDLE Handle) + + + +/* temp hack */ +PCURICON_OBJECT FASTCALL UserGetCurIconObject(HANDLE hWnd) { - PCURICON_OBJECT Object; - NTSTATUS Status; - - Status = ObmReferenceObjectByHandle(gHandleTable, - Handle, otCursorIcon, (PVOID*)&Object); - if (!NT_SUCCESS(Status)) + PCURICON_OBJECT Window = (PCURICON_OBJECT)UserGetObject(&gHandleTable, hWnd, otCursor); + if (!Window) { + SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); return NULL; } - return Object; + + ASSERT(USER_BODY_TO_HEADER(Window)->RefCount >= 0); + return Window; } +PCURICON_OBJECT FASTCALL +IntGetCurIconObject(HANDLE Handle) +{ + PCURICON_OBJECT ci = UserGetCurIconObject(Handle); + if (ci) + { + ASSERT(USER_BODY_TO_HEADER(ci)->RefCount >= 0); + + USER_BODY_TO_HEADER(ci)->RefCount++; + } + return ci; +} + #define COLORCURSORS_ALLOWED FALSE HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, @@ -362,7 +377,9 @@ { Object = CONTAINING_RECORD(CurrentEntry, CURICON_OBJECT, ListEntry); CurrentEntry = CurrentEntry->Flink; - if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) + +// if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) //<- huh???? + ObmReferenceObject( Object); { if((Object->hModule == hModule) && (Object->hRsrc == hRsrc)) { @@ -380,6 +397,7 @@ } } ObmDereferenceObject(Object); + } return NULL; @@ -391,7 +409,7 @@ PCURICON_OBJECT Object; HANDLE Handle; - Object = ObmCreateObject(gHandleTable, &Handle, otCursorIcon, sizeof(CURICON_OBJECT)); + Object = ObmCreateObject(&gHandleTable, &Handle, otCursor, sizeof(CURICON_OBJECT)); if(!Object) { @@ -405,7 +423,7 @@ if (! ReferenceCurIconByProcess(Object)) { DPRINT1("Failed to add process\n"); - ObmCloseHandle(gHandleTable, Handle); + ObmDeleteObject(Handle, otCursor); ObmDereferenceObject(Object); return NULL; } @@ -483,7 +501,7 @@ bmpMask = Object->IconInfo.hbmMask; bmpColor = Object->IconInfo.hbmColor; - Ret = NT_SUCCESS(ObmCloseHandle(gHandleTable, Object->Self)); + Ret = ObmDeleteObject(Object->Self, otCursor); /* delete bitmaps */ if(bmpMask) @@ -520,7 +538,10 @@ { Object = CONTAINING_RECORD(CurrentEntry, CURICON_OBJECT, ListEntry); CurrentEntry = CurrentEntry->Flink; - if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) + + + ObmReferenceObject(Object); +// if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) { ProcessEntry = Object->ProcessList.Flink; while (ProcessEntry != &Object->ProcessList) @@ -537,6 +558,8 @@ ObmDereferenceObject(Object); } + + } ObDereferenceObject(WinStaObject); @@ -646,7 +669,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, Handle); + CurIconObject = IntGetCurIconObject(Handle); if(CurIconObject) { if(IconInfo) @@ -712,7 +735,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, Handle); + CurIconObject = IntGetCurIconObject(Handle); if(CurIconObject) { /* Copy fields */ @@ -929,7 +952,6 @@ { PWINSTATION_OBJECT WinStaObject; PCURICON_OBJECT Object; - NTSTATUS Status; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserDestroyCursorIcon\n"); @@ -941,13 +963,18 @@ RETURN( FALSE); } - Status = ObmReferenceObjectByHandle(gHandleTable, Handle, otCursorIcon, (PVOID*)&Object); - if(!NT_SUCCESS(Status)) + if (!(Object = IntGetCurIconObject(Handle))) { - ObDereferenceObject(WinStaObject); - SetLastNtError(Status); - RETURN( FALSE); + ObDereferenceObject(WinStaObject); + RETURN(FALSE); } +// Status = ObmReferenceObjectByHandle(gHandleTable, Handle, otCursorIcon, (PVOID*)&Object); +// if(!NT_SUCCESS(Status)) +// { +// ObDereferenceObject(WinStaObject); +// SetLastNtError(Status); +// RETURN( FALSE); +// } if(IntDestroyCurIconObject(WinStaObject, Object, FALSE)) { @@ -1098,7 +1125,7 @@ RETURN( (HCURSOR)0); } - CurIconObject = IntGetCurIconObject(WinStaObject, hCursor); + CurIconObject = IntGetCurIconObject(hCursor); if(CurIconObject) { OldCursor = IntSetCursor(WinStaObject, CurIconObject, FALSE); @@ -1142,7 +1169,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, Handle); + CurIconObject = IntGetCurIconObject(Handle); if(CurIconObject) { /* Copy fields */ @@ -1222,7 +1249,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, Handle); + CurIconObject = IntGetCurIconObject(Handle); if(CurIconObject) { CurIconObject->hModule = hModule; @@ -1338,7 +1365,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, hIcon); + CurIconObject = IntGetCurIconObject(hIcon); if(CurIconObject) { hbmMask = CurIconObject->IconInfo.hbmMask; _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -63,7 +63,7 @@ { PWINDOW_OBJECT Window, Owner, Parent; - if (hWnd) + if (hWnd && (Window = IntGetWindowObject(hWnd))) { /* Send palette messages */ if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) @@ -73,25 +73,26 @@ } if (UserGetWindow(hWnd, GW_HWNDPREV) != NULL) - co_WinPosSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, + co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOSENDCHANGING); - Window = IntGetWindowObject(hWnd); - if (Window) { - Owner = IntGetOwner(Window); - if (!Owner) { - Parent = IntGetParent(Window); - if (!Parent) + + Owner = IntGetOwner(Window); + if (!Owner) + { + Parent = IntGetParent(Window); + if (!Parent) co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, (LPARAM) hWnd); - else + else IntReleaseWindowObject(Parent); - } else { - IntReleaseWindowObject(Owner); - } - - IntReleaseWindowObject(Window); + } + else + { + IntReleaseWindowObject(Owner); } + IntReleaseWindowObject(Window); + /* FIXME: IntIsWindow */ co_IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(hWnd == UserGetForegroundWindow()), 0); @@ -154,6 +155,8 @@ HWND hWndFocusPrev = NULL; PUSER_MESSAGE_QUEUE PrevForegroundQueue; + ASSERT_REFS_CO(Window); + DPRINT("IntSetForegroundAndFocusWindow(%x, %x, %s)\n", hWnd, hWndFocus, MouseActivate ? "TRUE" : "FALSE"); DPRINT("(%wZ)\n", &Window->WindowName); @@ -214,6 +217,8 @@ BOOL FASTCALL co_IntSetForegroundWindow(PWINDOW_OBJECT Window) { + ASSERT_REFS_CO(Window); + return co_IntSetForegroundAndFocusWindow(Window, Window, FALSE); } @@ -223,6 +228,8 @@ HWND Top; PWINDOW_OBJECT TopWindow; + ASSERT_REFS_CO(Window); + if(Window->Style & WS_DISABLED) { BOOL Ret; @@ -269,12 +276,14 @@ } HWND FASTCALL -co_IntSetActiveWindow(PWINDOW_OBJECT Window) +co_IntSetActiveWindow(PWINDOW_OBJECT Window OPTIONAL) { PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndPrev; HWND hWnd = 0; + if (Window) ASSERT_REFS_CO(Window); + ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; ASSERT(ThreadQueue != 0); @@ -404,10 +413,8 @@ PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndPrev; - Window = IntGetWindowObject(hWnd); - if (Window == NULL) + if (!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN( 0); } @@ -417,13 +424,13 @@ if (Window->MessageQueue != ThreadQueue) { - IntReleaseWindowObject(Window); SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN( 0); } [truncated at 1000 lines; 2443 more skipped]

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