Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 388: Integrate People Map into RosCMS 4
by cfinck＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cfinck Date: Tue Apr 21 00:22:12 2009 New Revision: 388 URL: http://svn.reactos.org/svn/reactos?rev=388&view=rev Log: Integrate People Map into RosCMS 4 Modified: branches/danny-web/www/www.reactos.org/peoplemap/ajax-deletelocation.php branches/danny-web/www/www.reactos.org/peoplemap/ajax-getuser.php branches/danny-web/www/www.reactos.org/peoplemap/ajax-setlocation.php branches/danny-web/www/www.reactos.org/peoplemap/index.php Modified: branches/danny-web/www/www.reactos.org/peoplemap/ajax-deletelocation.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/peoplemap/ajax-deletelocation.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/peoplemap/ajax-deletelocation.php [iso-8859-1] Tue Apr 21 00:22:12 2009 @@ -25,7 +25,7 @@ } // Get the user ID from the session key - $stmt = $dbh->prepare("SELECT usersession_user_id FROM $DB_ROSCMS.user_sessions WHERE usersession_id = :usersessionid LIMIT 1"); + $stmt = $dbh->prepare("SELECT user_id FROM $DB_ROSCMS.roscms_accounts_sessions WHERE id = :usersessionid LIMIT 1"); $stmt->bindParam(":usersessionid", $_COOKIE["roscmsusrkey"]); $stmt->execute() or die("<error>Query failed #1</error>"); $userid = (int)$stmt->fetchColumn(); Modified: branches/danny-web/www/www.reactos.org/peoplemap/ajax-getuser.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/peoplemap/ajax-getuser.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/peoplemap/ajax-getuser.php [iso-8859-1] Tue Apr 21 00:22:12 2009 @@ -28,27 +28,27 @@ } // Build the query - $query = "SELECT u.user_id, u.user_name, u.user_fullname, l.latitude, l.longitude " . - "FROM $DB_ROSCMS.users u " . - "JOIN $DB_PEOPLEMAP.user_locations l ON u.user_id = l.roscms_user_id "; + $query = "SELECT u.id, u.name, u.fullname, l.latitude, l.longitude " . + "FROM $DB_ROSCMS.roscms_accounts u " . + "JOIN $DB_PEOPLEMAP.user_locations l ON u.id = l.roscms_user_id "; switch($_GET["subject"]) { case "username": - $query .= "WHERE u.user_name LIKE :query"; + $query .= "WHERE u.name LIKE :query"; break; case "fullname": - $query .= "WHERE u.user_fullname LIKE :query"; + $query .= "WHERE u.fullname LIKE :query"; break; case "group": - $query .= "JOIN $DB_ROSCMS.usergroup_members g ON u.user_id = g.usergroupmember_userid " . - "WHERE g.usergroupmember_usergroupid = :query"; + $query .= "JOIN $DB_ROSCMS.roscms_rel_groups_accounts g ON u.id = g.user_id " . + "WHERE g.group_id = :query"; break; case "userid": - $query .= "WHERE u.user_id = :query"; + $query .= "WHERE u.id = :query"; $_GET["query"] = (int)$_GET["query"]; break; @@ -56,7 +56,7 @@ die("<error>Invalid subject!</error>"); } - $query .= " ORDER BY u.user_name ASC"; + $query .= " ORDER BY u.name ASC"; switch($_GET["subject"]) { Modified: branches/danny-web/www/www.reactos.org/peoplemap/ajax-setlocation.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/peoplemap/ajax-setlocation.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/peoplemap/ajax-setlocation.php [iso-8859-1] Tue Apr 21 00:22:12 2009 @@ -25,7 +25,7 @@ } // Get the user ID from the session key - $stmt = $dbh->prepare("SELECT usersession_user_id FROM $DB_ROSCMS.user_sessions WHERE usersession_id = :usersessionid LIMIT 1"); + $stmt = $dbh->prepare("SELECT user_id FROM $DB_ROSCMS.roscms_accounts_sessions WHERE id = :usersessionid LIMIT 1"); $stmt->bindParam(":usersessionid", $_COOKIE["roscmsusrkey"]); $stmt->execute() or die("<error>Query failed #1</error>"); $userid = (int)$stmt->fetchColumn(); @@ -44,7 +44,7 @@ $stmt->execute() or die("<error>Query failed #2</error>"); // We succeeded, return all information about our account - $stmt = $dbh->prepare("SELECT user_name, user_fullname FROM $DB_ROSCMS.users WHERE user_id = :userid LIMIT 1"); + $stmt = $dbh->prepare("SELECT name AS user_name, fullname AS user_fullname FROM $DB_ROSCMS.roscms_accounts WHERE id = :userid LIMIT 1"); $stmt->bindParam(":userid", $userid); $stmt->execute() or die("<error>Query failed #3</error>"); $row = $stmt->fetch(PDO::FETCH_NUM); Modified: branches/danny-web/www/www.reactos.org/peoplemap/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/peoplemap/index.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/peoplemap/index.php [iso-8859-1] Tue Apr 21 00:22:12 2009 @@ -85,10 +85,10 @@ catch(PDOException $e) { // Give no exact error message here, so no server internals are exposed - die("<error>Could not establish the DB connection</error>"); - } - - $stmt = $dbh->query("SELECT COUNT(*) FROM $DB_ROSCMS.users") or die("Query failed #1"); + die("Could not establish the DB connection"); + } + + $stmt = $dbh->query("SELECT COUNT(*) FROM $DB_ROSCMS.roscms_accounts") or die("Query failed #1"); $user_count = (int)$stmt->fetchColumn(); $stmt = $dbh->query("SELECT COUNT(*) FROM $DB_PEOPLEMAP.user_locations") or die("Query failed #2"); @@ -142,7 +142,7 @@ $iconcode = '<script type="text/javascript">'; $iconcode .= 'IconTable = new Object();'; - $stmt = $dbh->query("SELECT usrgroup_name_id, usrgroup_name FROM $DB_ROSCMS.usergroups WHERE usrgroup_visible = 1") or die("Query failed #3"); + $stmt = $dbh->query("SELECT id, name FROM $DB_ROSCMS.roscms_groups WHERE visible = 1") or die("Query failed #3"); while($row = $stmt->fetch(PDO::FETCH_NUM)) { @@ -234,7 +234,7 @@ if($_COOKIE["roscmsusrkey"]) { - $stmt = $dbh->prepare("SELECT usersession_user_id FROM $DB_ROSCMS.user_sessions WHERE usersession_id = :usersessionid LIMIT 1"); + $stmt = $dbh->prepare("SELECT user_id FROM $DB_ROSCMS.roscms_accounts_sessions WHERE id = :usersessionid LIMIT 1"); $stmt->bindParam(":usersessionid", $_COOKIE["roscmsusrkey"]); $stmt->execute() or die("Query failed #4"); $userid = (int)$stmt->fetchColumn();

1 0

