Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[fireball] 38982: Alex Vlasov - Move and rewrite FAT ondisk structures to a standalone header file fat.h.
by fireball＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: fireball Date: Tue Jan 20 12:05:53 2009 New Revision: 38982 URL: http://svn.reactos.org/svn/reactos?rev=38982&view=rev Log: Alex Vlasov - Move and rewrite FAT ondisk structures to a standalone header file fat.h. Added: trunk/reactos/drivers/filesystems/fastfat_new/fat.h (with props) Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Tue Jan 20 12:05:53 2009 @@ -4,167 +4,7 @@ #include <debug.h> /* FAT on-disk data structures */ -#include <pshpack1.h> -struct _BootSector -{ - unsigned char magic0, res0, magic1; - unsigned char OEMName[8]; - unsigned short BytesPerSector; - unsigned char SectorsPerCluster; - unsigned short ReservedSectors; - unsigned char FATCount; - unsigned short RootEntries, Sectors; - unsigned char Media; - unsigned short FATSectors, SectorsPerTrack, Heads; - unsigned long HiddenSectors, SectorsHuge; - unsigned char Drive, Res1, Sig; - unsigned long VolumeID; - unsigned char VolumeLabel[11], SysType[8]; - unsigned char Res2[448]; - unsigned short Signatur1; -}; - -struct _BootSector32 -{ - unsigned char magic0, res0, magic1; // 0 - unsigned char OEMName[8]; // 3 - unsigned short BytesPerSector; // 11 - unsigned char SectorsPerCluster; // 13 - unsigned short ReservedSectors; // 14 - unsigned char FATCount; // 16 - unsigned short RootEntries, Sectors; // 17 - unsigned char Media; // 21 - unsigned short FATSectors, SectorsPerTrack, Heads; // 22 - unsigned long HiddenSectors, SectorsHuge; // 28 - unsigned long FATSectors32; // 36 - unsigned short ExtFlag; // 40 - unsigned short FSVersion; // 42 - unsigned long RootCluster; // 44 - unsigned short FSInfoSector; // 48 - unsigned short BootBackup; // 50 - unsigned char Res3[12]; // 52 - unsigned char Drive; // 64 - unsigned char Res4; // 65 - unsigned char ExtBootSignature; // 66 - unsigned long VolumeID; // 67 - unsigned char VolumeLabel[11], SysType[8]; // 71 - unsigned char Res2[420]; // 90 - unsigned short Signature1; // 510 -}; - -struct _BootSectorFatX -{ - unsigned char SysType[4]; // 0 - unsigned long VolumeID; // 4 - unsigned long SectorsPerCluster; // 8 - unsigned short FATCount; // 12 - unsigned long Unknown; // 14 - unsigned char Unused[4078]; // 18 -}; - -struct _FsInfoSector -{ - unsigned long ExtBootSignature2; // 0 - unsigned char Res6[480]; // 4 - unsigned long FSINFOSignature; // 484 - unsigned long FreeCluster; // 488 - unsigned long NextCluster; // 492 - unsigned char Res7[12]; // 496 - unsigned long Signatur2; // 508 -}; - -typedef struct _BootSector BootSector; - -struct _FATDirEntry -{ - union - { - struct { unsigned char Filename[8], Ext[3]; }; - unsigned char ShortName[11]; - }; - unsigned char Attrib; - unsigned char lCase; - unsigned char CreationTimeMs; - unsigned short CreationTime,CreationDate,AccessDate; - union - { - unsigned short FirstClusterHigh; // FAT32 - unsigned short ExtendedAttributes; // FAT12/FAT16 - }; - unsigned short UpdateTime; //time create/update - unsigned short UpdateDate; //date create/update - unsigned short FirstCluster; - unsigned long FileSize; -}; - -#define FAT_EAFILE "EA DATA. SF" - -typedef struct _EAFileHeader FAT_EA_FILE_HEADER, *PFAT_EA_FILE_HEADER; - -struct _EAFileHeader -{ - unsigned short Signature; // ED - unsigned short Unknown[15]; - unsigned short EASetTable[240]; -}; - -typedef struct _EASetHeader FAT_EA_SET_HEADER, *PFAT_EA_SET_HEADER; - -struct _EASetHeader -{ - unsigned short Signature; // EA - unsigned short Offset; // relative offset, same value as in the EASetTable - unsigned short Unknown1[2]; - char TargetFileName[12]; - unsigned short Unknown2[3]; - unsigned int EALength; - // EA Header -}; - -typedef struct _EAHeader FAT_EA_HEADER, *PFAT_EA_HEADER; - -struct _EAHeader -{ - unsigned char Unknown; - unsigned char EANameLength; - unsigned short EAValueLength; - // Name Data - // Value Data -}; - -typedef struct _FATDirEntry FAT_DIR_ENTRY, *PFAT_DIR_ENTRY; - -struct _FATXDirEntry -{ - unsigned char FilenameLength; // 0 - unsigned char Attrib; // 1 - unsigned char Filename[42]; // 2 - unsigned long FirstCluster; // 44 - unsigned long FileSize; // 48 - unsigned short UpdateTime; // 52 - unsigned short UpdateDate; // 54 - unsigned short CreationTime; // 56 - unsigned short CreationDate; // 58 - unsigned short AccessTime; // 60 - unsigned short AccessDate; // 62 -}; - -struct _slot -{ - unsigned char id; // sequence number for slot - WCHAR name0_4[5]; // first 5 characters in name - unsigned char attr; // attribute byte - unsigned char reserved; // always 0 - unsigned char alias_checksum; // checksum for 8.3 alias - WCHAR name5_10[6]; // 6 more characters in name - unsigned char start[2]; // starting cluster number - WCHAR name11_12[2]; // last 2 characters in name -}; - -typedef struct _slot slot; - -#include <poppack.h> - +#include <fat.h> /* File system types */ #define FAT16 (1) Added: trunk/reactos/drivers/filesystems/fastfat_new/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.h (added) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.h [iso-8859-1] Tue Jan 20 12:05:53 2009 @@ -1,0 +1,298 @@ +#ifndef __FAT_H__ +#define __FAT_H__ + +// +// Might be a good idea to have this as a shared +// header with FS Recognizer. +// +// +// Conversion types and macros taken from internal ntifs headers +// +typedef union _UCHAR1 +{ + UCHAR Uchar[1]; + UCHAR ForceAlignment; +} UCHAR1, *PUCHAR1; + +typedef union _UCHAR2 +{ + UCHAR Uchar[2]; + USHORT ForceAlignment; +} UCHAR2, *PUCHAR2; + +typedef union _UCHAR4 +{ + UCHAR Uchar[4]; + ULONG ForceAlignment; +} UCHAR4, *PUCHAR4; + +#define CopyUchar1(Dst,Src) { \ + *((UCHAR1 *)(Dst)) = *((UNALIGNED UCHAR1 *)(Src)); \ +} + +#define CopyUchar2(Dst,Src) { \ + *((UCHAR2 *)(Dst)) = *((UNALIGNED UCHAR2 *)(Src)); \ +} + +#define CopyUchar4(Dst,Src) { \ + *((UCHAR4 *)(Dst)) = *((UNALIGNED UCHAR4 *)(Src)); \ +} + +#define FatUnpackBios(Bios,Pbios) { \ + CopyUchar2(&(Bios)->BytesPerSector, &(Pbios)->BytesPerSector[0] ); \ + CopyUchar1(&(Bios)->SectorsPerCluster, &(Pbios)->SectorsPerCluster[0]); \ + CopyUchar2(&(Bios)->ReservedSectors, &(Pbios)->ReservedSectors[0] ); \ + CopyUchar1(&(Bios)->Fats, &(Pbios)->Fats[0] ); \ + CopyUchar2(&(Bios)->RootEntries, &(Pbios)->RootEntries[0] ); \ + CopyUchar2(&(Bios)->Sectors, &(Pbios)->Sectors[0] ); \ + CopyUchar1(&(Bios)->Media, &(Pbios)->Media[0] ); \ + CopyUchar2(&(Bios)->SectorsPerFat, &(Pbios)->SectorsPerFat[0] ); \ + CopyUchar2(&(Bios)->SectorsPerTrack, &(Pbios)->SectorsPerTrack[0] ); \ + CopyUchar2(&(Bios)->Heads, &(Pbios)->Heads[0] ); \ + CopyUchar4(&(Bios)->HiddenSectors, &(Pbios)->HiddenSectors[0] ); \ + CopyUchar4(&(Bios)->LargeSectors, &(Pbios)->LargeSectors[0] ); \ + CopyUchar4(&(Bios)->LargeSectors, &(Pbios)->LargeSectors[0] ); \ + CopyUchar4(&(Bios)->LargeSectorsPerFat,&((PPACKED_BIOS_PARAMETER_BLOCK_EX)Pbios)->LargeSectorsPerFat[0] ); \ + CopyUchar2(&(Bios)->ExtendedFlags, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)Pbios)->ExtendedFlags[0] ); \ + CopyUchar2(&(Bios)->FsVersion, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)Pbios)->FsVersion[0] ); \ + CopyUchar4(&(Bios)->RootDirFirstCluster, \ + &((PPACKED_BIOS_PARAMETER_BLOCK_EX)Pbios)->RootDirFirstCluster[0] ); \ + CopyUchar2(&(Bios)->FsInfoSector, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)Pbios)->FsInfoSector[0] ); \ + CopyUchar2(&(Bios)->BackupBootSector, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)Pbios)->BackupBootSector[0] ); \ +} +// +// Packed versions of the BPB and Boot Sector +// +typedef struct _PACKED_BIOS_PARAMETER_BLOCK +{ + UCHAR BytesPerSector[2]; + UCHAR SectorsPerCluster[1]; + UCHAR ReservedSectors[2]; + UCHAR Fats[1]; + UCHAR RootEntries[2]; + UCHAR Sectors[2]; + UCHAR Media[1]; + UCHAR SectorsPerFat[2]; + UCHAR SectorsPerTrack[2]; + UCHAR Heads[2]; + UCHAR HiddenSectors[4]; + UCHAR LargeSectors[4]; +} PACKED_BIOS_PARAMETER_BLOCK, *PPACKED_BIOS_PARAMETER_BLOCK; +// sizeof = 0x019 + +typedef struct _PACKED_BIOS_PARAMETER_BLOCK_EX +{ + PACKED_BIOS_PARAMETER_BLOCK Block; + UCHAR LargeSectorsPerFat[4]; + UCHAR ExtendedFlags[2]; + UCHAR FsVersion[2]; + UCHAR RootDirFirstCluster[4]; + UCHAR FsInfoSector[2]; + UCHAR BackupBootSector[2]; + UCHAR Reserved[12]; +} PACKED_BIOS_PARAMETER_BLOCK_EX, *PPACKED_BIOS_PARAMETER_BLOCK_EX; +// sizeof = 0x035 53 + +// +// Unpacked version of the BPB +// +typedef struct BIOS_PARAMETER_BLOCK +{ + USHORT BytesPerSector; + UCHAR SectorsPerCluster; + USHORT ReservedSectors; + UCHAR Fats; + USHORT RootEntries; + USHORT Sectors; + UCHAR Media; + USHORT SectorsPerFat; + USHORT SectorsPerTrack; + USHORT Heads; + ULONG HiddenSectors; + ULONG LargeSectors; + ULONG LargeSectorsPerFat; + union + { + USHORT ExtendedFlags; + struct + { + ULONG ActiveFat:4; + ULONG Reserved0:3; + ULONG MirrorDisabled:1; + ULONG Reserved1:8; + }; + }; + USHORT FsVersion; + ULONG RootDirFirstCluster; + USHORT FsInfoSector; + USHORT BackupBootSector; +} BIOS_PARAMETER_BLOCK, *PBIOS_PARAMETER_BLOCK; + +#define FatValidBytesPerSector(xBytes) \ + (!((xBytes) & ((xBytes)-1)) && (xBytes)>=0x80 && (xBytes)<=0x1000) + +#define FatValidSectorsPerCluster(xSectors) \ + (!((xSectors) & ((xSectors)-1)) && (xSectors)>=0 && (xSectors)<=0x80) + +typedef struct _PACKED_BOOT_SECTOR +{ + UCHAR Jump[3]; + UCHAR Oem[8]; + PACKED_BIOS_PARAMETER_BLOCK PackedBpb; + UCHAR PhysicalDriveNumber; + UCHAR CurrentHead; + UCHAR Signature; + UCHAR Id[4]; + UCHAR VolumeLabel[11]; + UCHAR SystemId[8]; +} PACKED_BOOT_SECTOR, *PPACKED_BOOT_SECTOR; +// sizeof = 0x03E + +typedef struct _PACKED_BOOT_SECTOR_EX +{ + UCHAR Jump[3]; + UCHAR Oem[8]; + PACKED_BIOS_PARAMETER_BLOCK_EX PackedBpb; + UCHAR PhysicalDriveNumber; + UCHAR CurrentHead; + UCHAR Signature; + UCHAR Id[4]; + UCHAR VolumeLabel[11]; + UCHAR SystemId[8]; +} PACKED_BOOT_SECTOR_EX, *PPACKED_BOOT_SECTOR_EX; +// sizeof = 0x060 + +#define FatBootSectorJumpValid(xMagic) \ + ((xMagic)[0] == 0xe9 || (xMagic)[0] == 0xeb || (xMagic)[0] == 0x49) + +typedef struct _FSINFO_SECTOR +{ + ULONG SectorBeginSignature; + UCHAR Reserved[480]; + ULONG FsInfoSignature; + ULONG FreeClusterCount; + ULONG NextFreeCluster; + UCHAR Reserved0[12]; + ULONG SectorEndSignature; +} FSINFO_SECTOR, *PFSINFO_SECTOR; +// sizeof = 0x200 +#define FSINFO_SECTOR_BEGIN_SIGNATURE 0x41615252 +#define FSINFO_SECTOR_END_SIGNATURE 0xaa550000 +#define FSINFO_SIGNATURE 0x61417272 +// +// Cluster Markers: +// +// +#define FAT_CLUSTER_AVAILABLE 0x00000000 +#define FAT_CLUSTER_RESERVED 0x0ffffff0 +#define FAT_CLUSTER_BAD 0x0ffffff7 +#define FAT_CLUSTER_LAST 0x0fffffff +// +// Directory Structure: +// +typedef struct _FAT_TIME +{ + union { + struct { + USHORT DoubleSeconds : 5; + USHORT Minute : 6; + USHORT Hour : 5; + }; + USHORT Value; + }; +} FAT_TIME, *PFAT_TIME; +// +// +// +typedef struct _FAT_DATE { + union { + struct { + USHORT Day : 5; + USHORT Month : 4; + /* Relative to 1980 */ + USHORT Year : 7; + }; + USHORT Value; + }; +} FAT_DATE, *PFAT_DATE; +// +// +// +typedef struct _FAT_DATETIME { + union { + struct { + FAT_TIME Time; + FAT_DATE Date; + }; + ULONG Value; + }; +} FAT_DATETIME, *PFAT_DATETIME; +// +// +// +typedef struct _DIR_ENTRY +{ + UCHAR FileName[11]; + UCHAR Attributes; + UCHAR Case; + UCHAR CreationTimeTenMs; + FAT_DATETIME CreationDateTime; + FAT_DATE LastAccessDate; + union { + USHORT ExtendedAttributes; + USHORT FirstClusterOfFileHi; + }; + FAT_DATETIME LastWriteDateTime; + USHORT FirstCluster; + ULONG FileSize; +} DIR_ENTRY, *PDIR_ENTRY; +// sizeof = 0x020 + +typedef struct _LONG_FILE_NAME_ENTRY { + UCHAR Index; + UCHAR NameA[10]; + UCHAR Attributes; + UCHAR Type; + UCHAR Checksum; + USHORT NameB[6]; + USHORT Reserved; + USHORT NameC[2]; +} LONG_FILE_NAME_ENTRY, *PLONG_FILE_NAME_ENTRY; +// sizeof = 0x020 + +#define FAT_FN_DIR_ENTRY_TERM_INDEX 0x40 + +#define FAT_BYTES_PER_DIRENT 0x20 +#define FAT_BYTES_PER_DIRENT_LOG 0x05 +#define FAT_DIRENT_NEVER_USED 0x00 +#define FAT_DIRENT_REALLY_0E5 0x05 +#define FAT_DIRENT_DIRECTORY_ALIAS 0x2e +#define FAT_DIRENT_DELETED 0xe5 + +#define FAT_CASE_LOWER_BASE 0x08 +#define FAT_CASE_LOWER_EXT 0x10 + +#define FAT_DIRENT_ATTR_READ_ONLY 0x01 +#define FAT_DIRENT_ATTR_HIDDEN 0x02 +#define FAT_DIRENT_ATTR_SYSTEM 0x04 +#define FAT_DIRENT_ATTR_VOLUME_ID 0x08 +#define FAT_DIRENT_ATTR_DIRECTORY 0x10 +#define FAT_DIRENT_ATTR_ARCHIVE 0x20 +#define FAT_DIRENT_ATTR_DEVICE 0x40 +#define FAT_DIRENT_ATTR_LFN (FAT_DIRENT_ATTR_READ_ONLY | \ + FAT_DIRENT_ATTR_HIDDEN | \ + FAT_DIRENT_ATTR_SYSTEM | \ + FAT_DIRENT_ATTR_VOLUME_ID) + +typedef struct _PACKED_LFN_DIRENT { + UCHAR Ordinal; // offset = 0 + UCHAR Name1[10]; // offset = 1 (Really 5 chars, but not WCHAR aligned) + UCHAR Attributes; // offset = 11 + UCHAR Type; // offset = 12 + UCHAR Checksum; // offset = 13 + WCHAR Name2[6]; // offset = 14 + USHORT MustBeZero; // offset = 26 + WCHAR Name3[2]; // offset = 28 +} PACKED_LFN_DIRENT; // sizeof = 32 + +#endif//__FAT_H__ Propchange: trunk/reactos/drivers/filesystems/fastfat_new/fat.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 38981: sync netapi32_winetest with wine 1.1.13
by cwittich＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: cwittich Date: Tue Jan 20 11:09:46 2009 New Revision: 38981 URL: http://svn.reactos.org/svn/reactos?rev=38981&view=rev Log: sync netapi32_winetest with wine 1.1.13 Modified: trunk/rostests/winetests/netapi32/access.c trunk/rostests/winetests/netapi32/apibuf.c Modified: trunk/rostests/winetests/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/access… ============================================================================== --- trunk/rostests/winetests/netapi32/access.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/access.c [iso-8859-1] Tue Jan 20 11:09:46 2009 @@ -70,7 +70,7 @@ BOOL rc; user_name[0] = 0; - dwSize = sizeof(user_name); + dwSize = sizeof(user_name)/sizeof(WCHAR); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { @@ -80,7 +80,7 @@ ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; - dwSize = sizeof(computer_name); + dwSize = sizeof(computer_name)/sizeof(WCHAR); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); return 1; } @@ -170,9 +170,7 @@ trace("Deleting the test user failed. You might have to manually delete it.\n"); } -/* checks Level 1 of NetQueryDisplayInformation - * FIXME: Needs to be rewritten to not depend on the spelling of the users, - * ideally based on the admin and guest user SIDs/RIDs.*/ +/* Checks Level 1 of NetQueryDisplayInformation */ static void run_querydisplayinformation1_tests(void) { PNET_DISPLAY_USER Buffer, rec; @@ -180,9 +178,6 @@ DWORD i = 0; BOOL hasAdmin = FALSE; BOOL hasGuest = FALSE; - static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a', - 't','o','r',0}; - static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; do { @@ -195,14 +190,14 @@ rec = Buffer; for(; EntryCount > 0; EntryCount--) { - if (!lstrcmpW(rec->usri1_name, sAdminUserName)) + if (rec->usri1_user_id == DOMAIN_USER_RID_ADMIN) { ok(!hasAdmin, "One admin user\n"); ok(rec->usri1_flags & UF_SCRIPT, "UF_SCRIPT flag is set\n"); ok(rec->usri1_flags & UF_NORMAL_ACCOUNT, "UF_NORMAL_ACCOUNT flag is set\n"); hasAdmin = TRUE; } - else if (!lstrcmpW(rec->usri1_name, sGuestUserName)) + else if (rec->usri1_user_id == DOMAIN_USER_RID_GUEST) { ok(!hasGuest, "One guest record\n"); ok(rec->usri1_flags & UF_SCRIPT, "UF_SCRIPT flag is set\n"); @@ -217,7 +212,7 @@ pNetApiBufferFree(Buffer); } while (Result == ERROR_MORE_DATA); - ok(hasAdmin, "Has Administrator account\n"); + ok(hasAdmin, "Doesn't have 'Administrator' account\n"); } static void run_usermodalsget_tests(void) @@ -257,7 +252,9 @@ ok(ret == NERR_Success, "Deleting the user failed : %d\n", ret); } else - ok(ret == NERR_BadUsername, "Adding user with too long username returned 0x%08x\n", ret); + ok(ret == NERR_BadUsername || + broken(ret == NERR_PasswordTooShort), /* NT4 */ + "Adding user with too long username returned 0x%08x\n", ret); usri.usri1_name = sTestUserName; usri.usri1_password = sTooLongPassword; @@ -293,7 +290,9 @@ return; } - ok(ret == NERR_Success, "Adding user failed with error 0x%08x\n", ret); + ok(ret == NERR_Success || + broken(ret == NERR_PasswordTooShort), /* NT4 */ + "Adding user failed with error 0x%08x\n", ret); if(ret != NERR_Success) return; Modified: trunk/rostests/winetests/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/apibuf… ============================================================================== --- trunk/rostests/winetests/netapi32/apibuf.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/apibuf.c [iso-8859-1] Tue Jan 20 11:09:46 2009 @@ -74,13 +74,13 @@ /* NULL-Pointer */ /* NT: ERROR_INVALID_PARAMETER, lasterror is untouched) */ SetLastError(0xdeadbeef); - res = pNetApiBufferAllocate(0, (LPVOID *)NULL); + res = pNetApiBufferAllocate(0, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pNetApiBufferAllocate(1024, (LPVOID *)NULL); + res = pNetApiBufferAllocate(1024, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError());

