Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 19196: - Add new configuration option "SARCH" to define the sub-architecture. Examples include i386-xbox, ppc-be/le (little/bigendian), or any other sub-types of the specified ARCH.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Add new configuration option "SARCH" to define the sub-architecture. Examples include i386-xbox, ppc-be/le (little/bigendian), or any other sub-types of the specified ARCH. - Use SARCH option to isolate XBOX architecture code in freeldr. - Only build rs232.c if DEBUG is on, because the code is only used in DEBUG mode. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: trunk/reactos/config.template.xml _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 06:13:20 UTC (rev 19195) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 06:34:51 UTC (rev 19196) @@ -32,7 +32,9 @@ PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { +#ifdef XBOX XboxMachInit(CmdLine); +#endif } else { _____ Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c 2005-11-13 06:13:20 UTC (rev 19195) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c 2005-11-13 06:34:51 UTC (rev 19196) @@ -23,6 +23,8 @@ /* MACROS *******************************************************************/ +#ifndef DEBUG + #define DEFAULT_BAUD_RATE 19200 #define SER_RBR(x) ((x)+0) @@ -272,3 +274,5 @@ WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend); } + +#endif _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 06:13:20 UTC (rev 19195) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 06:34:51 UTC (rev 19196) @@ -22,20 +22,22 @@ <file>i386rtl.c</file> <file>i386vid.c</file> <file>machpc.c</file> - <file>machxbox.c</file> <file>pccons.c</file> <file>pcdisk.c</file> <file>pcmem.c</file> <file>pcrtc.c</file> <file>pcvideo.c</file> <file>portio.c</file> - <file>xboxcons.c</file> - <file>xboxdisk.c</file> - <file>xboxfont.c</file> - <file>xboxhw.c</file> - <file>xboxmem.c</file> - <file>xboxrtc.c</file> - <file>xboxvideo.c</file> + <if property="SARCH" value="xbox"> + <file>machxbox.c</file> + <file>xboxcons.c</file> + <file>xboxdisk.c</file> + <file>xboxfont.c</file> + <file>xboxhw.c</file> + <file>xboxmem.c</file> + <file>xboxrtc.c</file> + <file>xboxvideo.c</file> + </if> </directory> </if> </directory> _____ Modified: trunk/reactos/config.template.xml --- trunk/reactos/config.template.xml 2005-11-13 06:13:20 UTC (rev 19195) +++ trunk/reactos/config.template.xml 2005-11-13 06:34:51 UTC (rev 19196) @@ -15,7 +15,13 @@ --> <property name="ARCH" value="i386" /> + +<property name="SARCH" value="" /> + <!-- Which CPU ReactOS should be optimized for. Specify one of: i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp,

1 0

[ion] 19195: - Remove duplicate PCH entry, it'll inherit freeldr's.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Remove duplicate PCH entry, it'll inherit freeldr's. Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml _____ Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml 2005-11-13 06:11:38 UTC (rev 19194) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml 2005-11-13 06:13:20 UTC (rev 19195) @@ -14,5 +14,4 @@ <directory name="reactos"> <file>setupldr.c</file> </directory> - <pch>include/freeldr.h</pch> </module>

1 0

[ion] 19194: - Fix a bug in printf.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Fix a bug in printf. Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 06:09:37 UTC (rev 19193) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 06:11:38 UTC (rev 19194) @@ -42,7 +42,10 @@ switch (c = *(format++)) { case 'd': case 'u': case 'x': - *_itoa(va_arg(ap, unsigned long), str, 10) = 0; + if (c == 'x') + *_itoa(va_arg(ap, unsigned long), str, 16) = 0; + else + *_itoa(va_arg(ap, unsigned long), str, 10) = 0; ptr = str;

1 0

[ion] 19193: - Fix setupldr. Thanks to Steven.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Fix setupldr. Thanks to Steven. Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.xml Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-13 06:05:06 UTC (rev 19192) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-13 06:09:37 UTC (rev 19193) @@ -36,6 +36,7 @@ #include <cache.h> #include <machine.h> #include <inifile.h> +#include <inffile.h> #include <video.h> #include <portio.h> #include <reactos.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.xml --- trunk/reactos/boot/freeldr/freeldr/setupldr.xml 2005-11-13 06:05:06 UTC (rev 19192) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.xml 2005-11-13 06:09:37 UTC (rev 19193) @@ -5,4 +5,6 @@ <library>freeldr_base</library> <library>setupldr_main</library> <library>rossym</library> + <library>string</library> + <library>rtl</library> </module> _____ Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml 2005-11-13 06:05:06 UTC (rev 19192) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml 2005-11-13 06:09:37 UTC (rev 19193) @@ -14,4 +14,5 @@ <directory name="reactos"> <file>setupldr.c</file> </directory> + <pch>include/freeldr.h</pch> </module>

1 0

[ion] 19192: - Remove duplicated code in "rtl" and use libstring and librtl instead (their code is safe for freeldr).
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Remove duplicated code in "rtl" and use libstring and librtl instead (their code is safe for freeldr). - Fix a PCH bug. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.xml Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/list.c Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/memcmp.c Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/memcpy.c Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/memmove.c Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/memset.c Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/print.c Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/stdlib.c Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/string.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -451,7 +451,7 @@ static char Path[] = "multi(0)disk(0)"; char Device[4]; - itoa(i386BootDrive, Device, 10); + _itoa(i386BootDrive, Device, 10); if (Size <= sizeof(Path) + 6 + strlen(Device)) { return FALSE; @@ -491,7 +491,7 @@ } p = SystemPath; - while ('\0' != *p && 0 != strnicmp(p, "partition(", 10)) { + while ('\0' != *p && 0 != _strnicmp(p, "partition(", 10)) { p++; } p = strchr(p, ')'); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -895,11 +895,11 @@ { DbgPrint((DPRINT_UI, "VGA display adapter detected.\n")); - if (0 == stricmp(DisplayModeName, "NORMAL_VGA")) + if (0 == _stricmp(DisplayModeName, "NORMAL_VGA")) { VideoMode = VIDEOMODE_NORMAL_TEXT; } - else if (0 == stricmp(DisplayModeName, "EXTENDED_VGA")) + else if (0 == _stricmp(DisplayModeName, "EXTENDED_VGA")) { VideoMode = VIDEOMODE_EXTENDED_TEXT; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -120,23 +120,23 @@ // Install the drive mapper according to this sections drive mappings DriveMapMapDrivesInSection(OperatingSystemSectionNames[SelectedOperating System]); - if (stricmp(SettingValue, "ReactOS") == 0) + if (_stricmp(SettingValue, "ReactOS") == 0) { LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]) ; } - else if (stricmp(SettingValue, "Linux") == 0) + else if (_stricmp(SettingValue, "Linux") == 0) { LoadAndBootLinux(OperatingSystemSectionNames[SelectedOperatingSystem], OperatingSystemDisplayNames[SelectedOperatingSystem]); } - else if (stricmp(SettingValue, "BootSector") == 0) + else if (_stricmp(SettingValue, "BootSector") == 0) { LoadAndBootBootSector(OperatingSystemSectionNames[SelectedOperatingSyste m]); } - else if (stricmp(SettingValue, "Partition") == 0) + else if (_stricmp(SettingValue, "Partition") == 0) { LoadAndBootPartition(OperatingSystemSectionNames[SelectedOperatingSystem ]); } - else if (stricmp(SettingValue, "Drive") == 0) + else if (_stricmp(SettingValue, "Drive") == 0) { LoadAndBootDrive(OperatingSystemSectionNames[SelectedOperatingSystem]); } @@ -174,7 +174,7 @@ { for (Idx=0; Idx<OperatingSystemCount; Idx++) { - if (stricmp(DefaultOSName, OperatingSystemList[Idx]) == 0) + if (_stricmp(DefaultOSName, OperatingSystemList[Idx]) == 0) { DefaultOS = Idx; break; _____ Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c --- trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -92,11 +92,11 @@ { *s++ = '\0'; } - if (0 == stricmp(Name, "defaultos")) + if (0 == _stricmp(Name, "defaultos")) { CmdLineInfo.DefaultOperatingSystem = Value; } - else if (0 == stricmp(Name, "timeout")) + else if (0 == _stricmp(Name, "timeout")) { CmdLineInfo.TimeOut = atoi(Value); } _____ Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c --- trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -56,7 +56,7 @@ // Get the next setting from the .ini file section if (IniReadSettingByNumber(SectionId, Index, SettingName, 80, SettingValue, 80)) { - if (stricmp(SettingName, "DriveMap") == 0) + if (_stricmp(SettingName, "DriveMap") == 0) { // Make sure we haven't exceeded the drive map max count if (DriveMapList.DriveMapCount >= 4) _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr.xml 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.xml 2005-11-13 06:05:06 UTC (rev 19192) @@ -5,4 +5,6 @@ <library>freeldr_base</library> <library>freeldr_main</library> <library>rossym</library> + <library>string</library> + <library>rtl</library> </module> _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 06:05:06 UTC (rev 19192) @@ -3,7 +3,6 @@ <include base="freeldr_base">cache</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <compilerflag>-nostdlib</compilerflag> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> @@ -80,13 +79,6 @@ </directory> <directory name="rtl"> <file>list.c</file> - <file>memcmp.c</file> - <file>memcpy.c</file> - <file>memmove.c</file> - <file>memset.c</file> - <file>print.c</file> - <file>stdlib.c</file> - <file>string.c</file> </directory> <directory name="ui"> <file>gui.c</file> _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.xml 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.xml 2005-11-13 06:05:06 UTC (rev 19192) @@ -2,7 +2,6 @@ <include base="freeldr_base64k">include</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <compilerflag>-nostdlib</compilerflag> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml 2005-11-13 06:05:06 UTC (rev 19192) @@ -2,7 +2,6 @@ <include base="freeldr_main">include</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <compilerflag>-nostdlib</compilerflag> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> @@ -15,5 +14,4 @@ <file>linuxboot.c</file> <file>oslist.c</file> <file>custom.c</file> - <pch>include/freeldr.h</pch> </module> _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_startup.xml 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_startup.xml 2005-11-13 06:05:06 UTC (rev 19192) @@ -2,7 +2,6 @@ <include base="freeldr_startup">include</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> - <compilerflag>-nostdlib</compilerflag> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -306,7 +306,7 @@ DbgPrint((DPRINT_FILESYSTEM, "Dumping directory entry at offset %d:\n", CurrentOffset)); DbgDumpBuffer(DPRINT_FILESYSTEM, CurrentDirectoryEntry, CurrentDirectoryEntry->rec_len); - if ((strnicmp(FileName, CurrentDirectoryEntry->name, CurrentDirectoryEntry->name_len) == 0) && + if ((_strnicmp(FileName, CurrentDirectoryEntry->name, CurrentDirectoryEntry->name_len) == 0) && (strlen(FileName) == CurrentDirectoryEntry->name_len)) { RtlCopyMemory(DirectoryEntry, CurrentDirectoryEntry, sizeof(EXT2_DIR_ENTRY)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -558,8 +558,8 @@ // // See if the file name matches either the short or long name // - if (((strlen(FileName) == strlen(LfnNameBuffer)) && (stricmp(FileName, LfnNameBuffer) == 0)) || - ((strlen(FileName) == strlen(ShortNameBuffer)) && (stricmp(FileName, ShortNameBuffer) == 0))) { + if (((strlen(FileName) == strlen(LfnNameBuffer)) && (_stricmp(FileName, LfnNameBuffer) == 0)) || + ((strlen(FileName) == strlen(ShortNameBuffer)) && (_stricmp(FileName, ShortNameBuffer) == 0))) { // // We found the entry, now fill in the FAT_FILE_INFO struct // @@ -633,7 +633,7 @@ continue; } if (FileNameLen == DirEntry->FileNameSize && - 0 == strnicmp(FileName, DirEntry->FileName, FileNameLen)) + 0 == _strnicmp(FileName, DirEntry->FileName, FileNameLen)) { /* * We found the entry, now fill in the FAT_FILE_INFO struct _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -99,7 +99,7 @@ Name[i] = 0; DbgPrint((DPRINT_FILESYSTEM, "Name '%s'\n", Name)); - if (strlen(FileName) == strlen(Name) && stricmp(FileName, Name) == 0) + if (strlen(FileName) == strlen(Name) && _stricmp(FileName, Name) == 0) { IsoFileInfoPointer->FileStart = Record->ExtentLocationL; IsoFileInfoPointer->FileSize = Record->DataLengthL; _____ Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -217,7 +217,7 @@ Section = Cache->FirstSection; while (Section != NULL) { - if (stricmp (Section->Name, Name) == 0) + if (_stricmp (Section->Name, Name) == 0) { return Section; } @@ -374,7 +374,7 @@ Line = Section->FirstLine; while (Line != NULL) { - if (Line->Key != NULL && stricmp (Line->Key, Key) == 0) + if (Line->Key != NULL && _stricmp (Line->Key, Key) == 0) { return Line; } @@ -1008,7 +1008,7 @@ // DPRINT("Comparing '%S' and '%S'\n", CacheSection->Name, Section); /* Are the section names the same? */ - if (stricmp(CacheSection->Name, Section) == 0) + if (_stricmp(CacheSection->Name, Section) == 0) { if (Key != NULL) { @@ -1082,7 +1082,7 @@ CacheLine = ((PINFCACHESECTION)(ContextIn->Section))->FirstLine; while (CacheLine != NULL) { - if (CacheLine->Key != NULL && stricmp (CacheLine->Key, Key) == 0) + if (CacheLine->Key != NULL && _stricmp (CacheLine->Key, Key) == 0) { if (ContextIn != ContextOut) @@ -1118,7 +1118,7 @@ CacheLine = (PINFCACHELINE)ContextIn->Line; while (CacheLine != NULL) { - if (CacheLine->Key != NULL && stricmp (CacheLine->Key, Key) == 0) + if (CacheLine->Key != NULL && _stricmp (CacheLine->Key, Key) == 0) { if (ContextIn != ContextOut) @@ -1160,7 +1160,7 @@ // DPRINT("Comparing '%S' and '%S'\n", CacheSection->Name, Section); /* Are the section names the same? */ - if (stricmp(CacheSection->Name, Section) == 0) + if (_stricmp(CacheSection->Name, Section) == 0) { return CacheSection->LineCount; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -36,7 +36,7 @@ while (Section != NULL) { // Compare against the section name - if (stricmp(SectionName, Section->SectionName) == 0) + if (_stricmp(SectionName, Section->SectionName) == 0) { // We found it *SectionId = (ULONG)Section; @@ -141,7 +141,7 @@ while (SectionItem != NULL) { // Check to see if this is the setting they want - if (stricmp(SettingName, SectionItem->ItemName) == 0) + if (_stricmp(SettingName, SectionItem->ItemName) == 0) { DbgPrint((DPRINT_INIFILE, "IniReadSettingByName() Setting \'%s\' found.\n", SettingName)); DbgPrint((DPRINT_INIFILE, "IniReadSettingByName() Setting value = %s\n", SectionItem->ItemValue)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c --- trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -25,11 +25,11 @@ { char *p; - if (strnicmp(ArcPath, "multi(0)disk(0)", 15) != 0) + if (_strnicmp(ArcPath, "multi(0)disk(0)", 15) != 0) return FALSE; p = ArcPath + 15; - if (strnicmp(p, "fdisk(", 6) == 0) + if (_strnicmp(p, "fdisk(", 6) == 0) { /* * floppy disk path: @@ -43,7 +43,7 @@ p++; *BootPartition = 0xff; } - else if (strnicmp(p, "cdrom(", 6) == 0) + else if (_strnicmp(p, "cdrom(", 6) == 0) { /* * cdrom path: @@ -57,7 +57,7 @@ p++; *BootPartition = 0xff; } - else if (strnicmp(p, "rdisk(", 6) == 0) + else if (_strnicmp(p, "rdisk(", 6) == 0) { /* * hard disk path: @@ -66,7 +66,7 @@ p = p + 6; *BootDrive = atoi(p) + 0x80; p = strchr(p, ')'); - if ((p == NULL) || (strnicmp(p, ")partition(", 11) != 0)) + if ((p == NULL) || (_strnicmp(p, ")partition(", 11) != 0)) return FALSE; p = p + 11; *BootPartition = atoi(p); @@ -126,11 +126,11 @@ char * p; ULONG DriveNumber = 0; - if (strnicmp(ArcPath, "multi(0)disk(0)", 15) != 0) + if (_strnicmp(ArcPath, "multi(0)disk(0)", 15) != 0) return 0; p = ArcPath + 15; - if (strnicmp(p, "fdisk(", 6) == 0) + if (_strnicmp(p, "fdisk(", 6) == 0) { /* * floppy disk path: @@ -139,7 +139,7 @@ p = p + 6; DriveNumber = atoi(p); } - else if (strnicmp(p, "rdisk(", 6) == 0) + else if (_strnicmp(p, "rdisk(", 6) == 0) { /* * hard disk path: _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c --- trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -243,7 +243,7 @@ while ((p = strchr(p, '/')) != NULL) { /* Find "/3GB" */ - if (!strnicmp(p + 1, "3GB", 3)) { + if (!_strnicmp(p + 1, "3GB", 3)) { /* Make sure there's nothing following it */ if (p[4] == ' ' || p[4] == 0) { @@ -303,7 +303,7 @@ p++; /* Find "PAE" */ - if (!strnicmp(p, "PAE", 3)) { + if (!_strnicmp(p, "PAE", 3)) { /* Make sure there's nothing following it */ if (p[3] == ' ' || p[3] == 0) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -453,7 +453,7 @@ /* Make sure it should be started */ if ((StartValue == 0) && (TagValue == OrderList[TagIndex]) && - (stricmp(DriverGroup, GroupName) == 0)) { + (_stricmp(DriverGroup, GroupName) == 0)) { /* Get the Driver's Location */ ValueSize = 256; @@ -529,7 +529,7 @@ if ((StartValue == 0) && (TagIndex > OrderList[0]) && - (stricmp(DriverGroup, GroupName) == 0)) { + (_stricmp(DriverGroup, GroupName) == 0)) { ValueSize = 256; rc = RegQueryValue(hDriverKey, "ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); @@ -660,7 +660,7 @@ /* * Special case for Live CD. */ - if (!stricmp(SystemPath, "LiveCD")) + if (!_stricmp(SystemPath, "LiveCD")) { /* Normalize */ MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -267,7 +267,7 @@ KeyList); DbgPrint((DPRINT_REGISTRY, "SearchKey 0x%x\n", SearchKey)); DbgPrint((DPRINT_REGISTRY, "Searching '%s'\n", SearchKey->Name)); - if (strnicmp(SearchKey->Name, name, subkeyLength) == 0) + if (_strnicmp(SearchKey->Name, name, subkeyLength) == 0) break; Ptr = Ptr->Flink; @@ -448,7 +448,7 @@ DbgPrint((DPRINT_REGISTRY, "SearchKey 0x%x\n", SearchKey)); DbgPrint((DPRINT_REGISTRY, "Searching '%s'\n", SearchKey->Name)); - if (strnicmp(SearchKey->Name, name, subkeyLength) == 0) + if (_strnicmp(SearchKey->Name, name, subkeyLength) == 0) break; Ptr = Ptr->Flink; @@ -526,7 +526,7 @@ DbgPrint((DPRINT_REGISTRY, "Value->Name '%s'\n", Value->Name)); - if (stricmp(Value->Name, ValueName) == 0) + if (_stricmp(Value->Name, ValueName) == 0) break; Ptr = Ptr->Flink; @@ -631,7 +631,7 @@ DbgPrint((DPRINT_REGISTRY, "Searching for '%s'. Value name '%s'\n", ValueName, Value->Name)); - if (stricmp(Value->Name, ValueName) == 0) + if (_stricmp(Value->Name, ValueName) == 0) break; Ptr = Ptr->Flink; @@ -692,7 +692,7 @@ Value = CONTAINING_RECORD(Ptr, VALUE, ValueList); - if (stricmp(Value->Name, ValueName) == 0) + if (_stricmp(Value->Name, ValueName) == 0) break; Ptr = Ptr->Flink; _____ Modified: trunk/reactos/boot/freeldr/freeldr/rtl/list.c --- trunk/reactos/boot/freeldr/freeldr/rtl/list.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/rtl/list.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -173,3 +173,4 @@ RtlListRemoveEntry(ListEntry); RtlListInsertEntry(ListNext, ListEntry); } + _____ Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/memcmp.c --- trunk/reactos/boot/freeldr/freeldr/rtl/memcmp.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/rtl/memcmp.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -1,37 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * 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. - */ - -#include <freeldr.h> - -int memcmp(const void *buf1, const void *buf2, size_t count) -{ - unsigned int i; - const char* buffer1 = buf1; - const char* buffer2 = buf2; - - for (i=0; i<count; i++) - { - if(buffer1[i] == buffer2[i]) - continue; - else - return (buffer1[i] - buffer2[i]); - } - - return 0; -} _____ Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/memcpy.c --- trunk/reactos/boot/freeldr/freeldr/rtl/memcpy.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/rtl/memcpy.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -1,50 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * 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. - */ - -#include <freeldr.h> - -#ifdef __i386__ -void *memcpy(void *to, const void *from, size_t count) -{ - __asm__( \ - "or %%ecx,%%ecx\n\t"\ - "jz .L1\n\t" \ - "cld\n\t" \ - "rep\n\t" \ - "movsb\n\t" \ - ".L1:\n\t" - : - : "D" (to), "S" (from), "c" (count)); - return to; -} -#else -void *memcpy(void *to, const void *from, size_t count) -{ - unsigned int i; - char* buf1 = to; - const char* buf2 = from; - - for (i=0; i<count; i++) - { - buf1[i] = buf2[i]; - } - - return to; -} -#endif _____ Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/memmove.c --- trunk/reactos/boot/freeldr/freeldr/rtl/memmove.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/rtl/memmove.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -1,54 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * 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. - */ - -#include <freeldr.h> - -void *memmove(void *dest, const void *src, size_t count) -{ - char *char_dest = (char *)dest; - char *char_src = (char *)src; - - if ((char_dest <= char_src) || (char_dest >= (char_src+count))) - { - /* non-overlapping buffers */ - while(count > 0) - { - *char_dest = *char_src; - char_dest++; - char_src++; - count--; - } - } - else - { - /* overlaping buffers */ - char_dest = (char *)dest + count - 1; - char_src = (char *)src + count - 1; - - while(count > 0) - { - *char_dest = *char_src; - char_dest--; - char_src--; - count--; - } - } - - return dest; -} _____ Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/memset.c --- trunk/reactos/boot/freeldr/freeldr/rtl/memset.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/rtl/memset.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -1,49 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * 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. - */ - -#include <freeldr.h> - -#ifdef __i386__ -void *memset(void *src, int val, size_t count) -{ - __asm__( \ - "or %%ecx,%%ecx\n\t"\ - "jz .L1\n\t" \ - "cld\t\n" \ - "rep\t\n" \ - "stosb\t\n" \ - ".L1:\n\t" - : - : "D" (src), "c" (count), "a" (val)); - return src; -} -#else -void *memset(void *src, int val, size_t count) -{ - unsigned int i; - unsigned char* buf1 = src; - - for (i=0; i<count; i++) - { - buf1[i] = val; - } - - return src; -} -#endif _____ Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/print.c --- trunk/reactos/boot/freeldr/freeldr/rtl/print.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/rtl/print.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -1,182 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * 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. - */ - -#include <freeldr.h> - -/* - * print() - prints unformatted text to stdout - */ -void print(char *str) -{ - size_t i; - - for (i = 0; i < strlen(str); i++) - MachConsPutChar(str[i]); -} - -/* - * printf() - prints formatted text to stdout - * originally from GRUB - */ -int printf(const char *format, ... ) -{ - va_list ap; - va_start(ap,format); - char c, *ptr, str[16]; - int ll; - - while ((c = *(format++))) - { - if (c != '%') - { - MachConsPutChar(c); - } - else - { - if (*format == 'I' && *(format+1) == '6' && *(format+2) == '4') - { - ll = 1; - format += 3; - } - else - { - ll = 0; - } - switch (c = *(format++)) - { - case 'd': case 'u': case 'x': - if (ll) - { - *convert_i64_to_ascii(str, c, va_arg(ap, unsigned long long)) = 0; - } - else - { - *convert_to_ascii(str, c, va_arg(ap, unsigned long)) = 0; - } - - ptr = str; - - while (*ptr) - { - MachConsPutChar(*(ptr++)); - } - break; - - case 'c': MachConsPutChar((va_arg(ap,int))&0xff); break; - - case 's': - ptr = va_arg(ap,char *); - - while ((c = *(ptr++))) - { - MachConsPutChar(c); - } - break; - case '%': - MachConsPutChar(c); - break; - default: - printf("\nprintf() invalid format specifier - %%%c\n", c); - break; - } - } - } - - va_end(ap); - - return 0; -} - -int sprintf(char *buffer, const char *format, ... ) -{ - va_list ap; - char c, *ptr, str[16]; - char *p = buffer; - int ll; - - va_start(ap,format); - - while ((c = *(format++))) - { - if (c != '%') - { - *p = c; - p++; - } - else - { - if (*format == 'I' && *(format+1) == '6' && *(format+2) == '4') - { - ll = 1; - format += 3; - } - else - { - ll = 0; - } - switch (c = *(format++)) - { - case 'd': case 'u': case 'x': - if (ll) - { - *convert_i64_to_ascii(str, c, va_arg(ap, unsigned long long)) = 0; - } - else - { - *convert_to_ascii(str, c, va_arg(ap, unsigned long)) = 0; - } - - ptr = str; - - while (*ptr) - { - *p = *(ptr++); - p++; - } - break; - - case 'c': - *p = va_arg(ap,int)&0xff; - p++; - break; - - case 's': - ptr = va_arg(ap,char *); - - while ((c = *(ptr++))) - { - *p = c; - p++; - } - break; - case '%': - *p = c; - p++; - break; - default: - printf("\nsprintf() invalid format specifier - %%%c\n", c); - break; - } - } - } - va_end(ap); - *p=0; - - return 0; -} _____ Deleted: trunk/reactos/boot/freeldr/freeldr/rtl/stdlib.c --- trunk/reactos/boot/freeldr/freeldr/rtl/stdlib.c 2005-11-13 05:17:17 UTC (rev 19191) +++ trunk/reactos/boot/freeldr/freeldr/rtl/stdlib.c 2005-11-13 06:05:06 UTC (rev 19192) @@ -1,192 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * 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. - */ - -#include <freeldr.h> - -/* - * convert_to_ascii() - converts a number to it's ascii equivalent - * from: - * GRUB -- GRand Unified Bootloader - * Copyright (C) 1996 Erich Boleyn <erich(a)uruk.org> - */ -char *convert_to_ascii(char *buf, int c, int num) -{ - unsigned long mult = 10; - char *ptr = buf; - - if (c == 'x') - mult = 16; - - if ((num & 0x80000000uL) && c == 'd') - { - num = (~num)+1; - *(ptr++) = '-'; - buf++; - } - - do - { - int dig = num % mult; - *(ptr++) = ( (dig > 9) ? dig + 'a' - 10 : '0' + dig ); - } - while (num /= mult); - - /* reorder to correct direction!! */ - { - char *ptr1 = ptr-1; - char *ptr2 = buf; - while (ptr1 > ptr2) - { - int c = *ptr1; - *ptr1 = *ptr2; - *ptr2 = c; - ptr1--; - ptr2++; - } - } - - return ptr; -} - -char *convert_i64_to_ascii(char *buf, int c, unsigned long long num) -{ - int mult = 10; - char *ptr = buf; - - if (c == 'x') - mult = 16; - - if ((num & 0x8000000000000000uLL) && c == 'd') - { - num = (~num)+1; - *(ptr++) = '-'; - buf++; - } - - do - { - int dig = num % mult; - *(ptr++) = ( (dig > 9) ? dig + 'a' - 10 : '0' + dig ); - } - while (num /= mult); - - /* reorder to correct direction!! */ - { - char *ptr1 = ptr-1; - char *ptr2 = buf; - while (ptr1 > ptr2) - { - int c = *ptr1; - *ptr1 = *ptr2; - *ptr2 = c; [truncated at 1000 lines; 527 more skipped]

1 0

[ion] 19191: - Remove some header duplication.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Remove some header duplication. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c --- trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c 2005-11-13 04:50:55 UTC (rev 19190) +++ trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c 2005-11-13 05:17:17 UTC (rev 19191) @@ -122,7 +122,7 @@ return FALSE; } - if (!RtlCompareMemory(BootSector->SystemId, "NTFS", 4)) + if (RtlEqualMemory(BootSector->SystemId, "NTFS", 4)) { return TRUE; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-11-13 04:50:55 UTC (rev 19190) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-11-13 05:17:17 UTC (rev 19191) @@ -102,7 +102,7 @@ if (AttrRecord->NameLength == NameLength) { AttrName = (PWCHAR)((PCHAR)AttrRecord + AttrRecord->NameOffset); - if (!RtlCompareMemory(AttrName, Name, NameLength << 1)) + if (RtlEqualMemory(AttrName, Name, NameLength << 1)) { /* Found it, fill up the context and return. */ Context->Record = AttrRecord; @@ -611,7 +611,7 @@ return FALSE; } - if (RtlCompareMemory(NtfsBootSector->SystemId, "NTFS", 4)) + if (!RtlEqualMemory(NtfsBootSector->SystemId, "NTFS", 4)) { FileSystemError("Invalid NTFS signature."); return FALSE; _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-13 04:50:55 UTC (rev 19190) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-13 05:17:17 UTC (rev 19191) @@ -20,6 +20,10 @@ #ifndef __FREELDR_H #define __FREELDR_H +#define UINT64_C(val) val##ULL + +#include <stdlib.h> +#include <stdio.h> #include <ddk/ntddk.h> #include <ndk/ntndk.h> #include <arch.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h --- trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-11-13 04:50:55 UTC (rev 19190) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-11-13 05:17:17 UTC (rev 19191) @@ -21,7 +21,7 @@ #define __FS_H -#define EOF -1 +//#define EOF -1 #define FS_FAT 1 #define FS_NTFS 2 _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h --- trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-11-13 04:50:55 UTC (rev 19190) +++ trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-11-13 05:17:17 UTC (rev 19191) @@ -22,32 +22,6 @@ #include <freeldr.h> -/////////////////////////////////////////////////////////////////////// //////////////// -// -// Memory Functions -// -/////////////////////////////////////////////////////////////////////// //////////////// -int memcmp(const void *buf1, const void *buf2, size_t count); -void * memcpy(void *to, const void *from, size_t count); -void * memmove(void *dest, const void *src, size_t count); -void * memset(void *src, int val, size_t count); - -#define RtlCompareMemory(Source1, Source2, Length) memcmp(Source1, Source2, Length) - -/////////////////////////////////////////////////////////////////////// //////////////// -// -// Standard Library Functions -// -/////////////////////////////////////////////////////////////////////// //////////////// -int atoi(const char *string); -char * itoa(int value, char *string, int radix); -int toupper(int c); -int tolower(int c); - -int isspace(int c); -int isdigit(int c); -int isxdigit(int c); - char * convert_to_ascii(char *buf, int c, int num); char * convert_i64_to_ascii(char *buf, int c, unsigned long long num); @@ -55,27 +29,8 @@ void delay(unsigned msec); void sound(int freq); -#ifndef max -#define max(a, b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef min -#define min(a, b) (((a) < (b)) ? (a) : (b)) -#endif - -#define UINT64_C(val) val##ULL - //////////////////////////////////////////////////////////////////////// /////////////// // -// Screen Output Functions -// -/////////////////////////////////////////////////////////////////////// //////////////// -void print(char *str); -int printf(const char *fmt, ...); -int sprintf(char *buffer, const char *format, ...); - -/////////////////////////////////////////////////////////////////////// //////////////// -// // List Functions // //////////////////////////////////////////////////////////////////////// ///////////////

1 0

[ion] 19190: - PCHify freeldr and cleanup some headers (just a start).
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- PCHify freeldr and cleanup some headers (just a start). Freeldr now compiles about 2-4 times faster. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Deleted: 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/i386vid.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c Deleted: trunk/reactos/boot/freeldr/freeldr/cache/cm.h Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Deleted: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Deleted: trunk/reactos/boot/freeldr/freeldr/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c Deleted: trunk/reactos/boot/freeldr/freeldr/fs/iso.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Deleted: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h Added: trunk/reactos/boot/freeldr/freeldr/include/arch/ Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/ Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h Modified: trunk/reactos/boot/freeldr/freeldr/include/cache.h Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Added: trunk/reactos/boot/freeldr/freeldr/include/fs/ Added: trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h Added: trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h Added: trunk/reactos/boot/freeldr/freeldr/include/fs/iso.h Added: trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h Added: trunk/reactos/boot/freeldr/freeldr/include/registry.h Added: trunk/reactos/boot/freeldr/freeldr/include/ui/ Added: trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h Added: trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Deleted: trunk/reactos/boot/freeldr/freeldr/inifile/ini.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/machine.c Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c Deleted: trunk/reactos/boot/freeldr/freeldr/mm/mem.h Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Deleted: trunk/reactos/boot/freeldr/freeldr/reactos/registry.h Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/list.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/print.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/stdlib.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/string.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.c Deleted: trunk/reactos/boot/freeldr/freeldr/ui/gui.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Deleted: trunk/reactos/boot/freeldr/freeldr/ui/tui.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/version.c [truncated at 100 lines; 5 more skipped] _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,14 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "mm.h" -#include "machine.h" -#include "machpc.h" -#include "machxbox.h" -#include "portio.h" -#include "hardware.h" -#include "rtl.h" +#include <freeldr.h> VOID MachInit(const char *CmdLine) _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -19,20 +19,10 @@ */ #include <freeldr.h> -#include <arch.h> -#include <rtl.h> + +#define NDEBUG #include <debug.h> -#include <disk.h> -#include <mm.h> -#include <machine.h> -#include <portio.h> -#include <video.h> -#include "../../reactos/registry.h" -#include "hardware.h" -#include "machpc.h" - - #define MILLISEC (10) #define PRECISION (8) _____ Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.h 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.h 2005-11-13 04:50:55 UTC (rev 19190) @@ -1,99 +0,0 @@ -/* - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * - * 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. - */ - -#ifndef __I386_HARDWARE_H_ -#define __I386_HARDWARE_H_ - -#ifndef __REGISTRY_H -#include "../../reactos/registry.h" -#endif - -/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags */ -#define CM_RESOURCE_PORT_MEMORY 0x0000 -#define CM_RESOURCE_PORT_IO 0x0001 - -#define CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE 0x0000 -#define CM_RESOURCE_INTERRUPT_LATCHED 0x0001 - -typedef struct _CM_COMPONENT_INFORMATION -{ - ULONG Flags; - ULONG Version; - ULONG Key; - ULONG Affinity; -} __attribute__((packed)) CM_COMPONENT_INFORMATION, *PCM_COMPONENT_INFORMATION; - - -/* CM_COMPONENT_INFORMATION.Flags */ -#define Failed 0x00000001 -#define ReadOnly 0x00000002 -#define Removable 0x00000004 -#define ConsoleIn 0x00000008 -#define ConsoleOut 0x00000010 -#define Input 0x00000020 -#define Output 0x00000040 - -#define CONFIG_CMD(bus, dev_fn, where) \ - (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) - -/* PROTOTYPES ***************************************************************/ - -/* hardware.c */ - -VOID StallExecutionProcessor(ULONG Microseconds); - -VOID HalpCalibrateStallExecution(VOID); - -VOID SetComponentInformation(FRLDRHKEY ComponentKey, - ULONG Flags, - ULONG Key, - ULONG Affinity); - -/* hwacpi.c */ -VOID DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber); - -/* hwapm.c */ -VOID DetectApmBios(FRLDRHKEY SystemKey, ULONG *BusNumber); - -/* hwcpu.c */ -VOID DetectCPUs(FRLDRHKEY SystemKey); - -/* hwpci.c */ -VOID DetectPciBios(FRLDRHKEY SystemKey, ULONG *BusNumber); - -/* i386cpu.S */ -ULONG CpuidSupported(VOID); -VOID GetCpuid(ULONG Level, - ULONG *eax, - ULONG *ebx, - ULONG *ecx, - ULONG *edx); -ULONGLONG RDTSC(VOID); - -/* i386pnp.S */ -ULONG PnpBiosSupported(VOID); -ULONG PnpBiosGetDeviceNodeCount(ULONG *NodeSize, - ULONG *NodeCount); -ULONG PnpBiosGetDeviceNode(UCHAR *NodeId, - UCHAR *NodeBuffer); - -#endif /* __I386_HARDWARE_H_ */ - -/* EOF */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -19,15 +19,10 @@ */ #include <freeldr.h> -#include <arch.h> -#include <rtl.h> + +#define NDEBUG #include <debug.h> -#include <mm.h> -#include <portio.h> -#include "../../reactos/registry.h" -#include "hardware.h" - BOOLEAN AcpiPresent = FALSE; static BOOL _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -19,16 +19,10 @@ */ #include <freeldr.h> -#include <arch.h> -#include <rtl.h> + +#define NDEBUG #include <debug.h> -#include <mm.h> -#include <portio.h> -#include "../../reactos/registry.h" -#include "hardware.h" - - static BOOL FindApmBios(VOID) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -19,16 +19,10 @@ */ #include <freeldr.h> -#include <arch.h> -#include <rtl.h> + +#define NDEBUG #include <debug.h> -#include <mm.h> -#include <portio.h> -#include "../../reactos/registry.h" -#include "hardware.h" - - #define MP_FP_SIGNATURE 0x5F504D5F /* "_MP_" */ #define MP_CT_SIGNATURE 0x504D4350 /* "PCMP" */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -19,15 +19,10 @@ */ #include <freeldr.h> -#include <arch.h> -#include <rtl.h> + +#define NDEBUG #include <debug.h> -#include <mm.h> -#include <portio.h> -#include "../../reactos/registry.h" -#include "hardware.h" - typedef struct _ROUTING_SLOT { UCHAR BusNumber; _____ Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h 2005-11-13 04:50:55 UTC (rev 19190) @@ -1,41 +0,0 @@ -/* - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * - * 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. - */ - -#ifndef __I386_I386_H_ -#define __I386_I386_H_ - - -extern ULONG i386BootDrive; -extern ULONG i386BootPartition; - -extern BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); -extern BOOL i386DiskGetSystemVolume(char *SystemPath, char *RemainingPath, - PULONG Device, PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); -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_ */ - -/* EOF */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,11 +17,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "debug.h" -#include "i386.h" -#include "fsrec.h" +#include <freeldr.h> +#define NDEBUG +#include <debug.h> + //////////////////////////////////////////////////////////////////////// ///////////////////// // FUNCTIONS //////////////////////////////////////////////////////////////////////// ///////////////////// _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -20,12 +20,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include <freeldr.h> -#include <arch.h> -#include <video.h> -#include <portio.h> -#include <rtl.h> + +#define NDEBUG #include <debug.h> typedef struct _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,13 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "mm.h" -#include "arch.h" -#include "machine.h" -#include "machpc.h" -#include "rtl.h" -#include "i386.h" +#include <freeldr.h> VOID PcMachInit(const char *CmdLine) _____ Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-11-13 04:50:55 UTC (rev 19190) @@ -1,62 +0,0 @@ -/* $Id$ - * - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * - * 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. - */ - -#ifndef __I386_MACHPC_H_ -#define __I386_MACHPC_H_ - -#ifndef __MEMORY_H -#include "mm.h" -#endif - -VOID PcMachInit(const char *CmdLine); - -VOID PcConsPutChar(int Ch); -BOOL PcConsKbHit(); -int PcConsGetCh(); - -VOID PcVideoClearScreen(UCHAR Attr); -VIDEODISPLAYMODE PcVideoSetDisplayMode(char *DisplayMode, BOOL Init); -VOID PcVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth); -ULONG PcVideoGetBufferSize(VOID); -VOID PcVideoSetTextCursorPosition(ULONG X, ULONG Y); -VOID PcVideoHideShowTextCursor(BOOL Show); -VOID PcVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y); -VOID PcVideoCopyOffScreenBufferToVRAM(PVOID Buffer); -BOOL PcVideoIsPaletteFixed(VOID); -VOID PcVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); -VOID PcVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); -VOID PcVideoSync(VOID); -VOID PcVideoPrepareForReactOS(VOID); - -ULONG PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); - -BOOL PcDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); -BOOL PcDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); -BOOL PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); -ULONG PcDiskGetCacheableBlockCount(ULONG DriveNumber); - -VOID PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); - -VOID PcHwDetect(VOID); - -#endif /* __I386_MACHPC_H_ */ - -/* EOF */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,11 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "mm.h" -#include "machine.h" -#include "machxbox.h" -#include "i386.h" +#include <freeldr.h> VOID XboxMachInit(const char *CmdLine) _____ Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-11-13 04:50:55 UTC (rev 19190) @@ -1,65 +0,0 @@ -/* $Id$ - * - * FreeLoader - * - * 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. - */ - -#ifndef __I386_MACHXBOX_H_ -#define __I386_MACHXBOX_H_ - -#ifndef __MEMORY_H -#include "mm.h" -#endif - -UCHAR XboxFont8x16[256 * 16]; - -VOID XboxMachInit(const char *CmdLine); - -VOID XboxConsPutChar(int Ch); -BOOL XboxConsKbHit(); -int XboxConsGetCh(); - -VOID XboxVideoInit(VOID); -VOID XboxVideoClearScreen(UCHAR Attr); -VIDEODISPLAYMODE XboxVideoSetDisplayMode(char *DisplayModem, BOOL Init); -VOID XboxVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth); -ULONG XboxVideoGetBufferSize(VOID); -VOID XboxVideoSetTextCursorPosition(ULONG X, ULONG Y); -VOID XboxVideoHideShowTextCursor(BOOL Show); -VOID XboxVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y); -VOID XboxVideoCopyOffScreenBufferToVRAM(PVOID Buffer); -BOOL XboxVideoIsPaletteFixed(VOID); -VOID XboxVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); -VOID XboxVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); -VOID XboxVideoSync(VOID); -VOID XboxVideoPrepareForReactOS(VOID); - -VOID XboxMemInit(VOID); -PVOID XboxMemReserveMemory(ULONG MbToReserve); -ULONG XboxMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); - -BOOL XboxDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); -BOOL XboxDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); -BOOL XboxDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); -ULONG XboxDiskGetCacheableBlockCount(ULONG DriveNumber); - -VOID XboxRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); - -VOID XboxHwDetect(VOID); - -#endif /* __I386_HWXBOX_H_ */ - -/* EOF */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,12 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "machine.h" -#include "arch.h" -#include "debug.h" -#include "machpc.h" -#include "rtl.h" +#include <freeldr.h> #define TEXTMODE_BUFFER 0xb8000 #define TEXTMODE_BUFFER_SIZE 0x8000 _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,15 +17,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "disk.h" -#include "rtl.h" -#include "arch.h" -#include "debug.h" -#include "portio.h" -#include "machine.h" -#include "machpc.h" +#include <freeldr.h> +#define NDEBUG +#include <debug.h> typedef struct { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -20,14 +20,11 @@ * was Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> */ -#include "freeldr.h" -#include "arch.h" -#include "debug.h" -#include "machine.h" -#include "machpc.h" -#include "portio.h" -#include "rtl.h" +#include <freeldr.h> +#define NDEBUG +#include <debug.h> + static ULONG PcMemGetExtendedMemorySize(VOID) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,10 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "arch.h" -#include "machine.h" -#include "machpc.h" +#include <freeldr.h> #define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f)) _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,14 +17,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "machine.h" -#include "arch.h" -#include "debug.h" -#include "machpc.h" -#include "rtl.h" -#include "portio.h" +#include <freeldr.h> +#define NDEBUG +#include <debug.h> + #define VIDEOPORT_PALETTE_READ 0x03C7 #define VIDEOPORT_PALETTE_WRITE 0x03C8 #define VIDEOPORT_PALETTE_DATA 0x03C9 _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,9 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "machine.h" -#include "machxbox.h" +#include <freeldr.h> static unsigned CurrentCursorX = 0; static unsigned CurrentCursorY = 0; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -22,14 +22,11 @@ * */ -#include "freeldr.h" -#include "debug.h" -#include "hardware.h" -#include "machine.h" -#include "machxbox.h" -#include "portio.h" -#include "rtl.h" +#include <freeldr.h> +#define NDEBUG +#include <debug.h> + #define XBOX_IDE_COMMAND_PORT 0x1f0 #define XBOX_IDE_CONTROL_PORT 0x170 _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -19,9 +19,7 @@ * Note: Converted from the XFree vga.bdf font */ -#include "freeldr.h" -#include "machine.h" -#include "machxbox.h" +#include <freeldr.h> UCHAR XboxFont8x16[256 * 16] = { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,9 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "machine.h" -#include "machxbox.h" +#include <freeldr.h> VOID XboxHwDetect(VOID) _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -20,14 +20,7 @@ * by the Xbox Linux group: http://www.xbox-linux.org */ -#include "freeldr.h" -#include "debug.h" -#include "mm.h" -#include "rtl.h" -#include "hardware.h" -#include "machine.h" -#include "machxbox.h" -#include "portio.h" +#include <freeldr.h> static ULONG InstalledMemoryMb = 0; static ULONG AvailableMemoryMb = 0; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,10 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "freeldr.h" -#include "machine.h" -#include "machxbox.h" -#include "portio.h" +#include <freeldr.h> #define RTC_REGISTER_A 0x0A #define RTC_REG_A_UIP 0x80 /* Update In Progress bit */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -20,12 +20,7 @@ * by the Xbox Linux group: http://www.xbox-linux.org */ -#include "freeldr.h" -#include "debug.h" -#include "rtl.h" -#include "machine.h" -#include "machxbox.h" -#include "portio.h" +#include <freeldr.h> #define I2C_IO_BASE 0xc000 _____ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -18,24 +18,6 @@ */ #include <freeldr.h> -#include <rtl.h> -#include <fs.h> -#include <reactos.h> -#include <ui.h> -#include <arch.h> -#include <miscboot.h> -#include <linux.h> -#include <mm.h> -#include <inifile.h> -#include <debug.h> -#include <options.h> -#include <oslist.h> -#include <video.h> -#include <bootmgr.h> -#include <drivemap.h> -#include <keycodes.h> -#include <cmdline.h> -#include <machine.h> VOID RunLoader(VOID) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c --- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,15 +17,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include <freeldr.h> -#include "cm.h" -#include <mm.h> -#include <disk.h> -#include <rtl.h> + +#define NDEBUG #include <debug.h> -#include <arch.h> -#include <machine.h> // Returns a pointer to a CACHE_BLOCK structure // Adds the block to the cache manager block list _____ Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c --- trunk/reactos/boot/freeldr/freeldr/cache/cache.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/cache/cache.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -17,14 +17,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include <freeldr.h> -#include "cm.h" -#include <mm.h> -#include <disk.h> -#include <machine.h> -#include <cache.h> -#include <rtl.h> + +#define NDEBUG #include <debug.h> //////////////////////////////////////////////////////////////////////// /////////////// _____ Deleted: trunk/reactos/boot/freeldr/freeldr/cache/cm.h --- trunk/reactos/boot/freeldr/freeldr/cache/cm.h 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/cache/cm.h 2005-11-13 04:50:55 UTC (rev 19190) @@ -1,92 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * 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. - */ - - -#include <freeldr.h> -#include <rtl.h> -#include <disk.h> - -#ifndef __CM_H -#define __CM_H - -/////////////////////////////////////////////////////////////////////// //////////////// -// -// This structure describes a cached block element. The disk is divided up into -// cache blocks. For disks which LBA is not supported each block is the size of -// one track. This will force the cache manager to make track sized reads, and -// therefore maximizes throughput. For disks which support LBA the block size -// is 64k because they have no cylinder, head, or sector boundaries. -// -/////////////////////////////////////////////////////////////////////// //////////////// -typedef struct -{ - LIST_ITEM ListEntry; // Doubly linked list synchronization member - - ULONG BlockNumber; // Track index for CHS, 64k block index for LBA - BOOL LockedInCache; // Indicates that this block is locked in cache memory - ULONG AccessCount; // Access count for this block - - PVOID BlockData; // Pointer to block data - -} CACHE_BLOCK, *PCACHE_BLOCK; - -/////////////////////////////////////////////////////////////////////// //////////////// -// -// This structure describes a cached drive. It contains the BIOS drive number -// and indicates whether or not LBA is supported. If LBA is not supported then -// the drive's geometry is described here. -// -/////////////////////////////////////////////////////////////////////// //////////////// -typedef struct -{ - ULONG DriveNumber; - ULONG BytesPerSector; - - ULONG BlockSize; // Block size (in sectors) - PCACHE_BLOCK CacheBlockHead; - -} CACHE_DRIVE, *PCACHE_DRIVE; - - -/////////////////////////////////////////////////////////////////////// //////////////// -// -// Internal data -// -/////////////////////////////////////////////////////////////////////// //////////////// -extern CACHE_DRIVE CacheManagerDrive; -extern BOOL CacheManagerInitialized; -extern ULONG CacheBlockCount; -extern ULONG CacheSizeLimit; -extern ULONG CacheSizeCurrent; - -/////////////////////////////////////////////////////////////////////// //////////////// -// -// Internal functions -// -/////////////////////////////////////////////////////////////////////// //////////////// -PCACHE_BLOCK CacheInternalGetBlockPointer(PCACHE_DRIVE CacheDrive, ULONG BlockNumber); // Returns a pointer to a CACHE_BLOCK structure given a block number -PCACHE_BLOCK CacheInternalFindBlock(PCACHE_DRIVE CacheDrive, ULONG BlockNumber); // Searches the block list for a particular block -PCACHE_BLOCK CacheInternalAddBlockToCache(PCACHE_DRIVE CacheDrive, ULONG BlockNumber); // Adds a block to the cache's block list -BOOL CacheInternalFreeBlock(PCACHE_DRIVE CacheDrive); // Removes a block from the cache's block list & frees the memory -VOID CacheInternalCheckCacheSizeLimits(PCACHE_DRIVE CacheDrive); // Checks the cache size limits to see if we can add a new block, if not calls CacheInternalFreeBlock() -VOID CacheInternalDumpBlockList(PCACHE_DRIVE CacheDrive); // Dumps the list of cached blocks to the debug output port -VOID CacheInternalOptimizeBlockList(PCACHE_DRIVE CacheDrive, PCACHE_BLOCK CacheBlock); // Moves the specified block to the head of the list - - -#endif // defined __CM_H _____ Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c --- trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -19,8 +19,6 @@ */ #include <freeldr.h> -#include <cmdline.h> -#include <rtl.h> static CMDLINEINFO CmdLineInfo; _____ Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -20,10 +20,7 @@ */ #include <freeldr.h> -#include <comm.h> -#include <portio.h> - /* MACROS *******************************************************************/ #define DEFAULT_BAUD_RATE 19200 _____ Modified: trunk/reactos/boot/freeldr/freeldr/custom.c --- trunk/reactos/boot/freeldr/freeldr/custom.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/custom.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -18,18 +18,6 @@ */ #include <freeldr.h> -#include <rtl.h> -#include <ui.h> -#include <options.h> -#include <miscboot.h> -#include <debug.h> -#include <disk.h> -#include <arch.h> -#include <inifile.h> -#include <linux.h> -#include <reactos.h> -#include <drivemap.h> -#include <machine.h> const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; _____ Modified: trunk/reactos/boot/freeldr/freeldr/debug.c --- trunk/reactos/boot/freeldr/freeldr/debug.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/debug.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -18,11 +18,6 @@ */ #include <freeldr.h> -#include <debug.h> -#include <rtl.h> -#include <comm.h> -#include <portio.h> -#include <machine.h> #ifdef DEBUG _____ Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -18,13 +18,10 @@ */ #include <freeldr.h> -#include <disk.h> -#include <arch.h> -#include <rtl.h> -#include <ui.h> + +#define NDEBUG #include <debug.h> - #undef UNIMPLEMENTED #define UNIMPLEMENTED BugCheck((DPRINT_WARNING, "Unimplemented\n")); _____ Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-11-13 04:34:41 UTC (rev 19189) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-11-13 04:50:55 UTC (rev 19190) @@ -18,14 +18,10 @@ */ #include <freeldr.h> -#include <disk.h> -#include <rtl.h> -#include <mm.h> + +#define NDEBUG #include <debug.h> -#include <arch.h> -#include <machine.h> - BOOL DiskGetActivePartitionEntry(ULONG DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry, [truncated at 1000 lines; 3005 more skipped]

1 0

[sedwards] 19189: Pablo Borobia - Spanish Translation
by sedwards＠svn.reactos.com 13 Nov '05

13 Nov '05

Pablo Borobia - Spanish Translation Added: trunk/reactos/lib/newdev/Es.rc Modified: trunk/reactos/lib/newdev/newdev.rc _____ Added: trunk/reactos/lib/newdev/Es.rc --- trunk/reactos/lib/newdev/Es.rc 2005-11-13 04:29:53 UTC (rev 19188) +++ trunk/reactos/lib/newdev/Es.rc 2005-11-13 04:34:41 UTC (rev 19189) @@ -0,0 +1,74 @@ +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Instalaci¾n de Dispositivos" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bienvenido",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "Este asistentelo ayudarß a instalar un nuevo controlador de dispositivos para:", + IDC_STATIC,120,40,195,16 + LTEXT "Haga click en Siguiente para continuar.",IDC_STATIC,120,169,195,17 + LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,134,55,164,11 + CONTROL "Instalar controlador automßticamente",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "Instalar controlador desde una ubicaci¾n especÝfica",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Instalaci¾n de Dispositivos" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "La instalaci¾n ha fallado",IDC_FINISHTITLE,120,8,195,24 + LTEXT "El dispositivo no pudo ser instalado porque el controlador no fue encontrado.", + IDC_STATIC,120,40,195,19 + LTEXT "Haga click en Atrßs si tiene un CDROM del controlador o conoce d¾nde encontrar el controlador.", + IDC_STATIC,120,98,181,24 + CONTROL "No volver a mostrar esta ventana",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de Dispositivos" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Buscar en controlador en estas ubicaciones",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "Seleccionar el controlador manualmente",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "Buscar en medios extraÝbles",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "Incluir esta ubicaci¾n de b·squeda",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "Examinar",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,51,20,169,16 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Instalaci¾n completa.",IDC_FINISHTITLE,120,8,195,11 + LTEXT "El asistente ha finalizado la instalaci¾n del controlador para el dispositivo:", + IDC_STATIC,120,32,195,19 + LTEXT "Haga click en Finalizar parar cerrar el asistente.",IDC_STATIC,120,174, + 179,11 + LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,148,53,147,12 +END + Property changes on: trunk/reactos/lib/newdev/Es.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/newdev/newdev.rc --- trunk/reactos/lib/newdev/newdev.rc 2005-11-13 04:29:53 UTC (rev 19188) +++ trunk/reactos/lib/newdev/newdev.rc 2005-11-13 04:34:41 UTC (rev 19189) @@ -7,4 +7,5 @@ IDB_HEADER BITMAP "resources/header.bmp" #include "En.rc" +#include "Es.rc" #include "De.rc"

1 0

[sedwards] 19188: propset svn:eol-style 'native'
by sedwards＠svn.reactos.com 13 Nov '05

13 Nov '05

propset svn:eol-style 'native' Modified: trunk/rosapps/tests/accelerator/accelerator.xml Modified: trunk/rosapps/tests/alive/alive.xml Modified: trunk/rosapps/tests/alphablend/alphablend.xml Modified: trunk/rosapps/tests/apc/apc.xml Modified: trunk/rosapps/tests/apc2/apc2.xml Modified: trunk/rosapps/tests/args/args.xml Modified: trunk/rosapps/tests/atomtest/atomtest.xml Modified: trunk/rosapps/tests/bench/bench.xml Modified: trunk/rosapps/tests/bitblt/bitblt.xml Modified: trunk/rosapps/tests/button/button.xml Modified: trunk/rosapps/tests/button2/button2.xml Modified: trunk/rosapps/tests/capclock/capclock.xml Modified: trunk/rosapps/tests/carets/carets.xml Modified: trunk/rosapps/tests/combotst/combotst.xml Modified: trunk/rosapps/tests/consume/consume.xml Modified: trunk/rosapps/tests/copymove/copymove.xml Modified: trunk/rosapps/tests/count/count.xml Modified: trunk/rosapps/tests/create-links/create-links.xml Modified: trunk/rosapps/tests/dibtest/dibtest.xml Modified: trunk/rosapps/tests/dirdlg/dirdlg.xml Modified: trunk/rosapps/tests/diskspeed/diskspeed.xml Modified: trunk/rosapps/tests/dnsapi/dnsapi.xml Modified: trunk/rosapps/tests/dnsquery/dnsquery.xml Modified: trunk/rosapps/tests/edit/edit.xml Modified: trunk/rosapps/tests/enhmetafile/enhmetafile.xml Modified: trunk/rosapps/tests/enumfonts/enumfonts.xml Modified: trunk/rosapps/tests/enumwnd/enumwnd.dsp Modified: trunk/rosapps/tests/enumwnd/enumwnd.xml Modified: trunk/rosapps/tests/enumws/enumws.xml Modified: trunk/rosapps/tests/event/event.xml Modified: trunk/rosapps/tests/fiber/fiber.xml Modified: trunk/rosapps/tests/gethostbyname/gethostbyname.xml Modified: trunk/rosapps/tests/global_mem/global_mem.xml Modified: trunk/rosapps/tests/gradient/gradient.xml Modified: trunk/rosapps/tests/guithreadinfo/guithreadinfo.xml Modified: trunk/rosapps/tests/hello/hello.xml Modified: trunk/rosapps/tests/hivetest/hivetest.xml Modified: trunk/rosapps/tests/icontest/icontest.xml Modified: trunk/rosapps/tests/iptest/iptest.xml Modified: trunk/rosapps/tests/isotest/isotest.xml Modified: trunk/rosapps/tests/lantst/lantest.xml Modified: trunk/rosapps/tests/lineclip/lineclip.xml Modified: trunk/rosapps/tests/linetest/linetest.xml Modified: trunk/rosapps/tests/lpctst/lpctst.xml Modified: trunk/rosapps/tests/map_dup_inherit/map_dup_inherit.xml Modified: trunk/rosapps/tests/mdi/mdi.xml Modified: trunk/rosapps/tests/miditest/miditest.xml Modified: trunk/rosapps/tests/mktime/mktime.xml Modified: trunk/rosapps/tests/moztest/moztest.xml Modified: trunk/rosapps/tests/mstest/mstest.xml Modified: trunk/rosapps/tests/multithrdwin/multithrdwin.xml Modified: trunk/rosapps/tests/multiwin/multiwin.xml Modified: trunk/rosapps/tests/mutex/mutex.xml Modified: trunk/rosapps/tests/nameserverlist/nameserverlist.xml Modified: trunk/rosapps/tests/noexecute/noexecute.xml Modified: trunk/rosapps/tests/nptest/nptest.xml Modified: trunk/rosapps/tests/oskittcp/oskittcp.xml Modified: trunk/rosapps/tests/oskittcp/tcptest.dsp Modified: trunk/rosapps/tests/oskittcp/tcptest.dsw Modified: trunk/rosapps/tests/p_dup_handle/p_dup_handle.xml Modified: trunk/rosapps/tests/palbitblt/palbitblt.xml Modified: trunk/rosapps/tests/patblt/patblt.xml Modified: trunk/rosapps/tests/polytest/polytest.dsp Modified: trunk/rosapps/tests/polytest/polytest.dsw Modified: trunk/rosapps/tests/polytest/polytest.xml Modified: trunk/rosapps/tests/popupmenu/popupmenu.xml Modified: trunk/rosapps/tests/primitives/primitives.xml Modified: trunk/rosapps/tests/pteb/pteb.xml Modified: trunk/rosapps/tests/regdump/regdump.xml Modified: trunk/rosapps/tests/regqueryvalue/regqueryvalue.xml Modified: trunk/rosapps/tests/regtest/regtest.xml Modified: trunk/rosapps/tests/sectest/sectest.xml Modified: trunk/rosapps/tests/sertest/sertest.xml Modified: trunk/rosapps/tests/shaptest/shaptest.xml Modified: trunk/rosapps/tests/shm/shm.xml Modified: trunk/rosapps/tests/statst/statst.xml Modified: trunk/rosapps/tests/statst2/statst2.xml Modified: trunk/rosapps/tests/stretchblt/stretchblt.xml Modified: trunk/rosapps/tests/subclass/subclass.xml Modified: trunk/rosapps/tests/suspend/suspend.xml Modified: trunk/rosapps/tests/tcpsvr/tcpsvr.xml Modified: trunk/rosapps/tests/terminate/terminate.xml Modified: trunk/rosapps/tests/thread/thread.xml Modified: trunk/rosapps/tests/thread_msg/thread_msg.xml Modified: trunk/rosapps/tests/threadwait/threadwait.xml Modified: trunk/rosapps/tests/tmrqueue/tmrqueue.xml Modified: trunk/rosapps/tests/tokentest/tokentest.xml Modified: trunk/rosapps/tests/txtscale/txtscale.xml Modified: trunk/rosapps/tests/vmtest/vmtest.xml Modified: trunk/rosapps/tests/wclickat/wclickat.c Modified: trunk/rosapps/tests/wclickat/wclickat.xml Modified: trunk/rosapps/tests/winhello/winhello.xml Modified: trunk/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml Modified: trunk/rosapps/tests/wm_paint/wm_paint.xml Modified: trunk/rosapps/tests/wpickclick/wpickclick.c Modified: trunk/rosapps/tests/wpickclick/wpickclick.xml Modified: trunk/rosapps/tests/zwcontinue/zwcontinue.xml _____ Modified: trunk/rosapps/tests/accelerator/accelerator.xml --- trunk/rosapps/tests/accelerator/accelerator.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/accelerator/accelerator.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="accelerator" type="win32gui" installbase="bin" installname="accelerator.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>accelerator.c</file> -</module> +<module name="accelerator" type="win32gui" installbase="bin" installname="accelerator.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>accelerator.c</file> +</module> Property changes on: trunk/rosapps/tests/accelerator/accelerator.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/alive/alive.xml --- trunk/rosapps/tests/alive/alive.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/alive/alive.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="alive" type="win32gui" installbase="bin" installname="alive.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>alive.c</file> -</module> +<module name="alive" type="win32gui" installbase="bin" installname="alive.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>alive.c</file> +</module> Property changes on: trunk/rosapps/tests/alive/alive.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/alphablend/alphablend.xml --- trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>alphablend.c</file> -</module> +<module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>alphablend.c</file> +</module> Property changes on: trunk/rosapps/tests/alphablend/alphablend.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/apc/apc.xml --- trunk/rosapps/tests/apc/apc.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/apc/apc.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="apc" type="win32gui" installbase="bin" installname="apc.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>ntdll</library> - <file>apc.c</file> -</module> +<module name="apc" type="win32gui" installbase="bin" installname="apc.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>ntdll</library> + <file>apc.c</file> +</module> Property changes on: trunk/rosapps/tests/apc/apc.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/apc2/apc2.xml --- trunk/rosapps/tests/apc2/apc2.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/apc2/apc2.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,7 +1,7 @@ -<module name="apc2" type="win32gui" installbase="bin" installname="apc2.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <file>apc2.c</file> -</module> +<module name="apc2" type="win32gui" installbase="bin" installname="apc2.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>apc2.c</file> +</module> Property changes on: trunk/rosapps/tests/apc2/apc2.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/args/args.xml --- trunk/rosapps/tests/args/args.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/args/args.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,7 +1,7 @@ -<module name="args" type="win32gui" installbase="bin" installname="args.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <file>args.c</file> -</module> +<module name="args" type="win32gui" installbase="bin" installname="args.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>args.c</file> +</module> Property changes on: trunk/rosapps/tests/args/args.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/atomtest/atomtest.xml --- trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/atomtest/atomtest.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="atomtest" type="win32gui" installbase="bin" installname="atomtest.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>ntdll</library> - <file>atomtest.c</file> -</module> +<module name="atomtest" type="win32gui" installbase="bin" installname="atomtest.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>ntdll</library> + <file>atomtest.c</file> +</module> Property changes on: trunk/rosapps/tests/atomtest/atomtest.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/bench/bench.xml --- trunk/rosapps/tests/bench/bench.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/bench/bench.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="bench-thread" type="win32gui" installbase="bin" installname="bench-thread.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>bench-thread.c</file> -</module> +<module name="bench-thread" type="win32gui" installbase="bin" installname="bench-thread.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>bench-thread.c</file> +</module> Property changes on: trunk/rosapps/tests/bench/bench.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/bitblt/bitblt.xml --- trunk/rosapps/tests/bitblt/bitblt.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/bitblt/bitblt.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="bitblt" type="win32gui" installbase="bin" installname="bitblt.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>bitblt.c</file> -</module> +<module name="bitblt" type="win32gui" installbase="bin" installname="bitblt.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>bitblt.c</file> +</module> Property changes on: trunk/rosapps/tests/bitblt/bitblt.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/button/button.xml --- trunk/rosapps/tests/button/button.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/button/button.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="button" type="win32gui" installbase="bin" installname="button.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>buttontst.c</file> -</module> +<module name="button" type="win32gui" installbase="bin" installname="button.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>buttontst.c</file> +</module> Property changes on: trunk/rosapps/tests/button/button.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/button2/button2.xml --- trunk/rosapps/tests/button2/button2.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/button2/button2.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="buttontst2" type="win32gui" installbase="bin" installname="buttontst2.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>buttontst2.c</file> -</module> +<module name="buttontst2" type="win32gui" installbase="bin" installname="buttontst2.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>buttontst2.c</file> +</module> Property changes on: trunk/rosapps/tests/button2/button2.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/capclock/capclock.xml --- trunk/rosapps/tests/capclock/capclock.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/capclock/capclock.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="capclock" type="win32gui" installbase="bin" installname="capclock.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>capclock.c</file> -</module> +<module name="capclock" type="win32gui" installbase="bin" installname="capclock.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>capclock.c</file> +</module> Property changes on: trunk/rosapps/tests/capclock/capclock.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/carets/carets.xml --- trunk/rosapps/tests/carets/carets.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/carets/carets.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,10 +1,10 @@ -<module name="carets" type="win32gui" installbase="bin" installname="carets.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <library>ntdll</library> - <file>carets.c</file> - <efile>carets.rc</efile> -</module> +<module name="carets" type="win32gui" installbase="bin" installname="carets.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <library>ntdll</library> + <file>carets.c</file> + <efile>carets.rc</efile> +</module> Property changes on: trunk/rosapps/tests/carets/carets.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/combotst/combotst.xml --- trunk/rosapps/tests/combotst/combotst.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/combotst/combotst.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,9 +1,9 @@ -<module name="combotst" type="win32gui" installbase="bin" installname="combotst.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>combotst.c</file> - <file>utils.c</file> -</module> +<module name="combotst" type="win32gui" installbase="bin" installname="combotst.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>combotst.c</file> + <file>utils.c</file> +</module> Property changes on: trunk/rosapps/tests/combotst/combotst.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/consume/consume.xml --- trunk/rosapps/tests/consume/consume.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/consume/consume.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,9 +1,9 @@ -<module name="consume" type="win32gui" installbase="bin" installname="consume.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>consume.c</file> -</module> - +<module name="consume" type="win32gui" installbase="bin" installname="consume.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>consume.c</file> +</module> + Property changes on: trunk/rosapps/tests/consume/consume.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/copymove/copymove.xml --- trunk/rosapps/tests/copymove/copymove.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/copymove/copymove.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="copymove" type="win32gui" installbase="bin" installname="copymove.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>copymove.c</file> -</module> +<module name="copymove" type="win32gui" installbase="bin" installname="copymove.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>copymove.c</file> +</module> Property changes on: trunk/rosapps/tests/copymove/copymove.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/count/count.xml --- trunk/rosapps/tests/count/count.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/count/count.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="count" type="win32gui" installbase="bin" installname="count.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>count.c</file> -</module> +<module name="count" type="win32gui" installbase="bin" installname="count.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>count.c</file> +</module> Property changes on: trunk/rosapps/tests/count/count.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/create-links/create-links.xml --- trunk/rosapps/tests/create-links/create-links.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/create-links/create-links.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,12 +1,12 @@ -<module name="create-links" type="win32gui" installbase="bin" installname="create-links.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <library>ole32</library> - <library>uuid</library> - <library>shell32</library> - <library>shlwapi</library> - <file>create-links.c</file> -</module> +<module name="create-links" type="win32gui" installbase="bin" installname="create-links.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <library>ole32</library> + <library>uuid</library> + <library>shell32</library> + <library>shlwapi</library> + <file>create-links.c</file> +</module> Property changes on: trunk/rosapps/tests/create-links/create-links.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/dibtest/dibtest.xml --- trunk/rosapps/tests/dibtest/dibtest.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/dibtest/dibtest.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="dibtest" type="win32gui" installbase="bin" installname="dibtest.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>dibtest.c</file> -</module> +<module name="dibtest" type="win32gui" installbase="bin" installname="dibtest.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>dibtest.c</file> +</module> Property changes on: trunk/rosapps/tests/dibtest/dibtest.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/dirdlg/dirdlg.xml --- trunk/rosapps/tests/dirdlg/dirdlg.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/dirdlg/dirdlg.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="dirdlg" type="win32gui" installbase="bin" installname="dirdlg.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>dirdlg.c</file> -</module> +<module name="dirdlg" type="win32gui" installbase="bin" installname="dirdlg.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>dirdlg.c</file> +</module> Property changes on: trunk/rosapps/tests/dirdlg/dirdlg.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/diskspeed/diskspeed.xml --- trunk/rosapps/tests/diskspeed/diskspeed.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/diskspeed/diskspeed.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="diskspeed" type="win32gui" installbase="bin" installname="diskspeed.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>diskspeed.c</file> -</module> +<module name="diskspeed" type="win32gui" installbase="bin" installname="diskspeed.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>diskspeed.c</file> +</module> Property changes on: trunk/rosapps/tests/diskspeed/diskspeed.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/dnsapi/dnsapi.xml --- trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/dnsapi/dnsapi.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,9 +1,9 @@ -<module name="dnsapitst" type="win32gui" installbase="bin" installname="dnsapitst.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>dnsapi</library> - <library>ws2_32</library> - <file>dnsapi.c</file> -</module> +<module name="dnsapitst" type="win32gui" installbase="bin" installname="dnsapitst.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>dnsapi</library> + <library>ws2_32</library> + <file>dnsapi.c</file> +</module> Property changes on: trunk/rosapps/tests/dnsapi/dnsapi.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/dnsquery/dnsquery.xml --- trunk/rosapps/tests/dnsquery/dnsquery.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/dnsquery/dnsquery.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,9 +1,9 @@ -<module name="dnsquery" type="win32gui" installbase="bin" installname="dnsquery.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>dnsapi</library> - <library>ws2_32</library> - <file>dnsquery.c</file> -</module> +<module name="dnsquery" type="win32gui" installbase="bin" installname="dnsquery.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>dnsapi</library> + <library>ws2_32</library> + <file>dnsquery.c</file> +</module> Property changes on: trunk/rosapps/tests/dnsquery/dnsquery.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/edit/edit.xml --- trunk/rosapps/tests/edit/edit.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/edit/edit.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,9 +1,9 @@ -<module name="edit" type="win32gui" installbase="bin" installname="edit.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>edittest.c</file> - <file>utils.c</file> -</module> +<module name="edit" type="win32gui" installbase="bin" installname="edit.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>edittest.c</file> + <file>utils.c</file> +</module> Property changes on: trunk/rosapps/tests/edit/edit.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/enhmetafile/enhmetafile.xml --- trunk/rosapps/tests/enhmetafile/enhmetafile.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/enhmetafile/enhmetafile.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="enhmetafile" type="win32gui" installbase="bin" installname="enhmetafile.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>enhmetafile.c</file> -</module> +<module name="enhmetafile" type="win32gui" installbase="bin" installname="enhmetafile.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>enhmetafile.c</file> +</module> Property changes on: trunk/rosapps/tests/enhmetafile/enhmetafile.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/enumfonts/enumfonts.xml --- trunk/rosapps/tests/enumfonts/enumfonts.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/enumfonts/enumfonts.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="enumfonts" type="win32gui" installbase="bin" installname="enumfonts.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>enumfonts.cpp</file> -</module> +<module name="enumfonts" type="win32gui" installbase="bin" installname="enumfonts.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>enumfonts.cpp</file> +</module> Property changes on: trunk/rosapps/tests/enumfonts/enumfonts.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/enumwnd/enumwnd.dsp --- trunk/rosapps/tests/enumwnd/enumwnd.dsp 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/enumwnd/enumwnd.dsp 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,90 +1,90 @@ -# Microsoft Developer Studio Project File - Name="enumwnd" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=enumwnd - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "enumwnd.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "enumwnd.mak" CFG="enumwnd - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "enumwnd - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "enumwnd - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "enumwnd - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "enumwnd - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "enumwnd - Win32 Release" -# Name "enumwnd - Win32 Debug" -# Begin Source File - -SOURCE=.\enumwnd.c -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="enumwnd" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=enumwnd - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "enumwnd.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "enumwnd.mak" CFG="enumwnd - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "enumwnd - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "enumwnd - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "enumwnd - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "enumwnd - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /debug /machine:I386 /pdbtype:sept +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "enumwnd - Win32 Release" +# Name "enumwnd - Win32 Debug" +# Begin Source File + +SOURCE=.\enumwnd.c +# End Source File +# End Target +# End Project Property changes on: trunk/rosapps/tests/enumwnd/enumwnd.dsp ___________________________________________________________________ Name: svn:eol-style - CRLF + native _____ Modified: trunk/rosapps/tests/enumwnd/enumwnd.xml --- trunk/rosapps/tests/enumwnd/enumwnd.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/enumwnd/enumwnd.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="enumwnd" type="win32gui" installbase="bin" installname="enumwnd.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>enumwnd.c</file> -</module> +<module name="enumwnd" type="win32gui" installbase="bin" installname="enumwnd.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>enumwnd.c</file> +</module> Property changes on: trunk/rosapps/tests/enumwnd/enumwnd.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/enumws/enumws.xml --- trunk/rosapps/tests/enumws/enumws.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/enumws/enumws.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="enumws" type="win32gui" installbase="bin" installname="enumws.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>enumws.c</file> -</module> +<module name="enumws" type="win32gui" installbase="bin" installname="enumws.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>enumws.c</file> +</module> Property changes on: trunk/rosapps/tests/enumws/enumws.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/event/event.xml --- trunk/rosapps/tests/event/event.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/event/event.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="event" type="win32gui" installbase="bin" installname="event.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>event.c</file> -</module> +<module name="event" type="win32gui" installbase="bin" installname="event.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>event.c</file> +</module> Property changes on: trunk/rosapps/tests/event/event.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/fiber/fiber.xml --- trunk/rosapps/tests/fiber/fiber.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/fiber/fiber.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="fiber" type="win32gui" installbase="bin" installname="fiber.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>fiber.c</file> -</module> +<module name="fiber" type="win32gui" installbase="bin" installname="fiber.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>fiber.c</file> +</module> Property changes on: trunk/rosapps/tests/fiber/fiber.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/gethostbyname/gethostbyname.xml --- trunk/rosapps/tests/gethostbyname/gethostbyname.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/gethostbyname/gethostbyname.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="gethostbyname" type="win32gui" installbase="bin" installname="gethostbyname.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>ws2_32</library> - <file>gethostbyname.c</file> -</module> +<module name="gethostbyname" type="win32gui" installbase="bin" installname="gethostbyname.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>ws2_32</library> + <file>gethostbyname.c</file> +</module> Property changes on: trunk/rosapps/tests/gethostbyname/gethostbyname.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/tests/global_mem/global_mem.xml --- trunk/rosapps/tests/global_mem/global_mem.xml 2005-11-12 23:45:32 UTC (rev 19187) +++ trunk/rosapps/tests/global_mem/global_mem.xml 2005-11-13 04:29:53 UTC (rev 19188) @@ -1,8 +1,8 @@ -<module name="global_mem" type="win32gui" installbase="bin" installname="global_mem.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>gdi32</library> - <file>global_mem.c</file> -</module> +<module name="global_mem" type="win32gui" installbase="bin" installname="global_mem.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> [truncated at 1000 lines; 4522 more skipped]

1 0

[hbirr] 19187: Fixed the growing of the dirty bitmap. This will fix the registry update bugs, if the binary hive is larger than 128kB.
by hbirr＠svn.reactos.com 12 Nov '05

12 Nov '05

Fixed the growing of the dirty bitmap. This will fix the registry update bugs, if the binary hive is larger than 128kB. Modified: trunk/reactos/ntoskrnl/cm/regfile.c _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-12 21:11:09 UTC (rev 19186) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-12 23:45:32 UTC (rev 19187) @@ -862,7 +862,7 @@ Filename); if (!NT_SUCCESS(Status)) { - DPRINT("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); + DPRINT("RtlCreateUnicodeString() failed (Status %lx)\n", Status); return(Status); } @@ -3235,6 +3235,7 @@ PHBIN tmpBin; ULONG BinSize; ULONG i; + ULONG BitmapSize; DPRINT ("CmiAddBin (BlockCount %lu)\n", BlockCount); @@ -3287,17 +3288,17 @@ tmpBlock = (PCELL_HEADER)((ULONG_PTR) tmpBin + REG_HBIN_DATA_OFFSET); tmpBlock->CellSize = (BinSize - REG_HBIN_DATA_OFFSET); + /* Calculate bitmap size in bytes (always a multiple of 32 bits) */ + BitmapSize = ROUND_UP(RegistryHive->BlockListSize, sizeof(ULONG) * 8) / 8; + /* Grow bitmap if necessary */ - if (IsNoFileHive(RegistryHive) && - (RegistryHive->BlockListSize % (sizeof(ULONG) * 8) == 0)) + if (!IsNoFileHive(RegistryHive) && + BitmapSize > RegistryHive->DirtyBitMap.SizeOfBitMap) { PULONG BitmapBuffer; - ULONG BitmapSize; DPRINT("Grow hive bitmap\n"); - /* Calculate bitmap size in bytes (always a multiple of 32 bits) */ - BitmapSize = ROUND_UP(RegistryHive->BlockListSize, sizeof(ULONG) * 8) / 8; DPRINT("RegistryHive->BlockListSize: %lu\n", RegistryHive->BlockListSize); DPRINT("BitmapSize: %lu Bytes %lu Bits\n", BitmapSize, BitmapSize * 8); BitmapBuffer = (PULONG)ExAllocatePool(PagedPool,

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