[hpoussin] 40613: Implement agnostic architecture for file system access, according to Advanced RISC Computing Specification Version 1.2 Some shortcuts still exist, and will need to be addressed later Use this new API in the NTLDR-style loader
by hpoussin＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: hpoussin Date: Tue Apr 21 00:04:23 2009 New Revision: 40613 URL: http://svn.reactos.org/svn/reactos?rev=40613&view=rev Log: Implement agnostic architecture for file system access, according to Advanced RISC Computing Specification Version 1.2 Some shortcuts still exist, and will need to be addressed later Use this new API in the NTLDR-style loader Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/include/fs.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -395,6 +395,99 @@ MmHeapFree(PartialResourceList); } +typedef struct tagDISKCONTEXT +{ + ULONG DriveNumber; + ULONG SectorSize; + ULONGLONG SectorOffset; + ULONGLONG SectorNumber; +} DISKCONTEXT; + +static LONG DiskClose(ULONG FileId) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + + MmHeapFree(Context); + return ESUCCESS; +} + +static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + return EINVAL; +} + +static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + DISKCONTEXT* Context; + ULONG DriveNumber, DrivePartition, SectorSize; + ULONGLONG SectorOffset = 0; + PARTITION_TABLE_ENTRY PartitionTableEntry; + CHAR FileName[1]; + + if (!DissectArcPath(Path, FileName, &DriveNumber, &DrivePartition)) + return EINVAL; + SectorSize = (DrivePartition == 0xff ? 2048 : 512); + if (DrivePartition != 0xff && DrivePartition != 0) + { + if (!MachDiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) + return EINVAL; + SectorOffset = PartitionTableEntry.SectorCountBeforePartition; + } + + Context = MmHeapAlloc(sizeof(DISKCONTEXT)); + if (!Context) + return ENOMEM; + Context->DriveNumber = DriveNumber; + Context->SectorSize = SectorSize; + Context->SectorOffset = SectorOffset; + Context->SectorNumber = 0; + FsSetDeviceSpecific(*FileId, Context); + + return ESUCCESS; +} + +static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + BOOLEAN ret; + + *Count = 0; + if (N & (Context->SectorSize - 1)) + return EINVAL; + + ret = MachDiskReadLogicalSectors( + Context->DriveNumber, + Context->SectorNumber + Context->SectorOffset, + N / Context->SectorSize, + Buffer); + if (!ret) + return EIO; + + *Count = N; + return ESUCCESS; +} + +static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + + if (SeekMode != SeekAbsolute) + return EINVAL; + if (Position->LowPart & (Context->SectorSize - 1)) + return EINVAL; + + /* FIXME: take HighPart into account */ + Context->SectorNumber = Position->LowPart / Context->SectorSize; + return ESUCCESS; +} + +static const DEVVTBL DiskVtbl = { + DiskClose, + DiskGetFileInformation, + DiskOpen, + DiskRead, + DiskSeek, +}; static VOID SetHarddiskIdentifier(PCONFIGURATION_COMPONENT_DATA DiskKey, @@ -407,6 +500,7 @@ ULONG Signature; CHAR Identifier[20]; CHAR ArcName[256]; + PARTITION_TABLE_ENTRY PartitionTableEntry; /* Read the MBR */ if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) @@ -438,6 +532,21 @@ reactos_arc_disk_info[reactos_disk_count].ArcName = reactos_arc_strings[reactos_disk_count]; reactos_disk_count++; + + sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)partition(0)", DriveNumber - 0x80); + FsRegisterDevice(ArcName, &DiskVtbl); + + /* Add partitions */ + i = 0; + while (MachDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) + { + if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) + { + sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)partition(%lu)", DriveNumber - 0x80, i); + FsRegisterDevice(ArcName, &DiskVtbl); + } + i++; + } /* Convert checksum and signature to identifier string */ Identifier[0] = Hex[(Checksum >> 28) & 0x0F]; @@ -776,6 +885,9 @@ SetHarddiskConfigurationData(DiskKey, 0x80 + i); SetHarddiskIdentifier(DiskKey, 0x80 + i); } + + /* Also add one cdrom drive */ + FsRegisterDevice("multi(0)disk(0)cdrom(224)", &DiskVtbl); } static VOID Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -26,6 +26,8 @@ MachInit(CmdLine); + FsInit(); + DebugInit(); DPRINTM(DPRINT_WARNING, "BootMain() called.\n"); Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -319,3 +319,279 @@ DPRINTM(DPRINT_FILESYSTEM, "FatGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); } + +LONG CompatFsClose(ULONG FileId) +{ + PFILE FileHandle = FsGetDeviceSpecific(FileId); + + FsCloseFile(FileHandle); + return ESUCCESS; +} + +LONG CompatFsGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + PFILE FileHandle = FsGetDeviceSpecific(FileId); + + memset(Information, 0, sizeof(FILEINFORMATION)); + Information->EndingAddress.LowPart = FsGetFileSize(FileHandle); + Information->CurrentAddress.LowPart = FsGetFilePointer(FileHandle); + return ESUCCESS; +} + +LONG CompatFsOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + PFILE FileHandle; + static BOOLEAN bVolumeOpened = FALSE; + + if (!bVolumeOpened) + { + bVolumeOpened = FsOpenBootVolume(); + if (!bVolumeOpened) + return EIO; + } + + FileHandle = FsOpenFile(Path); + if (!FileHandle) + return EIO; + FsSetDeviceSpecific(*FileId, FileHandle); + return ESUCCESS; +} + +LONG CompatFsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + PFILE FileHandle = FsGetDeviceSpecific(FileId); + BOOLEAN ret; + + ret = FsReadFile(FileHandle, N, Count, Buffer); + return (ret ? ESUCCESS : EFAULT); +} + +LONG CompatFsSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + PFILE FileHandle = FsGetDeviceSpecific(FileId); + + if (SeekMode != SeekAbsolute) + return EINVAL; + + FsSetFilePointer(FileHandle, Position->LowPart); + return ESUCCESS; +} + +const DEVVTBL CompatFsFuncTable = { + CompatFsClose, + CompatFsGetFileInformation, + CompatFsOpen, + CompatFsRead, + CompatFsSeek, +}; + +#define MAX_FDS 20 +typedef struct tagFILEDATA +{ + ULONG DeviceId; + ULONG ReferenceCount; + const DEVVTBL* FuncTable; + const DEVVTBL* FileFuncTable; + VOID* Specific; +} FILEDATA; + +typedef struct tagDEVICE +{ + LIST_ENTRY ListEntry; + const DEVVTBL* FuncTable; + CHAR* Prefix; + ULONG DeviceId; + ULONG ReferenceCount; +} DEVICE; + +static FILEDATA FileData[MAX_FDS]; +static LIST_ENTRY DeviceListHead; + +LONG ArcClose(ULONG FileId) +{ + LONG ret; + + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return EBADF; + + ret = FileData[FileId].FuncTable->Close(FileId); + + if (ret == ESUCCESS) + { + FileData[FileId].FuncTable = NULL; + FileData[FileId].Specific = NULL; + } + return ret; +} + +LONG ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return EBADF; + return FileData[FileId].FuncTable->GetFileInformation(FileId, Information); +} + +LONG ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + ULONG i, ret; + PLIST_ENTRY pEntry; + DEVICE* pDevice; + CHAR* DeviceName; + CHAR* FileName; + CHAR* p; + CHAR* q; + ULONG dwCount, dwLength; + OPENMODE DeviceOpenMode; + ULONG DeviceId; + + *FileId = MAX_FDS; + + /* Search last ')', which delimits device and path */ + FileName = strrchr(Path, ')'); + if (!FileName) + return EINVAL; + FileName++; + + /* Count number of "()", which needs to be replaced by "(0)" */ + dwCount = 0; + for (p = Path; p != FileName; p++) + if (*p == '(' && *(p + 1) == ')') + dwCount++; + + /* Duplicate device name, and replace "()" by "(0)" (if required) */ + dwLength = FileName - Path + dwCount; + if (dwCount != 0) + { + DeviceName = MmHeapAlloc(FileName - Path + dwCount); + if (!DeviceName) + return ENOMEM; + for (p = Path, q = DeviceName; p != FileName; p++) + { + *q++ = *p; + if (*p == '(' && *(p + 1) == ')') + *q++ = '0'; + } + } + else + DeviceName = Path; + + /* Search for the device */ + pEntry = DeviceListHead.Flink; + if (OpenMode == OpenReadOnly || OpenMode == OpenWriteOnly) + DeviceOpenMode = OpenMode; + else + DeviceOpenMode = OpenReadWrite; + while (pEntry != &DeviceListHead) + { + pDevice = CONTAINING_RECORD(pEntry, DEVICE, ListEntry); + if (strncmp(pDevice->Prefix, DeviceName, dwLength) == 0) + { + /* OK, device found. It is already opened? */ + if (pDevice->ReferenceCount == 0) + { + /* Search some room for the device */ + for (DeviceId = 0; DeviceId < MAX_FDS; DeviceId++) + if (!FileData[DeviceId].FuncTable) + break; + if (DeviceId == MAX_FDS) + return EMFILE; + /* Try to open the device */ + FileData[DeviceId].FuncTable = pDevice->FuncTable; + ret = pDevice->FuncTable->Open(pDevice->Prefix, DeviceOpenMode, &DeviceId); + if (ret != ESUCCESS) + { + FileData[DeviceId].FuncTable = NULL; + return ret; + } + + /* Try to detect the file system */ + /* FIXME: we link there to old infrastructure... */ + FileData[DeviceId].FileFuncTable = &CompatFsFuncTable; + + pDevice->DeviceId = DeviceId; + } + else + { + DeviceId = pDevice->DeviceId; + } + pDevice->ReferenceCount++; + break; + } + pEntry = pEntry->Flink; + } + if (pEntry == &DeviceListHead) + return ENODEV; + + /* At this point, device is found and opened. Its file id is stored + * in DeviceId, and FileData[DeviceId].FileFuncTable contains what + * needs to be called to open the file */ + + /* Search some room for the device */ + for (i = 0; i < MAX_FDS; i++) + if (!FileData[i].FuncTable) + break; + if (i == MAX_FDS) + return EMFILE; + + /* Open the file */ + FileData[i].FuncTable = FileData[DeviceId].FileFuncTable; + *FileId = i; + ret = FileData[i].FuncTable->Open(FileName, OpenMode, FileId); + if (ret != ESUCCESS) + { + FileData[i].FuncTable = NULL; + *FileId = MAX_FDS; + } + return ret; +} + +LONG ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return EBADF; + return FileData[FileId].FuncTable->Read(FileId, Buffer, N, Count); +} + +LONG ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return EBADF; + return FileData[FileId].FuncTable->Seek(FileId, Position, SeekMode); +} + +VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) +{ + DEVICE* pNewEntry; + ULONG dwLength; + + dwLength = strlen(Prefix) + 1; + pNewEntry = MmHeapAlloc(sizeof(DEVICE) + dwLength); + if (!pNewEntry) + return; + pNewEntry->FuncTable = FuncTable; + pNewEntry->ReferenceCount = 0; + pNewEntry->Prefix = (CHAR*)(pNewEntry + 1); + memcpy(pNewEntry->Prefix, Prefix, dwLength); + + InsertHeadList(&DeviceListHead, &pNewEntry->ListEntry); +} + +VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return; + FileData[FileId].Specific = Specific; +} + +VOID* FsGetDeviceSpecific(ULONG FileId) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return NULL; + return FileData[FileId].Specific; +} + +VOID FsInit(VOID) +{ + memset(FileData, 0, sizeof(FileData)); + InitializeListHead(&DeviceListHead); +} Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -20,6 +20,14 @@ #ifndef __FS_H #define __FS_H +typedef struct tagDEVVTBL +{ + ARC_CLOSE Close; + ARC_GET_FILE_INFORMATION GetFileInformation; + ARC_OPEN Open; + ARC_READ Read; + ARC_SEEK Seek; +} DEVVTBL; //#define EOF -1 @@ -32,6 +40,17 @@ #define FILE VOID #define PFILE FILE * + +VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable); +VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); +VOID* FsGetDeviceSpecific(ULONG FileId); +VOID FsInit(VOID); + +LONG ArcClose(ULONG FileId); +LONG ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information); +LONG ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); +LONG ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); +LONG ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); VOID FileSystemError(PCSTR ErrorString); BOOLEAN FsOpenBootVolume(); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -26,6 +26,10 @@ #ifndef __MEMORY_H #include "mm.h" +#endif + +#ifndef __FS_H +#include "fs.h" #endif typedef enum tagVIDEODISPLAYMODE Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -255,14 +255,15 @@ TYPE_OF_MEMORY MemoryType, OUT PVOID *ImageBasePA) { - PFILE FileHandle; + ULONG FileId; PVOID PhysicalBase; PVOID VirtualBase = NULL; UCHAR HeadersBuffer[SECTOR_SIZE * 2]; PIMAGE_NT_HEADERS NtHeaders; PIMAGE_SECTION_HEADER SectionHeader; ULONG VirtualSize, SizeOfRawData, NumberOfSections; - BOOLEAN Status; + LONG Status; + LARGE_INTEGER Position; ULONG i, BytesRead; CHAR ProgressString[256]; @@ -272,22 +273,19 @@ UiDrawProgressBarCenter(1, 100, ProgressString); /* Open the image file */ - FileHandle = FsOpenFile(FileName); - - if (FileHandle == NULL) - { - //Print(L"Can not open the file %s\n",FileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); + if (Status != ESUCCESS) + { UiMessageBox("Can not open the file"); return FALSE; } /* Load the first 2 sectors of the image so we can read the PE header */ - Status = FsReadFile(FileHandle, SECTOR_SIZE * 2, NULL, HeadersBuffer); - if (!Status) - { - //Print(L"Error reading from file %s\n", FileName); + Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); + if (Status != ESUCCESS) + { UiMessageBox("Error reading from file"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } @@ -298,7 +296,7 @@ { //Print(L"Error - no NT header found in %s\n", FileName); UiMessageBox("Error - no NT header found"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } @@ -307,7 +305,7 @@ { //Print(L"Not an executable image %s\n", FileName); UiMessageBox("Not an executable image"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } @@ -329,7 +327,7 @@ { //Print(L"Failed to alloc pages for image %s\n", FileName); UiMessageBox("Failed to alloc pages for image"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } } @@ -340,15 +338,22 @@ DPRINTM(DPRINT_PELOADER, "Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); /* Set to 0 position and fully load the file image */ - FsSetFilePointer(FileHandle, 0); - - Status = FsReadFile(FileHandle, NtHeaders->OptionalHeader.SizeOfHeaders, NULL, PhysicalBase); - - if (!Status) + Position.HighPart = Position.LowPart = 0; + Status = ArcSeek(FileId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + { + UiMessageBox("Error seeking to start of file"); + ArcClose(FileId); + return FALSE; + } + + Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); + + if (Status != ESUCCESS) { //Print(L"Error reading headers %s\n", FileName); UiMessageBox("Error reading headers"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } @@ -388,14 +393,15 @@ if (SizeOfRawData != 0) { /* Seek to the correct position */ - FsSetFilePointer(FileHandle, SectionHeader->PointerToRawData); + Position.LowPart = SectionHeader->PointerToRawData; + Status = ArcSeek(FileId, &Position, SeekAbsolute); DPRINTM(DPRINT_PELOADER, "SH->VA: 0x%X\n", SectionHeader->VirtualAddress); /* Read this section from the file, size = SizeOfRawData */ - Status = FsReadFile(FileHandle, SizeOfRawData, &BytesRead, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress); - - if (!Status && (BytesRead == 0)) + Status = ArcRead(FileId, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress, SizeOfRawData, &BytesRead); + + if (Status != ESUCCESS) { DPRINTM(DPRINT_PELOADER, "WinLdrLoadImage(): Error reading section from file!\n"); break; @@ -413,10 +419,10 @@ } /* We are done with the file - close it */ - FsCloseFile(FileHandle); + ArcClose(FileId); /* If loading failed - return right now */ - if (!Status) + if (Status != ESUCCESS) return FALSE; @@ -425,7 +431,7 @@ { DPRINTM(DPRINT_PELOADER, "Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase); - Status = (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, + return (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, "FreeLdr", TRUE, @@ -433,7 +439,7 @@ FALSE); } - return Status; + return TRUE; } /* PRIVATE FUNCTIONS *******************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -161,7 +161,6 @@ LPCSTR BootOptions; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; - ULONG BootDevice; ULONG i, ErrorLine; HINF InfHandle; INFCONTEXT InfContext; @@ -188,10 +187,11 @@ NULL }; - /* Get boot device number */ - MachDiskGetBootDevice(&BootDevice); + /* Try to open system drive */ + FsOpenBootVolume(); /* Open 'txtsetup.sif' from any of source paths */ + MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++) { SourcePath = SourcePaths[i]; @@ -200,14 +200,13 @@ printf("Failed to open 'txtsetup.sif'\n"); return; } - sprintf(FileName,"%s\\txtsetup.sif", SourcePath); + sprintf(FileName, "%s\\txtsetup.sif", SourcePath); if (InfOpenFile (&InfHandle, FileName, &ErrorLine)) + { + sprintf(BootPath, "%s%s\\", SystemPath, SourcePath); break; - } - - /* If we didn't find it anywhere, then just use root */ - if (!*SourcePath) - SourcePath = "\\"; + } + } /* Load options */ if (!InfFindFirstLine(InfHandle, @@ -225,9 +224,6 @@ return; } - /* Save source path */ - strcpy(BootPath, SourcePath); - SetupUiInitialize(); UiDrawStatusText(""); UiDrawStatusText("Detecting Hardware..."); @@ -235,18 +231,8 @@ /* Let user know we started loading */ UiDrawStatusText("Loading..."); - /* Try to open system drive */ - FsOpenBootVolume(); - - /* Append a backslash to the bootpath if needed */ - if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') - { - strcat(BootPath, "\\"); - } - /* Construct the system path */ - MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); - strcat(SystemPath, SourcePath); + sprintf(SystemPath, "%s\\", SourcePath); DPRINTM(DPRINT_WINDOWS,"SystemRoot: '%s', SystemPath: '%s'\n", BootPath, SystemPath); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -374,10 +374,12 @@ PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, TYPE_OF_MEMORY MemoryType) { - PFILE FileHandle; + ULONG FileId; PVOID PhysicalBase; + FILEINFORMATION FileInfo; ULONG FileSize; - BOOLEAN Status; + ULONG Status; + ULONG BytesRead; //CHAR ProgressString[256]; @@ -389,38 +391,40 @@ *Size = 0; /* Open the image file */ - FileHandle = FsOpenFile(ModuleName); - - if (FileHandle == NULL) + Status = ArcOpen((PCHAR)ModuleName, OpenReadOnly, &FileId); + if (Status != ESUCCESS) { /* In case of errors, we just return, without complaining to the user */ return NULL; } /* Get this file's size */ - FileSize = FsGetFileSize(FileHandle); + Status = ArcGetFileInformation(FileId, &FileInfo); + if (Status != ESUCCESS) + { + ArcClose(FileId); + return NULL; + } + FileSize = FileInfo.EndingAddress.LowPart; *Size = FileSize; /* Allocate memory */ PhysicalBase = MmAllocateMemoryWithType(FileSize, MemoryType); if (PhysicalBase == NULL) { - FsCloseFile(FileHandle); + ArcClose(FileId); return NULL; } /* Load whole file */ - Status = FsReadFile(FileHandle, FileSize, NULL, PhysicalBase); - if (!Status) - { - FsCloseFile(FileHandle); + Status = ArcRead(FileId, PhysicalBase, FileSize, &BytesRead); + ArcClose(FileId); + if (Status != ESUCCESS) + { return NULL; } DPRINTM(DPRINT_WINDOWS, "Loaded %s at 0x%x with size 0x%x\n", ModuleName, PhysicalBase, FileSize); - - /* We are done with the file - close it */ - FsCloseFile(FileHandle); return PhysicalBase; } @@ -437,7 +441,6 @@ PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; ULONG SectionId; - ULONG BootDevice; PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; KERNEL_ENTRY_POINT KiSystemStartup; PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL; @@ -476,25 +479,19 @@ strcpy(BootOptions, ""); } - /* Normalize system path */ - if (!MachDiskNormalizeSystemPath(SystemPath, sizeof(SystemPath))) - { - UiMessageBox("Invalid system path"); - return; + /* Special case for LiveCD */ + if (!_strnicmp(SystemPath, "LiveCD", strlen("LiveCD"))) + { + strcpy(BootPath, SystemPath + strlen("LiveCD")); + MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); + strcat(SystemPath, BootPath); } /* Let user know we started loading */ UiDrawStatusText("Loading..."); - /* Try to open system drive */ - BootDevice = 0xffffffff; - if (!FsOpenSystemVolume(SystemPath, BootPath, &BootDevice)) - { - UiMessageBox("Failed to open boot drive."); - return; - } - /* append a backslash */ + strcpy(BootPath, SystemPath); if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') strcat(BootPath, "\\"); Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -42,34 +42,37 @@ IN LPCSTR DirectoryPath, IN LPCSTR HiveName) { - PFILE FileHandle; + ULONG FileId; CHAR FullHiveName[256]; - BOOLEAN Status; + LONG Status; + FILEINFORMATION FileInfo; ULONG HiveFileSize; ULONG_PTR HiveDataPhysical; PVOID HiveDataVirtual; + ULONG BytesRead; /* Concatenate path and filename to get the full name */ strcpy(FullHiveName, DirectoryPath); strcat(FullHiveName, HiveName); //Print(L"Loading %s...\n", FullHiveName); - FileHandle = FsOpenFile(FullHiveName); - - if (FileHandle == NULL) + Status = ArcOpen(FullHiveName, OpenReadOnly, &FileId); + + if (Status != ESUCCESS) { UiMessageBox("Opening hive file failed!"); return FALSE; } /* Get the file length */ - HiveFileSize = FsGetFileSize(FileHandle); - - if (HiveFileSize == 0) - { - FsCloseFile(FileHandle); + Status = ArcGetFileInformation(FileId, &FileInfo); + + if (Status != ESUCCESS) + { + ArcClose(FileId); UiMessageBox("Hive file has 0 size!"); return FALSE; } + HiveFileSize = FileInfo.EndingAddress.LowPart; /* Round up the size to page boundary and alloc memory */ HiveDataPhysical = (ULONG_PTR)MmAllocateMemoryWithType( @@ -78,7 +81,7 @@ if (HiveDataPhysical == 0) { - FsCloseFile(FileHandle); + ArcClose(FileId); UiMessageBox("Unable to alloc memory for a hive!"); return FALSE; } @@ -91,9 +94,9 @@ LoaderBlock->RegistryBase = HiveDataVirtual; /* Finally read from file to the memory */ - Status = FsReadFile(FileHandle, HiveFileSize, NULL, (PVOID)HiveDataPhysical); - FsCloseFile(FileHandle); - if (!Status) + Status = ArcRead(FileId, (PVOID)HiveDataPhysical, HiveFileSize, &BytesRead); + ArcClose(FileId); + if (Status != ESUCCESS) { UiMessageBox("Unable to read from hive file!"); return FALSE; @@ -272,14 +275,16 @@ IN LPCSTR LanguageFileName) { CHAR FileName[255]; - PFILE AnsiFileHandle; - PFILE OemFileHandle; - PFILE LanguageFileHandle; + ULONG AnsiFileId; + ULONG OemFileId; + ULONG LanguageFileId; ULONG AnsiFileSize, OemFileSize, LanguageFileSize; ULONG TotalSize; ULONG_PTR NlsDataBase; PVOID NlsVirtual; - BOOLEAN Status, AnsiEqualsOem = FALSE; + BOOLEAN AnsiEqualsOem = FALSE; + FILEINFORMATION FileInfo; + ULONG BytesRead, Status; /* There may be a case, when OEM and ANSI page coincide */ if (!strcmp(AnsiFileName, OemFileName)) @@ -289,14 +294,17 @@ //Print(L"Loading %s...\n", Filename); strcpy(FileName, DirectoryPath); strcat(FileName, AnsiFileName); - AnsiFileHandle = FsOpenFile(FileName); - - if (AnsiFileHandle == NULL) - goto Failure; - - AnsiFileSize = FsGetFileSize(AnsiFileHandle); + Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); + + if (Status != ESUCCESS) + goto Failure; + + Status = ArcGetFileInformation(AnsiFileId, &FileInfo); + if (Status != ESUCCESS) + goto Failure; + AnsiFileSize = FileInfo.EndingAddress.LowPart; DPRINTM(DPRINT_WINDOWS, "AnsiFileSize: %d\n", AnsiFileSize); - FsCloseFile(AnsiFileHandle); + ArcClose(AnsiFileId); /* Open OEM file and store its length */ if (AnsiEqualsOem) @@ -308,13 +316,16 @@ //Print(L"Loading %s...\n", Filename); strcpy(FileName, DirectoryPath); strcat(FileName, OemFileName); - OemFileHandle = FsOpenFile(FileName); - - if (OemFileHandle == NULL) + Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); + + if (Status != ESUCCESS) goto Failure; - OemFileSize = FsGetFileSize(OemFileHandle); - FsCloseFile(OemFileHandle); + Status = ArcGetFileInformation(OemFileId, &FileInfo); + if (Status != ESUCCESS) + goto Failure; + OemFileSize = FileInfo.EndingAddress.LowPart; + ArcClose(OemFileId); } DPRINTM(DPRINT_WINDOWS, "OemFileSize: %d\n", OemFileSize); @@ -322,13 +333,16 @@ //Print(L"Loading %s...\n", Filename); strcpy(FileName, DirectoryPath); strcat(FileName, LanguageFileName); - LanguageFileHandle = FsOpenFile(FileName); - - if (LanguageFileHandle == NULL) - goto Failure; - - LanguageFileSize = FsGetFileSize(LanguageFileHandle); - FsCloseFile(LanguageFileHandle); + Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); + + if (Status != ESUCCESS) + goto Failure; + + Status = ArcGetFileInformation(LanguageFileId, &FileInfo); + if (Status != ESUCCESS) + goto Failure; + LanguageFileSize = FileInfo.EndingAddress.LowPart; + ArcClose(LanguageFileId); DPRINTM(DPRINT_WINDOWS, "LanguageFileSize: %d\n", LanguageFileSize); /* Sum up all three length, having in mind that every one of them @@ -361,50 +375,50 @@ /* Now actually read the data into memory, starting with Ansi file */ strcpy(FileName, DirectoryPath); strcat(FileName, AnsiFileName); - AnsiFileHandle = FsOpenFile(FileName); - - if (AnsiFileHandle == NULL) - goto Failure; - - Status = FsReadFile(AnsiFileHandle, AnsiFileSize, NULL, VaToPa(LoaderBlock->NlsData->AnsiCodePageData)); - - if (!Status) - goto Failure; - - FsCloseFile(AnsiFileHandle); + Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); + + if (Status != ESUCCESS) + goto Failure; + + Status = ArcRead(AnsiFileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); + + if (Status != ESUCCESS) + goto Failure; + + ArcClose(AnsiFileId); /* OEM now, if it doesn't equal Ansi of course */ if (!AnsiEqualsOem) { strcpy(FileName, DirectoryPath); strcat(FileName, OemFileName); - OemFileHandle = FsOpenFile(FileName); - - if (OemFileHandle == NULL) + Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); + + if (Status != ESUCCESS) goto Failure; - Status = FsReadFile(OemFileHandle, OemFileSize, NULL, VaToPa(LoaderBlock->NlsData->OemCodePageData)); - - if (!Status) + Status = ArcRead(OemFileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); + + if (Status != ESUCCESS) goto Failure; - FsCloseFile(OemFileHandle); + ArcClose(OemFileId); } /* finally the language file */ strcpy(FileName, DirectoryPath); strcat(FileName, LanguageFileName); - LanguageFileHandle = FsOpenFile(FileName); - - if (LanguageFileHandle == NULL) - goto Failure; - - Status = FsReadFile(LanguageFileHandle, LanguageFileSize, NULL, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData)); - - if (!Status) - goto Failure; - - FsCloseFile(LanguageFileHandle); + Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); + + if (Status != ESUCCESS) + goto Failure; + + Status = ArcRead(LanguageFileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); + + if (Status != ESUCCESS) + goto Failure; + + ArcClose(LanguageFileId); // // THIS IS HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACK

1 0

[mkupfer] 40612: - changelog template generator for wiki changelog page - creates a complete changelog for the given xml file and try to put all entries in the best fitting section - the section file needs update to represent the whole wiki page structure - entries which don't fit (due to different paths) to a section are collected in "uncategorized" section
by mkupfer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: mkupfer Date: Mon Apr 20 23:41:48 2009 New Revision: 40612 URL: http://svn.reactos.org/svn/reactos?rev=40612&view=rev Log: - changelog template generator for wiki changelog page - creates a complete changelog for the given xml file and try to put all entries in the best fitting section - the section file needs update to represent the whole wiki page structure - entries which don't fit (due to different paths) to a section are collected in "uncategorized" section Added: trunk/tools/changelog/ trunk/tools/changelog/autocl.py (with props) trunk/tools/changelog/sections (with props) Added: trunk/tools/changelog/autocl.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/changelog/autocl.py?rev=4061… ============================================================================== --- trunk/tools/changelog/autocl.py (added) +++ trunk/tools/changelog/autocl.py [iso-8859-1] Mon Apr 20 23:41:48 2009 @@ -1,0 +1,172 @@ +#!/usr/bin/python + +# Creates basic changelog wiki page from svn log +# - argument is the generated xml log file with log entries +# created by 'svn log -v --xml -r revision1:revision2 repository' +# - needs internet access for retrieving the author names from wiki +# (http://www.reactos.org/wiki/index.php?title=Developer_Roles&action=edit) +# - needs a section file 'sections' +# this file contains all generated wiki-sections and the according paths +# to assign the log messages correctly +# +# (c) Matthias Kupfer 2009 + +import xml.sax # for the parser +import sys # for system functions +import string # for string operations +import re # for regular expressions +import time # for sorting +import urllib # for downloading the developer wiki page + +class XMLLogParser: + class XMLLogHandler(xml.sax.handler.ContentHandler): + __logentries = [] # log entries list + __logentry = {} + def startElement(self, name, attrs): + "Process all start tags." + self.__data = '' + attr = {} # temporary dictionary of attributes + for i in attrs.items(): # iterate over all attributes + tmp = i[1] # save attribute value + if tmp: # if value exists + tmp = tmp.encode('utf-8') # encode as utf-8 + attr[i[0].encode('utf-8')] = tmp # encode attribute name too + if name == 'logentry': + # save the log entry revision number (currently unused) + self.__logentry["revision"] = attr.get("revision") + elif name == 'paths': + # collect files and paths + self.__logentry["paths"] = [] # reset path + elif name == 'path': + # save file or path attributes + self.__pathattr = (attr.get("action"), + attr.get("copyfrom-path"), + attrs.get("copyfrom-rev")) # copy path attributes + def endElement(self, name): + "Process all end tags." + if name == 'logentry': + # append the created log entry and clear the temporary one + self.__logentries.append(self.__logentry) + self.__logentry = {} # clear current log entry + elif name == 'author': + # save the author name in the current log entry + self.__logentry["author"] = self.__data # copy author + elif name == 'date': + # extract timestamp and save it in the current log entry + m = re.match(r"(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):" \ + "(\d{2})\.(\d{6})Z", self.__data) # regular expression for time + self.__logentry["time"] = time.mktime((int(m.group(1)), + int(m.group(2)), int(m.group(3)), int(m.group(4)), + int(m.group(5)), int(m.group(6)), -1, -1, -1)) + \ + (float("0."+m.group(7))) # build time entry + elif name == 'path': + # append a file or path entry to current log entry + self.__logentry["paths"].append((self.__data, self.__pathattr)) + elif name == 'msg': + # save message in current log entry + self.__logentry["msg"] = self.__data + def characters(self, ch): + "Save character data." + self.__data += ch.encode('utf-8') + def get_entry_list(self): + "Sort created list by revision in ascending order." + self.__logentries.sort(lambda x,y : cmp(y["revision"], x["revision"])) + return self.__logentries + __Handler = XMLLogHandler() # instance of content handler + get_entry_list = __Handler.get_entry_list + def __init__(self, file = None): + "Create a XML parser, set content handler and load the file." + self.parser = xml.sax.make_parser() # create a xml parser + self.parser.setContentHandler(self.__Handler) # set content handler + if file: + self.load(file) + def load(self, file): + "Parse a file." + self.parser.parse(file) # parse file + +def get_common_part(paths): + "returns the longest common path part of all file entries" + index = 0 # length + mypaths = [] # list of all paths + for i in paths: # extract all path from list + mypaths.append(i[0][0:string.rfind(i[0],'/')]) + if len(mypaths) == 1: # if only one path + return mypaths[0] # the return the whole path + else: + cmp = mypaths[0] # set first path for comparison + while index < len(cmp): + isequal = True + for i in mypaths[1:]: # for all remaining paths + if index >= len(i) or i[index] != cmp[index]: + isequal = False + break + if isequal == True: # if equal then next character + index += 1 + else: # else finish + break; + return cmp[0:index] + +def find_section(i,sections): + "find the best fitting (longest path) section" + section = "" # no section found + path = "" # no path + for k in sections.keys(): # iterate over all section paths + if i.startswith(k) and len(k) > len(path): # if i starts with path and + #is longer then the previous path then update path and section + section = sections[k] + path = k + return section # return wiki section name + +if __name__ == '__main__': + if len(sys.argv) != 2: + print "This script generates a template for the wiki changelog" + print + print "Syntax: %s <svn-log-xml-file>" % sys.argv[0] + print "log file should be created with:" + print "svn log -v --xml [-r revision1:revision2] repository > svn-log-xml-file" + exit(1) + sec_order = [] # list for the sections (to preserve) order + authors = {} # dictionary for commit name -> real names + sections = {} # dictionary for path -> sections + messages = {} # dictionary for section -> log messages + author = urllib.urlopen("http://www.reactos.org/wiki/index.php?title=Developer_Roles&action=edit").readlines() + for i in author: + m = re.match("^.*\[\[(.*)\]\].*\|\|[^|]*\|\|\s([^ ]*)\s\|\|.*$",i) + if m: + authors[m.group(2)] = m.group(1) # fill author dictionary + section = open('sections').readlines() # read sections + for i in section: + m = re.match("^(/.*?) (.*)$",i) + if m: + sections[m.group(1)] = m.group(2) # fill section dictionary + sec_order.append(m.group(2)) # and section list + log = XMLLogParser(sys.argv[1]) # read log entries + for i in log.get_entry_list(): + lns = [] + lines = string.split(i['msg'],'\n'); + for k in lines: + m = re.match(r"^\s*[-*]*\s*(.*)\s*$",k) + if m: + l = string.strip(m.group(1)) + if len(l) > 0: + lns.append(l) + msg = string.join(lns) + author = authors[i['author']] + if not i.has_key('paths'): + print "Error: no path information found" + print "Did you really use the option '-v' in 'svn log'?" + print "Can't create template without path information" + exit(1) + path = get_common_part(i['paths']) + this_section = find_section(path,sections) + if messages.has_key(this_section): + messages[this_section].append((msg,author)) + else: + messages[this_section] = [(msg,author)] + for i in sec_order: + print i + if messages.has_key(i): + for k in messages[i]: + print '*',k[0],'([['+k[1]+']])' + +# vim: set ts=4 sw=4: Propchange: trunk/tools/changelog/autocl.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/changelog/autocl.py ------------------------------------------------------------------------------ svn:executable = * Added: trunk/tools/changelog/sections URL: http://svn.reactos.org/svn/reactos/trunk/tools/changelog/sections?rev=40612… ============================================================================== --- trunk/tools/changelog/sections (added) +++ trunk/tools/changelog/sections [iso-8859-1] Mon Apr 20 23:41:48 2009 @@ -1,0 +1,42 @@ +This file contains the sections for the wiki page +every line that doens't start with '/' is ignored +the line consist of 2 parts: path wiki-header + +This file is fairly incomplete, please add path information step by step! + +/trunk/reactos/boot/freeldr == Bootloader (FreeLoader) == +/trunk/reactos/ntoskrnl == Kernel and Executive (NTOSKRNL) == +/trunk/reactos/ntoskrnl/cc === CC === +/trunk/reactos/ntoskrnl/cm === CM === +/trunk/reactos/ntoskrnl/dbgk === DBGK === +/trunk/reactos/ntoskrnl/ex === EX === +/trunk/reactos/ntoskrnl/io === IO === +/trunk/reactos/ntoskrnl/kd === KD === +/trunk/reactos/ntoskrnl/mm === MM === +/trunk/reactos/dll/cpl == CPL == +/trunk/reactos/subsystems == Subsystems == +/trunk/reactos/drivers == Kernel Mode Drivers == +/trunk/reactos/drivers/bus/acpi === ACPI === +/trunk/reactos/drivers/network/afd === AFD === +/trunk/reactos/drivers/bus/filesystems/cdfs === CDFS === +/trunk/reactos/drivers/bus/filesystems/ext2 === EXT2 === +/trunk/reactos/drivers/bus/filesystems/fastfat === FASTFAT === +/trunk/reactos/drivers/bus/filesystems/fs_rec === FS_REC === +/trunk/reactos/drivers/bus/filesystems/npfs === NPFS === +/trunk/reactos/drivers/bus/usb === USB === +/trunk/reactos/dll/ntdll == NT System Library (NTDLL) == +/trunk/reactos/dll/keyboard === Keyboard Layouts === +/trunk/reactos/base/setup == Setup == +/trunk/reactos/base/setup/usetup === USETUP === +/trunk/reactos/subsystems == Win32™ Personality == +/trunk/reactos/subsystems/win32/csrss === User mode subsystem (CSRSS) === +/trunk/reactos/subsystems/win32/win32k === Kernel-mode subsystem Server (Win32K) === +/trunk/reactos/dll/cpl == Control panel applets == +/trunk/reactos/dll/cpl/appwiz === APPWIZ === +/trunk/reactos/dll/cpl/desk === DESKTOP === +/trunk/reactos/dll/cpl/intl === INTL === +/trunk/reactos/dll/cpl/sysdm === SYSDM === +/trunk/reactos/dll/cpl/timedate === TIMEDATE === +/trunk/reactos/base/applications == Win32™ Applications == +/trunk/reactos/base/dll/win32 == Win32™ Libraries == +/trunk/reactos == uncategorized == Propchange: trunk/tools/changelog/sections ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 40611: Sync to trunk r40610
by tkreuzer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: tkreuzer Date: Mon Apr 20 23:32:39 2009 New Revision: 40611 URL: http://svn.reactos.org/svn/reactos?rev=40611&view=rev Log: Sync to trunk r40610 Added: branches/ros-amd64-bringup/reactos/base/applications/write/lang/es-ES.rc - copied unchanged from r40600, trunk/reactos/base/applications/write/lang/es-ES.rc branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c - copied unchanged from r40600, trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c - copied unchanged from r40600, trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c Removed: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/Makefile.in branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifile.spec Modified: branches/ros-amd64-bringup/reactos/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/calc/calc.h branches/ros-amd64-bringup/reactos/base/applications/calc/calc.rbuild branches/ros-amd64-bringup/reactos/base/applications/calc/lang/bg-BG.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/cs-CZ.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/de-DE.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/el-GR.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/en-US.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/es-ES.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/fr-FR.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/it-IT.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ko-KR.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/nl-NL.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/no-NO.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/pl-PL.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ru-RU.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/sk-SK.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/th-TH.rc branches/ros-amd64-bringup/reactos/base/applications/calc/lang/uk-UA.rc branches/ros-amd64-bringup/reactos/base/applications/calc/resource.rc branches/ros-amd64-bringup/reactos/base/applications/calc/rpn.c branches/ros-amd64-bringup/reactos/base/applications/calc/rpn_mpfr.c branches/ros-amd64-bringup/reactos/base/applications/calc/whatsnew.txt branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c branches/ros-amd64-bringup/reactos/base/applications/calc/wmmsg.h branches/ros-amd64-bringup/reactos/base/applications/downloader/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/fontview/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/magnify/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/winver/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/write/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/write/lang/no-NO.rc (props changed) branches/ros-amd64-bringup/reactos/base/applications/write/rsrc.rc branches/ros-amd64-bringup/reactos/base/services/telnetd/ (props changed) branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.rbuild branches/ros-amd64-bringup/reactos/base/setup/reactos/lang/es-ES.rc branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/ja-JP.h branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/zh-CN.h branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/zh-TW.h branches/ros-amd64-bringup/reactos/base/setup/usetup/muifonts.h branches/ros-amd64-bringup/reactos/base/setup/usetup/muilanguages.h branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c branches/ros-amd64-bringup/reactos/base/setup/usetup/settings.c branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_arm.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_i386.inf branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/de-DE.rc branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/es-ES.rc branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/no-NO.rc branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/ru-RU.rc branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/lang/es-ES.rc branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/rsrc.rc branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/d3d8_private.h branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/device.c branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/directx.c branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/indexbuffer.c branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/vertexbuffer.c branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/d3d9_private.h branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/device.c branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/directx.c branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/indexbuffer.c branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/vertexbuffer.c branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw_private.h branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/device.c branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/direct3d.c branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/surface.c branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/vertexbuffer.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/arb_program_shader.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/baseshader.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/buffer.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/device.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/directx.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/drawprim.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/glsl_shader.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/pixelshader.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/state.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/stateblock.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/utils.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/vertexshader.c branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_gl.h branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.c (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rbuild (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rc (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.spec (props changed) branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c branches/ros-amd64-bringup/reactos/dll/win32/avifil32/api.c branches/ros-amd64-bringup/reactos/dll/win32/avifil32/getframe.c branches/ros-amd64-bringup/reactos/dll/win32/avifil32/wavfile.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/output.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/profile.c branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c branches/ros-amd64-bringup/reactos/dll/win32/newdev/newdev.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/caret.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/context.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.h branches/ros-amd64-bringup/reactos/dll/win32/riched20/editstr.h branches/ros-amd64-bringup/reactos/dll/win32/riched20/list.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/paint.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/para.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/reader.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/richole.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/row.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/run.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/string.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/style.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/table.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/txthost.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/txtsrv.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/undo.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/wrap.c branches/ros-amd64-bringup/reactos/dll/win32/riched20/writer.c branches/ros-amd64-bringup/reactos/dll/win32/setupapi/devinst.c branches/ros-amd64-bringup/reactos/dll/win32/setupapi/parser.c branches/ros-amd64-bringup/reactos/dll/win32/setupapi/query.c branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.spec branches/ros-amd64-bringup/reactos/dll/win32/setupapi/stringtable.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/authors.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shellpath.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_desktop.c branches/ros-amd64-bringup/reactos/dll/win32/syssetup/lang/es-ES.rc branches/ros-amd64-bringup/reactos/dll/win32/syssetup/lang/no-NO.rc branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/bitmap.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/icon.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/nonclient.c branches/ros-amd64-bringup/reactos/dll/win32/userenv/lang/no-NO.rc branches/ros-amd64-bringup/reactos/dll/win32/wininet/urlcache.c branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sb16_nt4.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sndblst.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/protocol.h branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/50stubs.c branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/control.c branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/miniport.c branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/time.c branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/ (props changed) branches/ros-amd64-bringup/reactos/drivers/video/font/ftfd/ (props changed) branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/irp.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/private.h branches/ros-amd64-bringup/reactos/drivers/wdm/audio/filters/kmixer/pin.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/legacy/wdmaud/control.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/control.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/deviface.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/dispatcher.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/main.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/pin.c branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h (props changed) branches/ros-amd64-bringup/reactos/include/psdk/setupapi.h branches/ros-amd64-bringup/reactos/include/reactos/wine/wined3d.idl branches/ros-amd64-bringup/reactos/lib/rtl/critical.c branches/ros-amd64-bringup/reactos/lib/rtl/sd.c branches/ros-amd64-bringup/reactos/media/doc/README.WINE branches/ros-amd64-bringup/reactos/media/inf/NET_NIC.inf branches/ros-amd64-bringup/reactos/media/inf/acpi.inf branches/ros-amd64-bringup/reactos/media/inf/audio.inf branches/ros-amd64-bringup/reactos/media/inf/cdrom.inf branches/ros-amd64-bringup/reactos/media/inf/cpu.inf branches/ros-amd64-bringup/reactos/media/inf/display.inf branches/ros-amd64-bringup/reactos/media/inf/fdc.inf branches/ros-amd64-bringup/reactos/media/inf/hdc.inf branches/ros-amd64-bringup/reactos/media/inf/keyboard.inf branches/ros-amd64-bringup/reactos/media/inf/machine.inf branches/ros-amd64-bringup/reactos/media/inf/msmouse.inf branches/ros-amd64-bringup/reactos/media/inf/netisa.inf branches/ros-amd64-bringup/reactos/media/inf/ports.inf branches/ros-amd64-bringup/reactos/media/inf/scsi.inf branches/ros-amd64-bringup/reactos/media/inf/usb.inf branches/ros-amd64-bringup/reactos/media/inf/usbport.inf branches/ros-amd64-bringup/reactos/media/inf/usbstor.inf branches/ros-amd64-bringup/reactos/media/vgafonts/vgafonts.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/xlate.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/dc.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/surface.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/cursoricon.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/desktop.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/input.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/painting.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/window.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/arc.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/bitblt.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/bitmaps.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dclife.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dcobjs.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dcstate.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dibobj.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/drawing.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/fillshap.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/freetype.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/line.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/print.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/region.c branches/ros-amd64-bringup/reactos/tools/hpp/ (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/calc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/calc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/rpn.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/rpn_mpfr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/whatsnew.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/wmmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/zh-CN.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/zh-TW.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Removed: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Removed: branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifile.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/output.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/context.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/row.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/style.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/txthost.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/authors.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/userenv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/protocol.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/control.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… Modified: branches/ros-amd64-bringup/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… Modified: branches/ros-amd64-bringup/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/vgafonts/vgafonts.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy…