1 0

[cwittich] 38980: fix kernel32 codepage winetest
by cwittich＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: cwittich Date: Tue Jan 20 10:27:05 2009 New Revision: 38980 URL: http://svn.reactos.org/svn/reactos?rev=38980&view=rev Log: fix kernel32 codepage winetest Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Tue Jan 20 10:27:05 2009 @@ -493,7 +493,10 @@ } if (MultiByteString < MbsEnd) + { SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } return Count; } @@ -525,6 +528,7 @@ { MultiByteCount = WideCharCount; SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; } for (TempLength = MultiByteCount;

1 0

[sginsberg] 38979: - Fix my .diff mess from yesterday, sorry
by sginsberg＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: sginsberg Date: Tue Jan 20 09:48:54 2009 New Revision: 38979 URL: http://svn.reactos.org/svn/reactos?rev=38979&view=rev Log: - Fix my .diff mess from yesterday, sorry Added: trunk/reactos/dll/win32/crypt32/crypt32_ros.diff - copied unchanged from r38978, trunk/reactos/dll/win32/crypt32/warningfixes.diff trunk/reactos/dll/win32/ole32/ole32_ros.diff - copied unchanged from r38978, trunk/reactos/dll/win32/ole32/warningfix.diff Removed: trunk/reactos/dll/win32/crypt32/warningfixes.diff trunk/reactos/dll/win32/ole32/warningfix.diff Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff Removed: trunk/reactos/dll/win32/crypt32/warningfixes.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/warningf… ============================================================================== --- trunk/reactos/dll/win32/crypt32/warningfixes.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/warningfixes.diff (removed) @@ -1,39 +1,0 @@ -Index: chain.c -=================================================================== ---- chain.c (revision 38919) -+++ chain.c (working copy) -@@ -205,7 +205,7 @@ - - config.cbSize = sizeof(config); - CertCreateCertificateChainEngine(&config, &engine); -- InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, -+ (void)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, - NULL); - if (CRYPT_defaultChainEngine != engine) - CertFreeCertificateChainEngine(engine); -Index: main.c -=================================================================== ---- main.c (revision 38919) -+++ main.c (working copy) -@@ -66,7 +66,7 @@ - - CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, - CRYPT_VERIFYCONTEXT); -- InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, -+ (void)InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, - NULL); - if (hDefProv != prov) - CryptReleaseContext(prov, 0); -Index: rootstore.c -=================================================================== ---- rootstore.c (revision 38919) -+++ rootstore.c (working copy) -@@ -759,7 +759,7 @@ - { - HCERTSTORE root = create_root_store(); - -- InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, -+ (void)InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, - NULL); - if (CRYPT_rootStore != root) - CertCloseStore(root, 0); Removed: trunk/reactos/dll/win32/ole32/warningfix.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/warningfix… ============================================================================== --- trunk/reactos/dll/win32/ole32/warningfix.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/warningfix.diff (removed) @@ -1,13 +1,0 @@ -Index: marshal.c -=================================================================== ---- marshal.c (revision 38899) -+++ marshal.c (working copy) -@@ -824,7 +824,7 @@ - } while (new_dest_context != old_dest_context); - - if (dest_context_data) -- InterlockedExchangePointer(&This->dest_context_data, dest_context_data); -+ (void)InterlockedExchangePointer(&This->dest_context_data, dest_context_data); - } - - static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv) Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff [iso-8859-1] Tue Jan 20 09:48:54 2009 @@ -72,3 +72,15 @@ /* * FIXME: +Index: oleaut32.rbuild +=================================================================== +--- oleaut32.rbuild (revision 23782) ++++ oleaut32.rbuild (working copy) +@@ -43,6 +43,7 @@ + <library>comctl32</library> + <library>urlmon</library> + <library>uuid</library> ++ <library>pseh</library> + </module> + <module name="oleaut32_oleaut32_oaidl_proxy" type="rpcproxy" allowwarnings="true"> + <file>oleaut32_oaidl.idl</file>