1 0

[cfinck] 387: Finish Wiki integration into RosCMS 4
by cfinck＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cfinck Date: Mon Apr 20 23:06:10 2009 New Revision: 387 URL: http://svn.reactos.org/svn/reactos?rev=387&view=rev Log: Finish Wiki integration into RosCMS 4 Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php branches/danny-web/www/www.reactos.org/wiki/LocalSettings.php branches/danny-web/www/www.reactos.org/wiki/includes/specials/SpecialUserlo… branches/danny-web/www/www.reactos.org/wiki/skins/RosCMS.php Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] Mon Apr 20 23:06:10 2009 @@ -83,7 +83,7 @@ $stmt=&DBConnection::getInstance()->prepare("SELECT s.user_id, s.expires FROM ".ROSCMST_SESSIONS." s JOIN ".ROSCMST_USERS." u ON u.id = s.user_id WHERE s.id = :session_id AND (u.match_ip IS FALSE OR s.ip=:ip ) AND (u.match_browseragent IS FALSE OR s.browseragent = :agent) AND u.disabled IS FALSE LIMIT 1"); } else{ - $stmt=&DBConnection::getInstance()->prepare("SELECT s.user_id, s.expires FROM ".ROSCMST_SESSIONS." s JOIN ".ROSCMST_USERS." u ON u.id = s.user_id JOIN ".ROSCMST_SUBSYS." m ON m.user_id = s.user_id WHERE s.id = :session_id AND (u.match_ip IS FALSE OR s.ip = :ip) AND (u.match_browseragent IS FALSE OR s.browseragent = :agent) AND m.subsys = :subsys AND u.disabled IS FALSE LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT m.subsys_user_id AS user_id, s.expires FROM ".ROSCMST_SESSIONS." s JOIN ".ROSCMST_USERS." u ON u.id = s.user_id JOIN ".ROSCMST_SUBSYS." m ON m.user_id = s.user_id WHERE s.id = :session_id AND (u.match_ip IS FALSE OR s.ip = :ip) AND (u.match_browseragent IS FALSE OR s.browseragent = :agent) AND m.subsys = :subsys AND u.disabled IS FALSE LIMIT 1"); $stmt->bindParam('subsys',$subsys,PDO::PARAM_STR); } $stmt->bindParam('session_id',$session_id,PDO::PARAM_INT); Modified: branches/danny-web/www/www.reactos.org/wiki/LocalSettings.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/w… ============================================================================== --- branches/danny-web/www/www.reactos.org/wiki/LocalSettings.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/wiki/LocalSettings.php [iso-8859-1] Mon Apr 20 23:06:10 2009 @@ -143,3 +143,4 @@ # RosCMS-specific settings define("ROSCMS_PATH", "$IP/../roscms/"); +define("SHARED_PATH", "$IP/../shared/"); Modified: branches/danny-web/www/www.reactos.org/wiki/includes/specials/SpecialUserlo… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/w… ============================================================================== --- branches/danny-web/www/www.reactos.org/wiki/includes/specials/SpecialUserlo… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/wiki/includes/specials/SpecialUserlo… [iso-8859-1] Mon Apr 20 23:06:10 2009 @@ -4,7 +4,7 @@ * @ingroup SpecialPage */ -require_once(ROOT_PATH . "roscms/logon/subsys_login.php"); +require_once(ROSCMS_PATH . "lib/RosCMS_Autoloader.class.php"); /** * constructor @@ -12,7 +12,7 @@ function wfSpecialUserlogin( $par = '' ) { /* Login to RosCMS */ $target = "/wiki"; - roscms_subsys_login('wiki', ROSCMS_LOGIN_REQUIRED, $target); + Subsystem_Wiki::in(Login::REQUIRED, $target); /* Just redirect us to the main page in case we were called but already logged in */ header("Location: $target"); Modified: branches/danny-web/www/www.reactos.org/wiki/skins/RosCMS.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/w… ============================================================================== --- branches/danny-web/www/www.reactos.org/wiki/skins/RosCMS.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/wiki/skins/RosCMS.php [iso-8859-1] Mon Apr 20 23:06:10 2009 @@ -14,7 +14,7 @@ if( !defined( 'MEDIAWIKI' ) ) die( -1 ); -require_once(ROOT_PATH . "shared/subsys_layout.php"); +require_once(SHARED_PATH . "subsys_layout.php"); /** * Inherit main code from SkinTemplate, set the CSS and template filter.