1 0

[cwittich] 38978: fix GetCurrentProcessorNumber and InterlockedCompareExchangePointer64 exports
by cwittich＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: cwittich Date: Tue Jan 20 09:24:47 2009 New Revision: 38978 URL: http://svn.reactos.org/svn/reactos?rev=38978&view=rev Log: fix GetCurrentProcessorNumber and InterlockedCompareExchangePointer64 exports Modified: trunk/reactos/dll/win32/kernel32/kernel32.def Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] Tue Jan 20 09:24:47 2009 @@ -368,7 +368,7 @@ GetCurrentDirectoryW@8 GetCurrentProcess@0 GetCurrentProcessId@0 -GetCurrentProcessorNumber@0=NTDLL.RtlGetCurrentProcessorNumber@0 +GetCurrentProcessorNumber(a)0=NTDLL.RtlGetCurrentProcessorNumber GetCurrentThread@0 GetCurrentThreadId@0 GetDateFormatA@24 @@ -603,7 +603,7 @@ InitializeSListHead(a)4=NTDLL.RtlInitializeSListHead InitializeSRWLock(a)4=NTDLL.RtlInitializeSRWLock InterlockedCompareExchange@12 -InterlockedCompareExchange64@20=NTDLL.RtlInterlockedCompareExchange64@20 +InterlockedCompareExchange64(a)20=NTDLL.RtlInterlockedCompareExchange64 InterlockedDecrement@4 InterlockedExchange@8 InterlockedExchangeAdd@8