1 0

[cgutman] 40610: - Implement NdisMGetDeviceProperty
by cgutman＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cgutman Date: Mon Apr 20 23:03:45 2009 New Revision: 40610 URL: http://svn.reactos.org/svn/reactos?rev=40610&view=rev Log: - Implement NdisMGetDeviceProperty Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Mon Apr 20 23:03:45 2009 @@ -249,29 +249,6 @@ /* * @unimplemented */ -VOID -EXPORT -NdisMGetDeviceProperty( - IN NDIS_HANDLE MiniportAdapterHandle, - IN OUT PDEVICE_OBJECT *PhysicalDeviceObject OPTIONAL, - IN OUT PDEVICE_OBJECT *FunctionalDeviceObject OPTIONAL, - IN OUT PDEVICE_OBJECT *NextDeviceObject OPTIONAL, - IN OUT PCM_RESOURCE_LIST *AllocatedResources OPTIONAL, - IN OUT PCM_RESOURCE_LIST *AllocatedResourcesTranslated OPTIONAL) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ NDIS_STATUS EXPORT NdisMPromoteMiniport( Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 20 23:03:45 2009 @@ -2625,5 +2625,44 @@ ShutdownHandler); } +/* + * @implemented + */ +VOID +EXPORT +NdisMGetDeviceProperty( + IN NDIS_HANDLE MiniportAdapterHandle, + IN OUT PDEVICE_OBJECT *PhysicalDeviceObject OPTIONAL, + IN OUT PDEVICE_OBJECT *FunctionalDeviceObject OPTIONAL, + IN OUT PDEVICE_OBJECT *NextDeviceObject OPTIONAL, + IN OUT PCM_RESOURCE_LIST *AllocatedResources OPTIONAL, + IN OUT PCM_RESOURCE_LIST *AllocatedResourcesTranslated OPTIONAL) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + + NDIS_DbgPrint(MAX_TRACE, ("Called\n")); + + if (PhysicalDeviceObject != NULL) + *PhysicalDeviceObject = Adapter->NdisMiniportBlock.PhysicalDeviceObject; + + if (FunctionalDeviceObject != NULL) + *FunctionalDeviceObject = Adapter->NdisMiniportBlock.DeviceObject; + + if (NextDeviceObject != NULL) + *NextDeviceObject = Adapter->NdisMiniportBlock.NextDeviceObject; + + if (AllocatedResources != NULL) + *AllocatedResources = Adapter->NdisMiniportBlock.AllocatedResources; + + if (AllocatedResourcesTranslated != NULL) + *AllocatedResourcesTranslated = Adapter->NdisMiniportBlock.AllocatedResourcesTranslated; +} + /* EOF */