1 0

[dchapyshev] 38977: - Implement auto add keyboard layouts
by dchapyshev＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: dchapyshev Date: Tue Jan 20 09:13:32 2009 New Revision: 38977 URL: http://svn.reactos.org/svn/reactos?rev=38977&view=rev Log: - Implement auto add keyboard layouts Added: trunk/reactos/dll/cpl/intl/kblayouts.c (with props) Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Tue Jan 20 09:13:32 2009 @@ -28,7 +28,6 @@ #include <windows.h> #include <commctrl.h> -#include <cpl.h> #include <tchar.h> #include <stdio.h> @@ -441,6 +440,7 @@ /* Set new locale */ SetNewLocale(NewLcid); + AddNewKbLayoutsByLcid(NewLcid); SetUserGeoID(NewGeoID); SetNonUnicodeLang(hwndDlg, NewLcid); } Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=38… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Tue Jan 20 09:13:32 2009 @@ -1,5 +1,7 @@ #ifndef __CPL_INTL_H #define __CPL_INTL_H + +#include <cpl.h> #define MAX_FMT_SIZE 30 #define MAX_STR_SIZE 128 @@ -77,6 +79,9 @@ APIENTRY SetupApplet(HWND hwndDlg, LCID lcid); +/* kblayouts.c */ +VOID AddNewKbLayoutsByLcid(LCID Lcid); + #endif /* __CPL_INTL_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild [iso-8859-1] Tue Jan 20 09:13:32 2009 @@ -17,6 +17,7 @@ <file>numbers.c</file> <file>time.c</file> <file>misc.c</file> + <file>kblayouts.c</file> <file>languages.c</file> <file>advanced.c</file> <file>sort.c</file> Added: trunk/reactos/dll/cpl/intl/kblayouts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/kblayouts.c?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/kblayouts.c (added) +++ trunk/reactos/dll/cpl/intl/kblayouts.c [iso-8859-1] Tue Jan 20 09:13:32 2009 @@ -1,0 +1,249 @@ +/* + * PROJECT: ReactOS International Control Panel + * FILE: dll/cpl/intl/kblayouts.c + * PURPOSE: Functions for manipulation with keyboard layouts + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include <windows.h> +#include <setupapi.h> +#include <tchar.h> +#include <stdio.h> + +#include "intl.h" +#include "resource.h" + +/* Character Count of a layout ID like "00000409" */ +#define CCH_LAYOUT_ID 8 + +/* Maximum Character Count of a ULONG in decimal */ +#define CCH_ULONG_DEC 10 + + +/* szLayoutID like 00000409, szLangID like 00000409 */ +static BOOL +IsLayoutExists(LPTSTR szLayoutID, LPTSTR szLangID) +{ + HKEY hKey, hSubKey; + TCHAR szPreload[CCH_LAYOUT_ID + 1], szLayoutNum[3 + 1], + szTmp[CCH_LAYOUT_ID + 1], szOldLangID[CCH_LAYOUT_ID + 1]; + DWORD dwIndex = 0, dwType, dwSize; + BOOL IsLangExists = FALSE; + LANGID langid; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szLayoutNum); + + while (RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, &dwType, NULL, NULL) == ERROR_SUCCESS) + { + dwSize = sizeof(szPreload); + if (RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szPreload, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + langid = (LANGID)_tcstoul(szPreload, NULL, 16); + GetLocaleInfo(langid, LOCALE_ILANGUAGE, szTmp, sizeof(szTmp) / sizeof(TCHAR)); + wsprintf(szOldLangID, _T("0000%s"), szTmp); + + if (_tcscmp(szOldLangID, szLangID) == 0) + IsLangExists = TRUE; + else + IsLangExists = FALSE; + + if (szPreload[0] == 'd') + { + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), + 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szTmp); + RegQueryValueEx(hSubKey, szPreload, NULL, NULL, (LPBYTE)szTmp, &dwSize); + + if ((_tcscmp(szTmp, szLayoutID) == 0)&&(IsLangExists)) + { + RegCloseKey(hSubKey); + RegCloseKey(hKey); + return TRUE; + } + } + } + else + { + if ((_tcscmp(szPreload, szLayoutID) == 0) && (IsLangExists)) + { + RegCloseKey(hKey); + return TRUE; + } + } + + IsLangExists = FALSE; + dwSize = sizeof(szLayoutNum); + dwIndex++; + } + + RegCloseKey(hKey); + } + + return FALSE; +} + +static INT +GetLayoutCount(LPTSTR szLang) +{ + HKEY hKey; + TCHAR szLayoutID[3 + 1], szPreload[CCH_LAYOUT_ID + 1], szLOLang[MAX_PATH]; + DWORD dwIndex = 0, dwType, dwSize; + UINT Count = 0, i, j; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szLayoutID); + + while (RegEnumValue(hKey, dwIndex, szLayoutID, &dwSize, NULL, &dwType, NULL, NULL) == ERROR_SUCCESS) + { + dwSize = sizeof(szPreload); + RegQueryValueEx(hKey, szLayoutID, NULL, NULL, (LPBYTE)szPreload, &dwSize); + + for (i = 4, j = 0; i < _tcslen(szPreload)+1; i++, j++) + szLOLang[j] = szPreload[i]; + + if (_tcscmp(szLOLang, szLang) == 0) Count += 1; + + dwSize = sizeof(szLayoutID); + dwIndex++; + } + + RegCloseKey(hKey); + } + + return Count; +} + +/* szLayoutID like 00000409, szLangID like 00000409 */ +static BOOL +AddNewLayout(LPTSTR szLayoutID, LPTSTR szLangID) +{ + TCHAR NewLayout[CCH_ULONG_DEC + 1], Lang[MAX_PATH], + LangID[CCH_LAYOUT_ID + 1], SubPath[CCH_LAYOUT_ID + 1]; + HKEY hKey, hSubKey; + DWORD cValues; + LCID lcid; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &cValues, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + _ultot(cValues + 1, NewLayout, 10); + + lcid = _tcstoul(szLangID, NULL, 16); + + GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, Lang, sizeof(Lang) / sizeof(TCHAR)); + wsprintf(LangID, _T("0000%s"), Lang); + + if (IsLayoutExists(szLayoutID, LangID)) + { + RegCloseKey(hKey); + return FALSE; + } + + if (GetLayoutCount(Lang) >= 1) + { + wsprintf(SubPath, _T("d%03d%s"), GetLayoutCount(Lang), Lang); + } + else if ((_tcscmp(LangID, szLayoutID) != 0) && (GetLayoutCount(Lang) == 0)) + { + wsprintf(SubPath, _T("d%03d%s"), 0, Lang); + } + else SubPath[0] = '\0'; + + if (_tcslen(SubPath) != 0) + { + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, + NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + if (RegSetValueEx(hSubKey, SubPath, 0, REG_SZ, (LPBYTE)szLayoutID, + (DWORD)((CCH_LAYOUT_ID + 1) * sizeof(TCHAR))) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + RegCloseKey(hKey); + return FALSE; + } + RegCloseKey(hSubKey); + } + lstrcpy(szLayoutID, SubPath); + } + + RegSetValueEx(hKey, + NewLayout, + 0, + REG_SZ, + (LPBYTE)szLayoutID, + (DWORD)((CCH_LAYOUT_ID + 1) * sizeof(TCHAR))); + } + RegCloseKey(hKey); + } + + return TRUE; +} + +VOID +AddNewKbLayoutsByLcid(LCID Lcid) +{ + HINF hIntlInf; + TCHAR szLang[CCH_LAYOUT_ID + 1], szLangID[CCH_LAYOUT_ID + 1]; + TCHAR szLangStr[MAX_STR_SIZE], szLayoutStr[MAX_STR_SIZE], szStr[MAX_STR_SIZE]; + INFCONTEXT InfContext; + LONG Count; + DWORD FieldCount, Index; + + GetLocaleInfo(MAKELCID(Lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, szLang, sizeof(szLang) / sizeof(TCHAR)); + wsprintf(szLangID, _T("0000%s"), szLang); + + hIntlInf = SetupOpenInfFile(_T("intl.inf"), NULL, INF_STYLE_WIN4, NULL); + + if (hIntlInf == INVALID_HANDLE_VALUE) + return; + + if (!SetupOpenAppendInfFile(NULL, hIntlInf, NULL)) + { + SetupCloseInfFile(hIntlInf); + hIntlInf = NULL; + return; + } + + Count = SetupGetLineCount(hIntlInf, _T("Locales")); + if (Count <= 0) return; + + if (SetupFindFirstLine(hIntlInf, _T("Locales"), szLangID, &InfContext)) + { + FieldCount = SetupGetFieldCount(&InfContext); + + if (FieldCount != 0) + { + for (Index = 5; Index <= FieldCount; Index++) + { + if (SetupGetStringField(&InfContext, Index, szStr, MAX_STR_SIZE, NULL)) + { + INT i, j; + + if (_tcslen(szStr) != 13) continue; + + wsprintf(szLangStr, _T("0000%s"), szStr); + szLangStr[8] = '\0'; + + for (i = 5, j = 0; i <= _tcslen(szStr); i++, j++) + szLayoutStr[j] = szStr[i]; + + AddNewLayout(szLayoutStr, szLangStr); + } + } + } + } + + SetupCloseInfFile(hIntlInf); +} Propchange: trunk/reactos/dll/cpl/intl/kblayouts.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 38976: fix advapi32.def
by cwittich＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: cwittich Date: Tue Jan 20 09:04:03 2009 New Revision: 38976 URL: http://svn.reactos.org/svn/reactos?rev=38976&view=rev Log: fix advapi32.def Modified: trunk/reactos/dll/win32/advapi32/advapi32.def Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] Tue Jan 20 09:04:03 2009 @@ -82,8 +82,8 @@ ;ConvertSDToStringSDRootDomainA@24 ;ConvertSDToStringSDRootDomainW@24 ;ConvertSecurityDescriptorToAccessA@28 -;ConvertSecurityDescriptorToAccessNamedA=ConvertSecurityDescriptorToAccessA@28 -;ConvertSecurityDescriptorToAccessNamedW=ConvertSecurityDescriptorToAccessW@28 +;ConvertSecurityDescriptorToAccessNamedA=ConvertSecurityDescriptorToAccessA +;ConvertSecurityDescriptorToAccessNamedW=ConvertSecurityDescriptorToAccessW ;ConvertSecurityDescriptorToAccessW@28 ConvertSecurityDescriptorToStringSecurityDescriptorA@20 ConvertSecurityDescriptorToStringSecurityDescriptorW@20 @@ -624,27 +624,27 @@ SystemFunction008@12 SystemFunction009@12 SystemFunction010@12 -SystemFunction011@12=ADVAPI32.SystemFunction010@12 +SystemFunction011(a)12=ADVAPI32.SystemFunction010 SystemFunction012@12 SystemFunction013@12 -SystemFunction014@12=ADVAPI32.SystemFunction012@12 -SystemFunction015@12=ADVAPI32.SystemFunction013@12 -SystemFunction016@12=ADVAPI32.SystemFunction012@12 -SystemFunction017@12=ADVAPI32.SystemFunction013@12 -SystemFunction018@12=ADVAPI32.SystemFunction012@12 -SystemFunction019@12=ADVAPI32.SystemFunction013@12 -SystemFunction020@12=ADVAPI32.SystemFunction012@12 -SystemFunction021@12=ADVAPI32.SystemFunction013@12 -SystemFunction022@12=ADVAPI32.SystemFunction012@12 -SystemFunction023@12=ADVAPI32.SystemFunction013@12 +SystemFunction014(a)12=ADVAPI32.SystemFunction012 +SystemFunction015(a)12=ADVAPI32.SystemFunction013 +SystemFunction016(a)12=ADVAPI32.SystemFunction012 +SystemFunction017(a)12=ADVAPI32.SystemFunction013 +SystemFunction018(a)12=ADVAPI32.SystemFunction012 +SystemFunction019(a)12=ADVAPI32.SystemFunction013 +SystemFunction020(a)12=ADVAPI32.SystemFunction012 +SystemFunction021(a)12=ADVAPI32.SystemFunction013 +SystemFunction022(a)12=ADVAPI32.SystemFunction012 +SystemFunction023(a)12=ADVAPI32.SystemFunction013 SystemFunction024@12 SystemFunction025@12 -SystemFunction026@12=ADVAPI32.SystemFunction024@12 -SystemFunction027@12=ADVAPI32.SystemFunction025@12 +SystemFunction026(a)12=ADVAPI32.SystemFunction024 +SystemFunction027(a)12=ADVAPI32.SystemFunction025 SystemFunction028@8 SystemFunction029@8 SystemFunction030@8 -SystemFunction031@8=ADVAPI32.SystemFunction030@8 +SystemFunction031(a)8=ADVAPI32.SystemFunction030 SystemFunction032@8 SystemFunction033@8 SystemFunction034@8