1 0

[tkreuzer] 40609: Comment out mpu401
by tkreuzer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: tkreuzer Date: Mon Apr 20 20:47:21 2009 New Revision: 40609 URL: http://svn.reactos.org/svn/reactos?rev=40609&view=rev Log: Comment out mpu401 Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drivers/directory.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drivers/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drivers/directory.rbuild [iso-8859-1] Mon Apr 20 20:47:21 2009 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="mpu401"> +

1 0

[tkreuzer] 40608: Fix build of mmbuddy, add a comment.
by tkreuzer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: tkreuzer Date: Mon Apr 20 20:45:52 2009 New Revision: 40608 URL: http://svn.reactos.org/svn/reactos?rev=40608&view=rev Log: Fix build of mmbuddy, add a comment. Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Mon Apr 20 20:45:52 2009 @@ -28,7 +28,7 @@ MMRESULT GetSoundDeviceCapabilities( IN PSOUND_DEVICE SoundDevice, - OUT DWORD_PTR Capabilities, + OUT DWORD_PTR Capabilities, // FIXME: why use DWORD_PTR for an OUT value? IN DWORD CapabilitiesSize) { MMDEVICE_TYPE DeviceType; @@ -104,6 +104,6 @@ return MMSYSERR_NOTSUPPORTED; return FunctionTable->GetCapabilities(SoundDevice, - Capabilities, + (PVOID)Capabilities, CapabilitiesSize); }

1 0

[janderwald] 40607: - Rename function to fix linking errors on x64
by janderwald＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: janderwald Date: Mon Apr 20 18:14:07 2009 New Revision: 40607 URL: http://svn.reactos.org/svn/reactos?rev=40607&view=rev Log: - Rename function to fix linking errors on x64 Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Mon Apr 20 18:14:07 2009 @@ -556,7 +556,7 @@ NTSTATUS NTAPI -WdmAudClose( +WdmAudIoctlClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PWDMAUD_DEVICE_INFO DeviceInfo, @@ -630,7 +630,7 @@ case IOCTL_GETCAPABILITIES: return WdmAudCapabilities(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_CLOSE_WDMAUD: - return WdmAudClose(DeviceObject, Irp, DeviceInfo, ClientInfo); + return WdmAudIoctlClose(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_GETDEVID: case IOCTL_GETVOLUME: case IOCTL_SETVOLUME:

1 0

[dgoette] 386: continued work on converter
by dgoette＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dgoette Date: Mon Apr 20 17:03:33 2009 New Revision: 386 URL: http://svn.reactos.org/svn/reactos?rev=386&view=rev Log: continued work on converter Modified: branches/danny-web/www/www.reactos.org/compat/convert1to2.sql Modified: branches/danny-web/www/www.reactos.org/compat/convert1to2.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/convert1to2.sql [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/convert1to2.sql [iso-8859-1] Mon Apr 20 17:03:33 2009 @@ -216,7 +216,6 @@ - -- ----------------------------------------------------------------- -- Convert entries reports -- ----------------------------------------------------------------- @@ -228,13 +227,13 @@ old_version VARCHAR( 100 ) NOT NULL, old_description TEXT NOT NULL, user_id BIGINT UNSIGNED NOT NULL COMMENT '->roscms.users(id)', + works BOOL DEFAULT FALSE, checked BOOL NOT NULL DEFAULT FALSE, created DATETIME NOT NULL, visible BOOL NOT NULL DEFAULT FALSE, disabled BOOL NOT NULL DEFAULT TRUE, old_groupid BIGINT NOT NULL DEFAULT '0', - old_osversion VARCHAR( 6 ) NOT NULL DEFAULT '000000', - old_award SMALLINT NOT NULL DEFAULT '0' + old_osversion VARCHAR( 6 ) NOT NULL DEFAULT '000000' ) ENGINE = MyISAM; INSERT INTO cdb_entries_reports @@ -246,13 +245,13 @@ comp_appversion, comp_description, comp_usrid, + NULL, FALSE, comp_date, TRUE, FALSE, comp_groupid, - comp_osversion, - comp_award + comp_osversion FROM rsdb_item_comp WHERE comp_date != '0000-00-00 00:00:00'; @@ -404,4 +403,73 @@ FROM cdb_entries e JOIN cdb_tags t ON (t.old_groupid = e.old_groupid OR t.old_vendor =e.old_vendorid); - +ALTER TABLE cdb_entries DROP old_groupid; +ALTER TABLE cdb_entries DROP old_vendorid; +ALTER TABLE cdb_tags DROP old_groupid; +ALTER TABLE cdb_tags DROP old_vendor; + + + +-- ----------------------------------------------------------------- +-- Convert os versions +-- ----------------------------------------------------------------- +CREATE TABLE cdb_entries_tags ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, + revision BIGINT UNSIGNED NOT NULL, + name VARCHAR( 30 ) NOT NULL, + visible BOOL NOT NULL DEFAULT FALSE, + old_osversion VARCHAR( 6 ) NOT NULL DEFAULT '000000' +) ENGINE = MYISAM; + +INSERT INTO cdb_entries_tags VALUES +(NULL, 4, 'ReactOS 0.0.7', FALSE, '000007'), +(NULL, 10, 'ReactOS 0.0.8', FALSE, '000008'), +(NULL, 21, 'ReactOS 0.0.9', FALSE, '000009'), +(NULL, 30, 'ReactOS 0.0.10', FALSE, '000010'), +(NULL, 39, 'ReactOS 0.0.11', FALSE, '000011'), +(NULL, 52, 'ReactOS 0.0.12', FALSE, '000012'), +(NULL, 503, 'ReactOS 0.0.14', FALSE, '000014'), +(NULL, 939, 'ReactOS 0.0.15', FALSE, '000015'), +(NULL, 2126, 'ReactOS 0.0.18', FALSE, '000018'), +(NULL, 2644, 'ReactOS 0.0.19', FALSE, '000019'), +(NULL, 3316, 'ReactOS 0.0.20', FALSE, '000020'), +(NULL, 3692, 'ReactOS 0.0.21', FALSE, '000021'), +(NULL, 4092, 'ReactOS 0.0.x', TRUE, '000010'), +(NULL, 4093, 'ReactOS 0.1.0', TRUE, '000100'), +(NULL, 4455, 'ReactOS 0.1.1', TRUE, '000110'), +(NULL, 4996, 'ReactOS 0.1.2', TRUE, '000120'), +(NULL, 5949, 'ReactOS 0.1.3', TRUE, '000130'), +(NULL, 6269, 'ReactOS 0.1.4', TRUE, '000140'), +(NULL, 6688, 'ReactOS 0.1.5', TRUE, '000150'), +(NULL, 7866, 'ReactOS 0.2.0', TRUE, '000200'), +(NULL, 8516, 'ReactOS 0.2.1', TRUE, '000210'), +(NULL, 9209, 'ReactOS 0.2.2', TRUE, '000220'), +(NULL, 9910, 'ReactOS 0.2.3', TRUE, '000230'), +(NULL, 10824, 'ReactOS 0.2.4', TRUE, '000240'), +(NULL, 13828, 'ReactOS 0.2.5', TRUE, '000250'), +(NULL, 14604, 'ReactOS 0.2.6', TRUE, '000260'), +(NULL, 17770, 'ReactOS 0.2.7', TRUE, '000270'), +(NULL, 18975, 'ReactOS 0.2.8', TRUE, '000280'), +(NULL, 20308, 'ReactOS 0.2.9', TRUE, '000290'), +(NULL, 23786, 'ReactOS 0.3.0', TRUE, '000300'), +(NULL, 26044, 'ReactOS 0.3.1', TRUE, '000310'), +(NULL, 29009, 'ReactOS 0.3.3', TRUE, '000330'), +(NULL, 31933, 'ReactOS 0.3.4', TRUE, '000340'), +(NULL, 34197, 'ReactOS 0.3.5', TRUE, '000350'), +(NULL, 35137, 'ReactOS 0.3.6', TRUE, '000360'), +(NULL, 37181, 'ReactOS 0.3.7', TRUE, '000370'), +(NULL, 39330, 'ReactOS 0.3.8', TRUE, '000380'), +(NULL, 66666, 'ReactOS 0.3.9', TRUE, '000390'); + + + +-- ----------------------------------------------------------------- +-- set reported revisions +-- ----------------------------------------------------------------- +UPDATE cdb_entries_reports r +SET revision = (SELECT revision FROM cdb_entries_tags WHERE old_osversion=r.old_osversion LIMIT 1); + +ALTER TABLE cdb_entries_reports DROP old_osversion; + + +

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