1 0

[cwittich] 38975: revert 38962 as it breaks bootcd
by cwittich＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: cwittich Date: Tue Jan 20 09:02:04 2009 New Revision: 38975 URL: http://svn.reactos.org/svn/reactos?rev=38975&view=rev Log: revert 38962 as it breaks bootcd Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Tue Jan 20 09:02:04 2009 @@ -115,14 +115,6 @@ { LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]); } -#ifdef FREELDR_ROS_SETUP - else if (_stricmp(SettingValue, "ReactOSSetup") == 0) - { - // Could probably pass the selection across at a later date - // which might be useful for different install methods? - RunReactOSSetup(); - } -#endif #ifdef __i386__ else if (_stricmp(SettingValue, "WindowsNT40") == 0) { Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Tue Jan 20 09:02:04 2009 @@ -77,12 +77,6 @@ <file>version.c</file> <file>cmdline.c</file> <file>machine.c</file> - <file>drivemap.c</file> - <file>miscboot.c</file> - <file>options.c</file> - <file>linuxboot.c</file> - <file>oslist.c</file> - <file>custom.c</file> <directory name="include"> <pch>freeldr.h</pch> </directory> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] Tue Jan 20 09:02:04 2009 @@ -7,4 +7,10 @@ <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <file>bootmgr.c</file> + <file>drivemap.c</file> + <file>miscboot.c</file> + <file>options.c</file> + <file>linuxboot.c</file> + <file>oslist.c</file> + <file>custom.c</file> </module> Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Tue Jan 20 09:02:04 2009 @@ -107,6 +107,5 @@ VOID BootMain(LPSTR CmdLine); VOID RunLoader(VOID); -VOID RunReactOSSetup(VOID); #endif // defined __FREELDR_H Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Tue Jan 20 09:02:04 2009 @@ -42,7 +42,7 @@ #define USE_UI -VOID RunReactOSSetup(VOID) +VOID RunLoader(VOID) { ULONG i; LPCSTR SourcePath; Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Tue Jan 20 09:02:04 2009 @@ -4,15 +4,11 @@ <include base="setupldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> - <define name="FREELDR_ROS_SETUP" /> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <compilerflag>-Os</compilerflag> - - <file>bootmgr.c</file> - <directory name="inffile"> <file>inffile.c</file> </directory>

1 0

[dchapyshev] 38974: - Revert r34642. It is wrong.
by dchapyshev＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: dchapyshev Date: Tue Jan 20 08:58:41 2009 New Revision: 38974 URL: http://svn.reactos.org/svn/reactos?rev=38974&view=rev Log: - Revert r34642. It is wrong. Modified: trunk/reactos/base/setup/usetup/lang/en-US.h Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Tue Jan 20 08:58:41 2009 @@ -4,8 +4,6 @@ MUI_LAYOUTS enUSLayouts[] = { { L"0409", L"00000409" }, - { L"0410", L"00000410" }, - { L"040A", L"0000040A" }, { NULL, NULL } };

1 0

[tkreuzer] 38973: rsym64: only compare lower 16 bits of checksum
by tkreuzer＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: tkreuzer Date: Tue Jan 20 07:46:24 2009 New Revision: 38973 URL: http://svn.reactos.org/svn/reactos?rev=38973&view=rev Log: rsym64: only compare lower 16 bits of checksum Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] Tue Jan 20 07:46:24 2009 @@ -753,7 +753,7 @@ File->OptionalHeader->CheckSum = 0; Checksum = CalculateChecksum(0, File->FilePtr, File->cbInFileSize); Checksum += File->cbInFileSize; - if (Checksum != OldChecksum) + if ((Checksum & 0xffff) != (OldChecksum & 0xffff)) { fprintf(stderr, "Input file has incorrect PE checksum: 0x%lx (calculated: 0x%lx)\n", OldChecksum, Checksum);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009