Ros-diffs January 2015

ros-diffs@reactos.org

17 participants
207 discussions

[hbelusca] 65984: [FREELDR]: Fix all (?, or almost?) LONG Status; into ARC_STATUS, and the awfully ugly BOOLEAN Status into BOOLEAN Success.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jan 5 01:34:29 2015 New Revision: 65984 URL: http://svn.reactos.org/svn/reactos?rev=65984&view=rev Log: [FREELDR]: Fix all (?, or almost?) LONG Status; into ARC_STATUS, and the awfully ugly BOOLEAN Status into BOOLEAN Success. Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/fs/pxe.c trunk/reactos/boot/freeldr/freeldr/lib/inffile/inffile.c trunk/reactos/boot/freeldr/freeldr/lib/inifile/ini_init.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -249,7 +249,7 @@ ULONG FileId = (ULONG)DeviceObject; LARGE_INTEGER Position; ULONG BytesRead; - ULONG Status; + ARC_STATUS Status; Position.QuadPart = LogicalSectorNumber * SectorSize; Status = ArcSeek(FileId, &Position, SeekAbsolute); Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -126,7 +126,7 @@ ULONG PercentPerChunk, Percent; FILEINFORMATION Information; LARGE_INTEGER Position; - LONG ret; + ARC_STATUS Status; // // Display progress @@ -143,8 +143,8 @@ // // Get the file size // - ret = ArcGetFileInformation(RamFile, &Information); - if (ret != ESUCCESS) + Status = ArcGetFileInformation(RamFile, &Information); + if (Status != ESUCCESS) { FsCloseFile(RamFile); return; @@ -204,19 +204,19 @@ // Position.HighPart = 0; Position.LowPart = TotalRead; - ret = ArcSeek(RamFile, &Position, SeekAbsolute); - if (ret == ESUCCESS) + Status = ArcSeek(RamFile, &Position, SeekAbsolute); + if (Status == ESUCCESS) { - ret = ArcRead(RamFile, - (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead), - ChunkSize, - &Count); + Status = ArcRead(RamFile, + (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead), + ChunkSize, + &Count); } // // Check for success // - if (ret != ESUCCESS || Count != ChunkSize) + if (Status != ESUCCESS || Count != ChunkSize) { MmFreeMemory(gRamDiskBase); gRamDiskBase = NULL; Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -776,7 +776,7 @@ IN ULONG Lun) { ULONG FileId, i; - ULONG Status; + ARC_STATUS Status; NTSTATUS ret; struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer; CHAR PartitionName[64]; @@ -1574,7 +1574,7 @@ CHAR NtBootDdPath[MAX_PATH]; PVOID ImageBase = NULL; ULONG (NTAPI *EntryPoint)(IN PVOID DriverObject, IN PVOID RegistryPath); - BOOLEAN Status; + BOOLEAN Success; /* Initialize the loaded module list */ InitializeListHead(&ModuleListHead); @@ -1584,37 +1584,37 @@ strcat(NtBootDdPath, "\\NTBOOTDD.SYS"); /* Load file */ - Status = WinLdrLoadImage(NtBootDdPath, LoaderBootDriver, &ImageBase); - if (!Status) + Success = WinLdrLoadImage(NtBootDdPath, LoaderBootDriver, &ImageBase); + if (!Success) { /* That's OK. File simply doesn't exist */ return ESUCCESS; } /* Allocate a DTE for ntbootdd */ - Status = WinLdrAllocateDataTableEntry(&ModuleListHead, "ntbootdd.sys", + Success = WinLdrAllocateDataTableEntry(&ModuleListHead, "ntbootdd.sys", "NTBOOTDD.SYS", ImageBase, &BootDdDTE); - if (!Status) + if (!Success) return EIO; /* Add the PE part of freeldr.sys to the list of loaded executables, it contains Scsiport* exports, imported by ntbootdd.sys */ - Status = WinLdrAllocateDataTableEntry(&ModuleListHead, "scsiport.sys", + Success = WinLdrAllocateDataTableEntry(&ModuleListHead, "scsiport.sys", "FREELDR.SYS", &__ImageBase, &FreeldrDTE); - if (!Status) + if (!Success) { RemoveEntryList(&BootDdDTE->InLoadOrderLinks); return EIO; } /* Fix imports */ - Status = WinLdrScanImportDescriptorTable(&ModuleListHead, "", BootDdDTE); + Success = WinLdrScanImportDescriptorTable(&ModuleListHead, "", BootDdDTE); /* Now unlinkt the DTEs, they won't be valid later */ RemoveEntryList(&BootDdDTE->InLoadOrderLinks); RemoveEntryList(&FreeldrDTE->InLoadOrderLinks); - if (!Status) + if (!Success) return EIO; /* Change imports to PA */ @@ -1635,14 +1635,13 @@ NtHeaders = RtlImageNtHeader(VaToPa(BootDdDTE->DllBase)); if (!NtHeaders) return EIO; - Status = (BOOLEAN)LdrRelocateImageWithBias( - VaToPa(BootDdDTE->DllBase), - NtHeaders->OptionalHeader.ImageBase - (ULONG_PTR)BootDdDTE->DllBase, - "FreeLdr", - TRUE, - TRUE, /* in case of conflict still return success */ - FALSE); - if (!Status) + Success = (BOOLEAN)LdrRelocateImageWithBias(VaToPa(BootDdDTE->DllBase), + NtHeaders->OptionalHeader.ImageBase - (ULONG_PTR)BootDdDTE->DllBase, + "FreeLdr", + TRUE, + TRUE, /* in case of conflict still return success */ + FALSE); + if (!Success) return EIO; /* Call the entrypoint */ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -918,7 +918,6 @@ ULONG InodeOffsetInBlock; CHAR ErrorString[80]; EXT2_GROUP_DESC GroupDescriptor; - BOOLEAN Status; TRACE("Ext2ReadInode() Inode = %d\n", Inode); @@ -949,11 +948,10 @@ TRACE("InodeBlockNumber (after group desc correction) = %d\n", InodeBlockNumber); // Read the block - Status = Ext2ReadPartialBlock(InodeBlockNumber, - (InodeOffsetInBlock * EXT2_INODE_SIZE(Ext2SuperBlock)), - sizeof(EXT2_INODE), - InodeBuffer); - if (!Status) + if (!Ext2ReadPartialBlock(InodeBlockNumber, + (InodeOffsetInBlock * EXT2_INODE_SIZE(Ext2SuperBlock)), + sizeof(EXT2_INODE), + InodeBuffer)) { return FALSE; } @@ -1255,18 +1253,18 @@ { PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); ULONGLONG BytesReadBig; - BOOLEAN ret; + BOOLEAN Success; // // Read data // - ret = Ext2ReadFileBig(FileHandle, N, &BytesReadBig, Buffer); + Success = Ext2ReadFileBig(FileHandle, N, &BytesReadBig, Buffer); *Count = (ULONG)BytesReadBig; // // Check for success // - if (ret) + if (Success) return ESUCCESS; else return EIO; @@ -1304,18 +1302,18 @@ EXT2_SUPER_BLOCK SuperBlock; LARGE_INTEGER Position; ULONG Count; - LONG ret; + ARC_STATUS Status; // // Read the SuperBlock // Position.HighPart = 0; Position.LowPart = 2 * 512; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) return NULL; - ret = ArcRead(DeviceId, &SuperBlock, sizeof(SuperBlock), &Count); - if (ret != ESUCCESS || Count != sizeof(SuperBlock)) + Status = ArcRead(DeviceId, &SuperBlock, sizeof(SuperBlock), &Count); + if (Status != ESUCCESS || Count != sizeof(SuperBlock)) return NULL; // Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -28,7 +28,7 @@ ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONGLONG PartitionSectorCount); PVOID FatBufferDirectory(PFAT_VOLUME_INFO Volume, ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOLEAN RootDirectory); BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -LONG FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer); +ARC_STATUS FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer); void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry); BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPointer); ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster); @@ -762,7 +762,7 @@ * specified filename and fills in an FAT_FILE_INFO structure * with info describing the file, etc. returns ARC error code */ -LONG FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) +ARC_STATUS FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) { UINT32 i; ULONG NumberOfPathParts; @@ -912,7 +912,7 @@ UINT32 ThisFatEntOffset; ULONG SectorCount; PUCHAR ReadBuffer; - BOOLEAN status = TRUE; + BOOLEAN Success = TRUE; //TRACE("FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); @@ -946,7 +946,7 @@ if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount, ReadBuffer)) { - status = FALSE; + Success = FALSE; break; } @@ -968,7 +968,7 @@ if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, ReadBuffer)) { - status = FALSE; + Success = FALSE; break; } @@ -997,7 +997,7 @@ default: ERR("Unknown FAT type %d\n", Volume->FatType); - status = FALSE; + Success = FALSE; break; } @@ -1007,7 +1007,7 @@ *ClusterPointer = fat; - return status; + return Success; } ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster) @@ -1171,7 +1171,7 @@ ULONG ClusterStartSector; ULONG SectorOffset, ReadSize, SectorCount; PUCHAR ReadBuffer; - BOOLEAN status = FALSE; + BOOLEAN Success = FALSE; //TRACE("FatReadPartialCluster() ClusterNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", ClusterNumber, StartingOffset, Length, Buffer); @@ -1196,12 +1196,12 @@ if (FatReadVolumeSectors(Volume, ClusterStartSector + SectorOffset, SectorCount, ReadBuffer)) { memcpy(Buffer, ReadBuffer + StartingOffset, Length); - status = TRUE; + Success = TRUE; } FrLdrTempFree(ReadBuffer, TAG_FAT_BUFFER); - return status; + return Success; } /* @@ -1367,7 +1367,7 @@ { LARGE_INTEGER Position; ULONG Count; - LONG ret; + ARC_STATUS Status; //TRACE("FatReadVolumeSectors(): SectorNumber %d, SectorCount %d, Buffer %p\n", // SectorNumber, SectorCount, Buffer); @@ -1376,8 +1376,8 @@ // Seek to right position // Position.QuadPart = (ULONGLONG)SectorNumber * 512; - ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) { TRACE("FatReadVolumeSectors() Failed to seek\n"); return FALSE; @@ -1386,8 +1386,8 @@ // // Read data // - ret = ArcRead(Volume->DeviceId, Buffer, SectorCount * 512, &Count); - if (ret != ESUCCESS || Count != SectorCount * 512) + Status = ArcRead(Volume->DeviceId, Buffer, SectorCount * 512, &Count); + if (Status != ESUCCESS || Count != SectorCount * 512) { TRACE("FatReadVolumeSectors() Failed to read\n"); return FALSE; @@ -1430,7 +1430,7 @@ PFAT_FILE_INFO FileHandle; ULONG DeviceId; BOOLEAN IsDirectory; - LONG ret; + ARC_STATUS Status; if (OpenMode != OpenReadOnly && OpenMode != OpenDirectory) return EACCES; @@ -1441,8 +1441,8 @@ TRACE("FatOpen() FileName = %s\n", Path); RtlZeroMemory(&TempFileInfo, sizeof(TempFileInfo)); - ret = FatLookupFile(FatVolume, Path, DeviceId, &TempFileInfo); - if (ret != ESUCCESS) + Status = FatLookupFile(FatVolume, Path, DeviceId, &TempFileInfo); + if (Status != ESUCCESS) return ENOENT; // @@ -1468,17 +1468,17 @@ ARC_STATUS FatRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); - BOOLEAN ret; + BOOLEAN Success; // // Call old read method // - ret = FatReadFile(FileHandle, N, Count, Buffer); + Success = FatReadFile(FileHandle, N, Count, Buffer); // // Check for success // - if (ret) + if (Success) return ESUCCESS; else return EIO; @@ -1522,7 +1522,7 @@ LARGE_INTEGER Position; ULONG Count; ULARGE_INTEGER SectorCount; - LONG ret; + ARC_STATUS Status; // // Allocate data for volume information @@ -1537,14 +1537,14 @@ // Position.HighPart = 0; Position.LowPart = 0; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) { FrLdrTempFree(Volume, TAG_FAT_VOLUME); return NULL; } - ret = ArcRead(DeviceId, Buffer, sizeof(Buffer), &Count); - if (ret != ESUCCESS || Count != sizeof(Buffer)) + Status = ArcRead(DeviceId, Buffer, sizeof(Buffer), &Count); + if (Status != ESUCCESS || Count != sizeof(Buffer)) { FrLdrTempFree(Volume, TAG_FAT_VOLUME); return NULL; @@ -1565,8 +1565,8 @@ // // Determine sector count // - ret = ArcGetFileInformation(DeviceId, &FileInformation); - if (ret != ESUCCESS) + Status = ArcGetFileInformation(DeviceId, &FileInformation); + if (Status != ESUCCESS) { FrLdrTempFree(Volume, TAG_FAT_VOLUME); return NULL; 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] Mon Jan 5 01:34:29 2015 @@ -57,7 +57,8 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { - ULONG Count, i, ret; + ARC_STATUS Status; + ULONG Count, i; PLIST_ENTRY pEntry; DEVICE* pDevice; CHAR* DeviceName; @@ -132,11 +133,11 @@ /* Try to open the device */ FileData[DeviceId].FuncTable = pDevice->FuncTable; - ret = pDevice->FuncTable->Open(pDevice->Prefix, DeviceOpenMode, &DeviceId); - if (ret != ESUCCESS) + Status = pDevice->FuncTable->Open(pDevice->Prefix, DeviceOpenMode, &DeviceId); + if (Status != ESUCCESS) { FileData[DeviceId].FuncTable = NULL; - return ret; + return Status; } else if (!*FileName) { @@ -205,31 +206,31 @@ FileData[i].FuncTable = FileData[DeviceId].FileFuncTable; FileData[i].DeviceId = DeviceId; *FileId = i; - ret = FileData[i].FuncTable->Open(FileName, OpenMode, FileId); - if (ret != ESUCCESS) + Status = FileData[i].FuncTable->Open(FileName, OpenMode, FileId); + if (Status != ESUCCESS) { FileData[i].FuncTable = NULL; *FileId = MAX_FDS; } - return ret; + return Status; } ARC_STATUS ArcClose(ULONG FileId) { - LONG ret; + ARC_STATUS Status; if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) return EBADF; - ret = FileData[FileId].FuncTable->Close(FileId); - - if (ret == ESUCCESS) + Status = FileData[FileId].FuncTable->Close(FileId); + + if (Status == ESUCCESS) { FileData[FileId].FuncTable = NULL; FileData[FileId].Specific = NULL; FileData[FileId].DeviceId = -1; } - return ret; + return Status; } ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) @@ -265,7 +266,7 @@ { CHAR FullPath[MAX_PATH] = ""; ULONG FileId; - LONG ret; + ARC_STATUS Status; // // Print status message @@ -293,12 +294,12 @@ // // Open the file // - ret = ArcOpen(FullPath, OpenReadOnly, &FileId); + Status = ArcOpen(FullPath, OpenReadOnly, &FileId); // // Check for success // - if (ret == ESUCCESS) + if (Status == ESUCCESS) return (PFILE)FileId; else return (PFILE)0; @@ -343,17 +344,17 @@ { ULONG FileId = (ULONG)FileHandle; FILEINFORMATION Information; - LONG ret; + ARC_STATUS Status; // // Query file informations // - ret = ArcGetFileInformation(FileId, &Information); + Status = ArcGetFileInformation(FileId, &Information); // // Check for error // - if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0) + if (Status != ESUCCESS || Information.EndingAddress.HighPart != 0) return 0; // Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -96,14 +96,14 @@ * function returns an ARC error code. The directory is specified * by its starting sector and length. */ -static LONG IsoBufferDirectory(ULONG DeviceId, ULONG DirectoryStartSector, ULONG DirectoryLength, +static ARC_STATUS IsoBufferDirectory(ULONG DeviceId, ULONG DirectoryStartSector, ULONG DirectoryLength, PVOID* pDirectoryBuffer) { PVOID DirectoryBuffer; ULONG SectorCount; LARGE_INTEGER Position; ULONG Count; - ULONG ret; + ARC_STATUS Status; TRACE("IsoBufferDirectory() DirectoryStartSector = %d DirectoryLength = %d\n", DirectoryStartSector, DirectoryLength); @@ -123,14 +123,14 @@ // Position.HighPart = 0; Position.LowPart = DirectoryStartSector * SECTORSIZE; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) { FrLdrTempFree(DirectoryBuffer, TAG_ISO_BUFFER); - return ret; - } - ret = ArcRead(DeviceId, DirectoryBuffer, SectorCount * SECTORSIZE, &Count); - if (ret != ESUCCESS || Count != SectorCount * SECTORSIZE) + return Status; + } + Status = ArcRead(DeviceId, DirectoryBuffer, SectorCount * SECTORSIZE, &Count); + if (Status != ESUCCESS || Count != SectorCount * SECTORSIZE) { FrLdrTempFree(DirectoryBuffer, TAG_ISO_BUFFER); return EIO; @@ -147,7 +147,7 @@ * specified filename and fills in an ISO_FILE_INFO structure * with info describing the file, etc. returns ARC error code */ -static LONG IsoLookupFile(PCSTR FileName, ULONG DeviceId, PISO_FILE_INFO IsoFileInfoPointer) +static ARC_STATUS IsoLookupFile(PCSTR FileName, ULONG DeviceId, PISO_FILE_INFO IsoFileInfoPointer) { UCHAR Buffer[SECTORSIZE]; PPVD Pvd = (PPVD)Buffer; @@ -160,7 +160,7 @@ ISO_FILE_INFO IsoFileInfo; LARGE_INTEGER Position; ULONG Count; - LONG ret; + ARC_STATUS Status; TRACE("IsoLookupFile() FileName = %s\n", FileName); @@ -172,11 +172,11 @@ // Position.HighPart = 0; Position.LowPart = 16 * SECTORSIZE; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) - return ret; - ret = ArcRead(DeviceId, Pvd, SECTORSIZE, &Count); - if (ret != ESUCCESS || Count < sizeof(PVD)) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + return Status; + Status = ArcRead(DeviceId, Pvd, SECTORSIZE, &Count); + if (Status != ESUCCESS || Count < sizeof(PVD)) return EIO; DirectorySector = Pvd->RootDirRecord.ExtentLocationL; @@ -208,9 +208,9 @@ // // Buffer the directory contents // - ret = IsoBufferDirectory(DeviceId, DirectorySector, DirectoryLength, &DirectoryBuffer); - if (ret != ESUCCESS) - return ret; + Status = IsoBufferDirectory(DeviceId, DirectorySector, DirectoryLength, &DirectoryBuffer); + if (Status != ESUCCESS) + return Status; // // Search for file name in directory @@ -268,7 +268,7 @@ ISO_FILE_INFO TempFileInfo; PISO_FILE_INFO FileHandle; ULONG DeviceId; - LONG ret; + ARC_STATUS Status; if (OpenMode != OpenReadOnly) return EACCES; @@ -278,8 +278,8 @@ TRACE("IsoOpen() FileName = %s\n", Path); RtlZeroMemory(&TempFileInfo, sizeof(TempFileInfo)); - ret = IsoLookupFile(Path, DeviceId, &TempFileInfo); - if (ret != ESUCCESS) + Status = IsoLookupFile(Path, DeviceId, &TempFileInfo); + if (Status != ESUCCESS) return ENOENT; FileHandle = FrLdrTempAlloc(sizeof(ISO_FILE_INFO), TAG_ISO_FILE); @@ -304,7 +304,7 @@ ULONG LengthInSector; ULONG NumberOfSectors; ULONG BytesRead; - LONG ret; + ARC_STATUS Status; TRACE("IsoRead() Buffer = %p, N = %lu\n", Buffer, N); @@ -378,13 +378,13 @@ // Position.HighPart = 0; Position.LowPart = SectorNumber * SECTORSIZE; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) - { - return ret; - } - ret = ArcRead(DeviceId, SectorBuffer, SECTORSIZE, &BytesRead); - if (ret != ESUCCESS || BytesRead != SECTORSIZE) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + { + return Status; + } + Status = ArcRead(DeviceId, SectorBuffer, SECTORSIZE, &BytesRead); + if (Status != ESUCCESS || BytesRead != SECTORSIZE) { return EIO; } @@ -412,13 +412,13 @@ // Position.HighPart = 0; Position.LowPart = SectorNumber * SECTORSIZE; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) - { - return ret; - } - ret = ArcRead(DeviceId, Buffer, NumberOfSectors * SECTORSIZE, &BytesRead); - if (ret != ESUCCESS || BytesRead != NumberOfSectors * SECTORSIZE) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + { + return Status; + } + Status = ArcRead(DeviceId, Buffer, NumberOfSectors * SECTORSIZE, &BytesRead); + if (Status != ESUCCESS || BytesRead != NumberOfSectors * SECTORSIZE) { return EIO; } @@ -441,13 +441,13 @@ // Position.HighPart = 0; Position.LowPart = SectorNumber * SECTORSIZE; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) - { - return ret; - } - ret = ArcRead(DeviceId, SectorBuffer, SECTORSIZE, &BytesRead); - if (ret != ESUCCESS || BytesRead != SECTORSIZE) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + { + return Status; + } + Status = ArcRead(DeviceId, SectorBuffer, SECTORSIZE, &BytesRead); + if (Status != ESUCCESS || BytesRead != SECTORSIZE) { return EIO; } @@ -494,18 +494,18 @@ PPVD Pvd = (PPVD)Buffer; LARGE_INTEGER Position; ULONG Count; - LONG ret; + ARC_STATUS Status; // // Read The Primary Volume Descriptor // Position.HighPart = 0; Position.LowPart = 16 * SECTORSIZE; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) return NULL; - ret = ArcRead(DeviceId, Pvd, SECTORSIZE, &Count); - if (ret != ESUCCESS || Count < sizeof(PVD)) + Status = ArcRead(DeviceId, Pvd, SECTORSIZE, &Count); + if (Status != ESUCCESS || Count < sizeof(PVD)) return NULL; // Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -147,7 +147,7 @@ LARGE_INTEGER Position; ULONG Count; ULONG ReadLength; - LONG ret; + ARC_STATUS Status; TRACE("NtfsDiskRead - Offset: %I64d Length: %I64d\n", Offset, Length); @@ -157,11 +157,11 @@ if (Offset % Volume->BootSector.BytesPerSector) { Position.QuadPart = Offset & ~(Volume->BootSector.BytesPerSector - 1); - ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) return FALSE; - ret = ArcRead(Volume->DeviceId, Volume->TemporarySector, Volume->BootSector.BytesPerSector, &Count); - if (ret != ESUCCESS || Count != Volume->BootSector.BytesPerSector) + Status = ArcRead(Volume->DeviceId, Volume->TemporarySector, Volume->BootSector.BytesPerSector, &Count); + if (Status != ESUCCESS || Count != Volume->BootSector.BytesPerSector) return FALSE; ReadLength = (USHORT)min(Length, Volume->BootSector.BytesPerSector - (Offset % Volume->BootSector.BytesPerSector)); @@ -186,12 +186,12 @@ if (Length >= Volume->BootSector.BytesPerSector) { Position.QuadPart = Offset; - ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) return FALSE; ReadLength = Length & ~(Volume->BootSector.BytesPerSector - 1); - ret = ArcRead(Volume->DeviceId, Buffer, ReadLength, &Count); - if (ret != ESUCCESS || Count != ReadLength) + Status = ArcRead(Volume->DeviceId, Buffer, ReadLength, &Count); + if (Status != ESUCCESS || Count != ReadLength) return FALSE; // @@ -208,11 +208,11 @@ if (Length) { Position.QuadPart = Offset; - ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) return FALSE; - ret = ArcRead(Volume->DeviceId, Buffer, (ULONG)Length, &Count); - if (ret != ESUCCESS || Count != Length) + Status = ArcRead(Volume->DeviceId, Buffer, (ULONG)Length, &Count); + if (Status != ESUCCESS || Count != Length) return FALSE; } @@ -880,7 +880,7 @@ PNTFS_VOLUME_INFO Volume; LARGE_INTEGER Position; ULONG Count; - LONG ret; + ARC_STATUS Status; // // Allocate data for volume information @@ -895,14 +895,14 @@ // Position.HighPart = 0; Position.LowPart = 0; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) { FrLdrTempFree(Volume, TAG_NTFS_VOLUME); return NULL; } - ret = ArcRead(DeviceId, &Volume->BootSector, sizeof(Volume->BootSector), &Count); - if (ret != ESUCCESS || Count != sizeof(Volume->BootSector)) + Status = ArcRead(DeviceId, &Volume->BootSector, sizeof(Volume->BootSector), &Count); + if (Status != ESUCCESS || Count != sizeof(Volume->BootSector)) { FrLdrTempFree(Volume, TAG_NTFS_VOLUME); return NULL; @@ -947,16 +947,16 @@ return NULL; } Position.QuadPart = Volume->BootSector.MftLocation * Volume->ClusterSize; - ret = ArcSeek(DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) + Status = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) { FileSystemError("Failed to seek to Master File Table record."); FrLdrTempFree(Volume->MasterFileTable, TAG_NTFS_MFT); FrLdrTempFree(Volume, TAG_NTFS_VOLUME); return NULL; } - ret = ArcRead(DeviceId, Volume->MasterFileTable, Volume->MftRecordSize, &Count); - if (ret != ESUCCESS || Count != Volume->MftRecordSize) + Status = ArcRead(DeviceId, Volume->MasterFileTable, Volume->MftRecordSize, &Count); + if (Status != ESUCCESS || Count != Volume->MftRecordSize) { FileSystemError("Failed to read the Master File Table record."); FrLdrTempFree(Volume->MasterFileTable, TAG_NTFS_MFT); Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -350,20 +350,20 @@ BOOLEAN PxeInit(VOID) { static BOOLEAN Initialized = FALSE; - static BOOLEAN Status = FALSE; + static BOOLEAN Success = FALSE; // Do initialization only once if (Initialized) - return Status; + return Success; Initialized = TRUE; // Check if PXE is available if (GetPxeStructure() && GetCachedInfo()) { FsRegisterDevice("net(0)", &PxeDiskVtbl); - Status = TRUE; - } - - return Status; -} - + Success = TRUE; + } + + return Success; +} + Modified: trunk/reactos/boot/freeldr/freeldr/lib/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/i… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/lib/inffile/inffile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/inffile/inffile.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -944,7 +944,7 @@ ULONG FileSize, Count; PINFCACHE Cache; BOOLEAN Success; - LONG ret; + ARC_STATUS Status; *InfHandle = NULL; *ErrorLine = (ULONG) - 1; @@ -952,8 +952,8 @@ // // Open the .inf file // - ret = ArcOpen((PCHAR)FileName, OpenReadOnly, &FileId); - if (ret != ESUCCESS) + Status = ArcOpen((PCHAR)FileName, OpenReadOnly, &FileId); + if (Status != ESUCCESS) { return FALSE; } @@ -961,8 +961,8 @@ // // Query file size // - ret = ArcGetFileInformation(FileId, &Information); - if ((ret != ESUCCESS) || (Information.EndingAddress.HighPart != 0)) + Status = ArcGetFileInformation(FileId, &Information); + if ((Status != ESUCCESS) || (Information.EndingAddress.HighPart != 0)) { ArcClose(FileId); return FALSE; @@ -982,8 +982,8 @@ // // Read file into memory // - ret = ArcRead(FileId, FileBuffer, FileSize, &Count); - if ((ret != ESUCCESS) || (Count != FileSize)) + Status = ArcRead(FileId, FileBuffer, FileSize, &Count); + if ((Status != ESUCCESS) || (Count != FileSize)) { ArcClose(FileId); FrLdrTempFree(FileBuffer, TAG_INF_FILE); Modified: trunk/reactos/boot/freeldr/freeldr/lib/inifile/ini_init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/i… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/lib/inifile/ini_init.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/inifile/ini_init.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -21,10 +21,9 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(INIFILE); -static LONG IniOpenIniFile(ULONG* FileId) +static ARC_STATUS IniOpenIniFile(ULONG* FileId) { CHAR FreeldrPath[MAX_PATH]; - LONG ret; // // Create full freeldr.ini path @@ -33,9 +32,7 @@ strcat(FreeldrPath, "\\freeldr.ini"); // Try to open freeldr.ini - ret = ArcOpen(FreeldrPath, OpenReadOnly, FileId); - - return ret; + return ArcOpen(FreeldrPath, OpenReadOnly, FileId); } BOOLEAN IniFileInitialize(VOID) @@ -44,15 +41,15 @@ ULONG FileId; // File handle for freeldr.ini PCHAR FreeLoaderIniFileData; ULONG FreeLoaderIniFileSize, Count; - LONG ret; + ARC_STATUS Status; BOOLEAN Success; TRACE("IniFileInitialize()\n"); // // Open freeldr.ini // - ret = IniOpenIniFile(&FileId); - if (ret != ESUCCESS) + Status = IniOpenIniFile(&FileId); + if (Status != ESUCCESS) { UiMessageBoxCritical("Error opening freeldr.ini or file not found.\nYou need to re-install FreeLoader."); return FALSE; @@ -61,8 +58,8 @@ // // Get the file size // - ret = ArcGetFileInformation(FileId, &FileInformation); - if (ret != ESUCCESS || FileInformation.EndingAddress.HighPart != 0) + Status = ArcGetFileInformation(FileId, &FileInformation); + if (Status != ESUCCESS || FileInformation.EndingAddress.HighPart != 0) { UiMessageBoxCritical("Error while getting informations about freeldr.ini.\nYou need to re-install FreeLoader."); return FALSE; @@ -83,8 +80,8 @@ // // Read freeldr.ini off the disk // - ret = ArcRead(FileId, FreeLoaderIniFileData, FreeLoaderIniFileSize, &Count); - if (ret != ESUCCESS || Count != FreeLoaderIniFileSize) + Status = ArcRead(FileId, FreeLoaderIniFileData, FreeLoaderIniFileSize, &Count); + if (Status != ESUCCESS || Count != FreeLoaderIniFileSize) { UiMessageBoxCritical("Error while reading freeldr.ini."); ArcClose(FileId); 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] Mon Jan 5 01:34:29 2015 @@ -103,7 +103,7 @@ PIMAGE_IMPORT_DESCRIPTOR ImportTable; ULONG ImportTableSize; PCH ImportName; - BOOLEAN Status; + BOOLEAN Success; /* Get a pointer to the import table of this image */ ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(ScanDTE->DllBase), @@ -136,31 +136,29 @@ /* Load the DLL if it is not already loaded */ if (!WinLdrCheckForLoadedDll(ModuleListHead, ImportName, &DataTableEntry)) { - Status = WinLdrpLoadAndScanReferencedDll(ModuleListHead, - DirectoryPath, - ImportName, - &DataTableEntry); - - if (!Status) + Success = WinLdrpLoadAndScanReferencedDll(ModuleListHead, + DirectoryPath, + ImportName, + &DataTableEntry); + if (!Success) { ERR("WinLdrpLoadAndScanReferencedDll() failed\n"); - return Status; + return Success; } } /* Scan its import address table */ - Status = WinLdrpScanImportAddressTable( - ModuleListHead, - DataTableEntry->DllBase, - ScanDTE->DllBase, - (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk), - DirectoryPath); - - if (!Status) + Success = WinLdrpScanImportAddressTable(ModuleListHead, + DataTableEntry->DllBase, + ScanDTE->DllBase, + (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk), + DirectoryPath); + + if (!Success) { ERR("WinLdrpScanImportAddressTable() failed: ImportName = '%s', DirectoryPath = '%s'\n", ImportName, DirectoryPath); - return Status; + return Success; } } @@ -275,7 +273,7 @@ PIMAGE_NT_HEADERS NtHeaders; PIMAGE_SECTION_HEADER SectionHeader; ULONG VirtualSize, SizeOfRawData, NumberOfSections; - LONG Status; + ARC_STATUS Status; LARGE_INTEGER Position; ULONG i, BytesRead; TRACE("WinLdrLoadImage(%s, %ld, *)\n", FileName, MemoryType); @@ -355,7 +353,6 @@ } Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); - if (Status != ESUCCESS) { //Print(L"Error reading headers %s\n", FileName); @@ -407,7 +404,6 @@ /* Read this section from the file, size = SizeOfRawData */ Status = ArcRead(FileId, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress, SizeOfRawData, &BytesRead); - if (Status != ESUCCESS) { ERR("WinLdrLoadImage(): Error reading section from file!\n"); @@ -438,11 +434,11 @@ WARN("Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase); return (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, - (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, - "FreeLdr", - TRUE, - TRUE, /* in case of conflict still return success */ - FALSE); + (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, + "FreeLdr", + TRUE, + TRUE, /* in case of conflict still return success */ + FALSE); } TRACE("WinLdrLoadImage() done, PA = %p\n", *ImageBasePA); @@ -515,7 +511,7 @@ ULONG Hint; PIMAGE_IMPORT_BY_NAME ImportData; PCHAR ExportName, ForwarderName; - BOOLEAN Status; + BOOLEAN Success; //TRACE("WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); @@ -680,14 +676,14 @@ } /* Now let's try to load it! */ - Status = WinLdrpLoadAndScanReferencedDll(ModuleListHead, - DirectoryPath, - ForwardDllName, - &DataTableEntry); - if (!Status) + Success = WinLdrpLoadAndScanReferencedDll(ModuleListHead, + DirectoryPath, + ForwardDllName, + &DataTableEntry); + if (!Success) { ERR("WinLdrpLoadAndScanReferencedDll() failed to load forwarder dll.\n"); - return Status; + return Success; } } @@ -722,21 +718,20 @@ RefThunkData.u1.AddressOfData = (ULONG_PTR)ImportByName; /* And recursively call ourselves */ - Status = WinLdrpBindImportName( - ModuleListHead, - DataTableEntry->DllBase, - ImageBase, - &RefThunkData, - RefExportDirectory, - RefExportSize, - TRUE, - DirectoryPath); + Success = WinLdrpBindImportName(ModuleListHead, + DataTableEntry->DllBase, + ImageBase, + &RefThunkData, + RefExportDirectory, + RefExportSize, + TRUE, + DirectoryPath); /* Fill out the ThunkData with data from RefThunkData */ ThunkData->u1 = RefThunkData.u1; /* Return what we got from the recursive call */ - return Status; + return Success; } else { @@ -756,7 +751,7 @@ PLDR_DATA_TABLE_ENTRY *DataTableEntry) { CHAR FullDllName[256]; - BOOLEAN Status; + BOOLEAN Success; PVOID BasePA = NULL; /* Prepare the full path to the file to be loaded */ @@ -767,33 +762,33 @@ //Print(L"Loading referenced DLL: %s\n", FullDllName); /* Load the image */ - Status = WinLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); - if (!Status) + Success = WinLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); + if (!Success) { ERR("WinLdrLoadImage() failed\n"); - return Status; + return Success; } /* Allocate DTE for newly loaded DLL */ - Status = WinLdrAllocateDataTableEntry(ModuleListHead, - ImportName, - FullDllName, - BasePA, - DataTableEntry); - if (!Status) + Success = WinLdrAllocateDataTableEntry(ModuleListHead, + ImportName, + FullDllName, + BasePA, + DataTableEntry); + if (!Success) { ERR("WinLdrAllocateDataTableEntry() failed\n"); - return Status; + return Success; } /* Scan its dependencies too */ TRACE("WinLdrScanImportDescriptorTable() calling ourselves for %S\n", VaToPa((*DataTableEntry)->BaseDllName.Buffer)); - Status = WinLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); - if (!Status) + Success = WinLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); + if (!Success) { ERR("WinLdrScanImportDescriptorTable() failed\n"); - return Status; + return Success; } return TRUE; @@ -807,7 +802,7 @@ IN PCSTR DirectoryPath) { PIMAGE_EXPORT_DIRECTORY ExportDirectory = NULL; - BOOLEAN Status; + BOOLEAN Success; ULONG ExportSize; TRACE("WinLdrpScanImportAddressTable(): DllBase 0x%X, " @@ -841,22 +836,21 @@ while (((PIMAGE_THUNK_DATA)VaToPa(ThunkData))->u1.AddressOfData != 0) { /* Bind it */ - Status = WinLdrpBindImportName( - ModuleListHead, - DllBase, - ImageBase, - ThunkData, - ExportDirectory, - ExportSize, - FALSE, - DirectoryPath); + Success = WinLdrpBindImportName(ModuleListHead, + DllBase, + ImageBase, + ThunkData, + ExportDirectory, + ExportSize, + FALSE, + DirectoryPath); /* Move to the next entry */ ThunkData++; /* Return error if binding was unsuccessful */ - if (!Status) - return Status; + if (!Success) + return Success; } /* Return success */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Mon Jan 5 01:34:29 2015 @@ -41,7 +41,7 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) { INFCONTEXT InfContext; - BOOLEAN Status; + BOOLEAN Success; LPCSTR AnsiName, OemName, LangName; /* Get ANSI codepage file */ @@ -79,15 +79,15 @@ return; } - Status = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); - TRACE("NLS data loaded with status %d\n", Status); + Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); + TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); } static VOID SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, LPCSTR SearchPath) { INFCONTEXT InfContext, dirContext; - BOOLEAN Status; + BOOLEAN Success; LPCSTR Media, DriverName, dirIndex, ImagePath; WCHAR ServiceName[256]; WCHAR ImagePathW[256]; @@ -119,12 +119,11 @@ ServiceName[wcslen(ServiceName) - 4] = 0; /* Add it to the list */ - Status = WinLdrAddDriverToList(BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - ImagePathW, - ServiceName); - - if (!Status) + Success = WinLdrAddDriverToList(BootDriverListHead, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", + ImagePathW, + ServiceName); + if (!Success) { ERR("could not add boot driver %s, %s\n", SearchPath, DriverName); return; 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] Mon Jan 5 01:34:29 2015 @@ -234,7 +234,7 @@ CHAR DriverPath[1024]; CHAR DllName[1024]; PCHAR DriverNamePos; - BOOLEAN Status; + BOOLEAN Success; PVOID DriverBase = NULL; // Separate the path to file name and directory path @@ -258,8 +258,8 @@ TRACE("DriverPath: %s, DllName: %s, LPB\n", DriverPath, DllName); // Check if driver is already loaded - Status = WinLdrCheckForLoadedDll(LoadOrderListHead, DllName, DriverDTE); - if (Status) + Success = WinLdrCheckForLoadedDll(LoadOrderListHead, DllName, DriverDTE); + if (Success) { // We've got the pointer to its DTE, just return success return TRUE; @@ -267,13 +267,13 @@ // It's not loaded, we have to load it _snprintf(FullPath, sizeof(FullPath), "%s%wZ", BootPath, FilePath); - Status = WinLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); - if (!Status) + Success = WinLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); + if (!Success) return FALSE; // Allocate a DTE for it - Status = WinLdrAllocateDataTableEntry(LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); - if (!Status) + Success = WinLdrAllocateDataTableEntry(LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); + if (!Success) { ERR("WinLdrAllocateDataTableEntry() failed\n"); return FALSE; @@ -284,8 +284,8 @@ // Look for any dependencies it may have, and load them too sprintf(FullPath,"%s%s", BootPath, DriverPath); - Status = WinLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, *DriverDTE); - if (!Status) + Success = WinLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, *DriverDTE); + if (!Success) { ERR("WinLdrScanImportDescriptorTable() failed for %s\n", FullPath); return FALSE; @@ -300,7 +300,7 @@ { PLIST_ENTRY NextBd; PBOOT_DRIVER_LIST_ENTRY BootDriver; - BOOLEAN Status; + BOOLEAN Success; // Walk through the boot drivers list NextBd = LoaderBlock->BootDriverListHead.Flink; @@ -315,15 +315,15 @@ // Paths are relative (FIXME: Are they always relative?) // Load it - Status = WinLdrLoadDeviceDriver(&LoaderBlock->LoadOrderListHead, - BootPath, - &BootDriver->FilePath, - 0, - &BootDriver->LdrEntry); + Success = WinLdrLoadDeviceDriver(&LoaderBlock->LoadOrderListHead, + BootPath, + &BootDriver->FilePath, + 0, + &BootDriver->LdrEntry); // If loading failed - cry loudly //FIXME: Maybe remove it from the list and try to continue? - if (!Status) + if (!Success) { ERR("Can't load boot driver '%wZ'!", &BootDriver->FilePath); UiMessageBox("Can't load boot driver '%wZ'!", &BootDriver->FilePath); @@ -350,7 +350,7 @@ PVOID PhysicalBase; FILEINFORMATION FileInfo; ULONG FileSize; - ULONG Status; + ARC_STATUS Status; ULONG BytesRead; //CHAR ProgressString[256]; @@ -432,7 +432,7 @@ BOOLEAN IsKdTransportDll, ULONG Percentage) { - BOOLEAN Status; + BOOLEAN Success; CHAR FullFileName[MAX_PATH]; CHAR ProgressString[256]; PVOID BaseAdress = NULL; @@ -445,8 +445,8 @@ strcat(FullFileName, "SYSTEM32\\"); strcat(FullFileName, File); - Status = WinLdrLoadImage(FullFileName, MemoryType, &BaseAdress); - if (!Status) + Success = WinLdrLoadImage(FullFileName, MemoryType, &BaseAdress); + if (!Success) { TRACE("Loading %s failed\n", File); return FALSE; @@ -460,13 +460,13 @@ * the Kernel Debugger Transport DLL, to make the * PE loader happy. */ - Status = WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, - (IsKdTransportDll ? "KDCOM.DLL" : File), - FullFileName, - BaseAdress, - Dte); - - return Status; + Success = WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, + (IsKdTransportDll ? "KDCOM.DLL" : File), + FullFileName, + BaseAdress, + Dte); + + return Success; } static @@ -477,7 +477,7 @@ IN LPCSTR BootPath, IN OUT PLDR_DATA_TABLE_ENTRY* KernelDTE) { - BOOLEAN Status; + BOOLEAN Success; CHAR DirPath[MAX_PATH]; CHAR KdTransportDllName[MAX_PATH]; PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL; @@ -578,14 +578,14 @@ /* Load all referenced DLLs for Kernel, HAL and Kernel Debugger Transport DLL */ strcpy(DirPath, BootPath); strcat(DirPath, "system32\\"); - Status = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); - Status &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); + Success = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); + Success &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); if (KdComDTE) { - Status &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, KdComDTE); - } - - return Status; + Success &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, KdComDTE); + } + + return Success; } VOID @@ -600,7 +600,7 @@ CHAR FileName[MAX_PATH]; CHAR BootOptions[256]; PCHAR File; - BOOLEAN Status; + BOOLEAN Success; PLOADER_PARAMETER_BLOCK LoaderBlock; /* Get OS setting value */ @@ -688,12 +688,12 @@ /* Load Hive */ UiDrawBackdrop(); UiDrawProgressBarCenter(15, 100, "Loading system hive..."); - Status = WinLdrInitSystemHive(LoaderBlock, BootPath); - TRACE("SYSTEM hive %s\n", (Status ? "loaded" : "not loaded")); + Success = WinLdrInitSystemHive(LoaderBlock, BootPath); + TRACE("SYSTEM hive %s\n", (Success ? "loaded" : "not loaded")); /* Load NLS data, OEM font, and prepare boot drivers list */ - Status = WinLdrScanSystemHive(LoaderBlock, BootPath); - TRACE("SYSTEM hive %s\n", (Status ? "scanned" : "not scanned")); + Success = WinLdrScanSystemHive(LoaderBlock, BootPath); + TRACE("SYSTEM hive %s\n", (Success ? "scanned" : "not scanned")); /* Finish loading */ LoadAndBootWindowsCommon(OperatingSystemVersion, @@ -712,7 +712,7 @@ BOOLEAN Setup) { PLOADER_PARAMETER_BLOCK LoaderBlockVA; - BOOLEAN Status; + BOOLEAN Success; PLDR_DATA_TABLE_ENTRY KernelDTE; KERNEL_ENTRY_POINT KiSystemStartup; LPCSTR SystemRoot; @@ -733,12 +733,12 @@ OperatingSystemVersion = WinLdrDetectVersion(); /* Load the operating system core: the Kernel, the HAL and the Kernel Debugger Transport DLL */ - Status = LoadWindowsCore(OperatingSystemVersion, - LoaderBlock, - BootOptions, - BootPath, - &KernelDTE); - if (!Status) + Success = LoadWindowsCore(OperatingSystemVersion, + LoaderBlock, + BootOptions, + BootPath, + &KernelDTE); + if (!Success) { UiMessageBox("Error loading NTOS core."); return; @@ -747,8 +747,8 @@ /* Load boot drivers */ UiDrawBackdrop(); UiDrawProgressBarCenter(100, 100, "Loading boot drivers..."); - Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); - TRACE("Boot drivers loaded with status %d\n", Status); + Success = WinLdrLoadBootDrivers(LoaderBlock, BootPath); + TRACE("Boot drivers loading %s\n", Success ? "successful" : "failed"); /* Initialize Phase 1 - no drivers loading anymore */ WinLdrInitializePhase1(LoaderBlock, 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] Mon Jan 5 01:34:29 2015 @@ -35,7 +35,7 @@ { ULONG FileId; CHAR FullHiveName[256]; - LONG Status; + ARC_STATUS Status; FILEINFORMATION FileInfo; ULONG HiveFileSize; ULONG_PTR HiveDataPhysical; @@ -48,7 +48,6 @@ strcat(FullHiveName, HiveName); //Print(L"Loading %s...\n", FullHiveName); Status = ArcOpen(FullHiveName, OpenReadOnly, &FileId); - if (Status != ESUCCESS) { UiMessageBox("Opening hive file failed!"); @@ -57,7 +56,6 @@ /* Get the file length */ Status = ArcGetFileInformation(FileId, &FileInfo); - if (Status != ESUCCESS) { ArcClose(FileId); @@ -98,12 +96,13 @@ FsService = FsGetServiceName(FileId); if (FsService) { + BOOLEAN Success; TRACE(" Adding filesystem service %S\n", FsService); - Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - NULL, - (LPWSTR)FsService); - if (!Status) + Success = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", + NULL, + (LPWSTR)FsService); + if (!Success) TRACE(" Failed to add filesystem service\n"); } else @@ -119,7 +118,7 @@ IN LPCSTR DirectoryPath) { CHAR SearchPath[1024]; - BOOLEAN Status; + BOOLEAN Success; // There is a simple logic here: try to load usual hive (system), if it // fails, then give system.alt a try, and finally try a system.sav @@ -127,18 +126,18 @@ // FIXME: For now we only try system strcpy(SearchPath, DirectoryPath); strcat(SearchPath, "SYSTEM32\\CONFIG\\"); - Status = WinLdrLoadSystemHive(LoaderBlock, SearchPath, "SYSTEM"); + Success = WinLdrLoadSystemHive(LoaderBlock, SearchPath, "SYSTEM"); // Fail if failed... - if (!Status) + if (!Success) return FALSE; // Initialize in-memory registry RegInitializeRegistry(); // Import what was loaded - Status = RegImportBinaryHive((PCHAR)VaToPa(LoaderBlock->RegistryBase), LoaderBlock->RegistryLength); - if (!Status) + Success = RegImportBinaryHive((PCHAR)VaToPa(LoaderBlock->RegistryBase), LoaderBlock->RegistryLength); + if (!Success) { UiMessageBox("Importing binary hive failed!"); return FALSE; @@ -159,14 +158,14 @@ { CHAR SearchPath[1024]; CHAR AnsiName[256], OemName[256], LangName[256]; - BOOLEAN Status; + BOOLEAN Success; // Scan registry and prepare boot drivers list WinLdrScanRegistry(&LoaderBlock->BootDriverListHead, DirectoryPath); // Get names of NLS files - Status = WinLdrGetNLSNames(AnsiName, OemName, LangName); - if (!Status) + Success = WinLdrGetNLSNames(AnsiName, OemName, LangName); + if (!Success) { UiMessageBox("Getting NLS names from registry failed!"); return FALSE; @@ -177,8 +176,8 @@ // Load NLS data strcpy(SearchPath, DirectoryPath); strcat(SearchPath, "SYSTEM32\\"); - Status = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); - TRACE("NLS data loaded with status %d\n", Status); + Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); + TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); /* TODO: Load OEM HAL font */ @@ -298,7 +297,8 @@ PVOID NlsVirtual; BOOLEAN AnsiEqualsOem = FALSE; FILEINFORMATION FileInfo; - ULONG BytesRead, Status; + ULONG BytesRead; + ARC_STATUS Status; /* There may be a case, when OEM and ANSI page coincide */ if (!strcmp(AnsiFileName, OemFileName)) @@ -309,7 +309,6 @@ strcpy(FileName, DirectoryPath); strcat(FileName, AnsiFileName); Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); - if (Status != ESUCCESS) goto Failure; @@ -331,7 +330,6 @@ strcpy(FileName, DirectoryPath); strcat(FileName, OemFileName); Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); - if (Status != ESUCCESS) goto Failure; @@ -348,7 +346,6 @@ strcpy(FileName, DirectoryPath); strcat(FileName, LanguageFileName); Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); - if (Status != ESUCCESS) goto Failure; @@ -390,12 +387,10 @@ strcpy(FileName, DirectoryPath); strcat(FileName, AnsiFileName); Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); - if (Status != ESUCCESS) goto Failure; Status = ArcRead(AnsiFileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); - if (Status != ESUCCESS) goto Failure; @@ -407,12 +402,10 @@ strcpy(FileName, DirectoryPath); strcat(FileName, OemFileName); Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); - if (Status != ESUCCESS) goto Failure; Status = ArcRead(OemFileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); - if (Status != ESUCCESS) goto Failure; @@ -423,12 +416,10 @@ strcpy(FileName, DirectoryPath); strcat(FileName, LanguageFileName); Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); - if (Status != ESUCCESS) goto Failure; Status = ArcRead(LanguageFileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); - if (Status != ESUCCESS) goto Failure; @@ -475,7 +466,7 @@ CHAR ImagePath[256]; WCHAR TempImagePath[256]; - BOOLEAN Status; + BOOLEAN Success; /* get 'service group order' key */ rc = RegOpenKey(NULL, @@ -570,33 +561,37 @@ /* Make sure it should be started */ if ((StartValue == 0) && (TagValue == OrderList[TagIndex]) && - (_wcsicmp(DriverGroup, GroupName) == 0)) { - - /* Get the Driver's Location */ - ValueSize = sizeof(TempImagePath); - rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); - - /* Write the whole path if it suceeded, else prepare to fail */ - if (rc != ERROR_SUCCESS) { - TRACE_CH(REACTOS, "ImagePath: not found\n"); - TempImagePath[0] = 0; - sprintf(ImagePath, "%s\\system32\\drivers\\%S.sys", DirectoryPath, ServiceName); - } else if (TempImagePath[0] != L'\\') { - sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath); - } else { - sprintf(ImagePath, "%S", TempImagePath); - TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); - } - - TRACE("Adding boot driver: '%s'\n", ImagePath); - - Status = WinLdrAddDriverToList(BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - TempImagePath, - ServiceName); - - if (!Status) - ERR("Failed to add boot driver\n"); + (_wcsicmp(DriverGroup, GroupName) == 0)) + { + /* Get the Driver's Location */ + ValueSize = sizeof(TempImagePath); + rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); + + /* Write the whole path if it suceeded, else prepare to fail */ + if (rc != ERROR_SUCCESS) + { + TRACE_CH(REACTOS, "ImagePath: not found\n"); + TempImagePath[0] = 0; + sprintf(ImagePath, "%s\\system32\\drivers\\%S.sys", DirectoryPath, ServiceName); + } + else if (TempImagePath[0] != L'\\') + { + sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath); + } + else + { + sprintf(ImagePath, "%S", TempImagePath); + TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); + } + + TRACE("Adding boot driver: '%s'\n", ImagePath); + + Success = WinLdrAddDriverToList(BootDriverListHead, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", + TempImagePath, + ServiceName); + if (!Success) + ERR("Failed to add boot driver\n"); } else { @@ -642,35 +637,40 @@ rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); //TRACE_CH(REACTOS, " Group: '%S' \n", DriverGroup); - for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) { + for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) + { if (TagValue == OrderList[TagIndex]) break; } if ((StartValue == 0) && (TagIndex > OrderList[0]) && - (_wcsicmp(DriverGroup, GroupName) == 0)) { - - ValueSize = sizeof(TempImagePath); - rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); - if (rc != ERROR_SUCCESS) { - TRACE_CH(REACTOS, "ImagePath: not found\n"); - TempImagePath[0] = 0; - sprintf(ImagePath, "%ssystem32\\drivers\\%S.sys", DirectoryPath, ServiceName); - } else if (TempImagePath[0] != L'\\') { - sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath); - } else { - sprintf(ImagePath, "%S", TempImagePath); - TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); - } - TRACE(" Adding boot driver: '%s'\n", ImagePath); - - Status = WinLdrAddDriverToList(BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - TempImagePath, - ServiceName); - - if (!Status) - ERR(" Failed to add boot driver\n"); + (_wcsicmp(DriverGroup, GroupName) == 0)) + { + ValueSize = sizeof(TempImagePath); + rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); + if (rc != ERROR_SUCCESS) + { + TRACE_CH(REACTOS, "ImagePath: not found\n"); + TempImagePath[0] = 0; + sprintf(ImagePath, "%ssystem32\\drivers\\%S.sys", DirectoryPath, ServiceName); + } + else if (TempImagePath[0] != L'\\') + { + sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath); + } + else + { + sprintf(ImagePath, "%S", TempImagePath); + TRACE_CH(REACTOS, "ImagePath: '%s'\n", ImagePath); + } + TRACE(" Adding boot driver: '%s'\n", ImagePath); + + Success = WinLdrAddDriverToList(BootDriverListHead, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", + TempImagePath, + ServiceName); + if (!Success) + ERR(" Failed to add boot driver\n"); } else {

9 years, 11 months

[hbelusca] 65983: [USETUP]: "/RDIMAGEPATH" was a relinquish of very old FreeLdr code, at the time we had a special ReactOS boot method. Now we use a NTLDR-compatible switch "/RDPATH".

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jan 5 00:46:08 2015 New Revision: 65983 URL: http://svn.reactos.org/svn/reactos?rev=65983&view=rev Log: [USETUP]: "/RDIMAGEPATH" was a relinquish of very old FreeLdr code, at the time we had a special ReactOS boot method. Now we use a NTLDR-compatible switch "/RDPATH". Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Mon Jan 5 00:46:08 2015 @@ -509,7 +509,7 @@ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"", L"Windows2003", L"ramdisk(0)\\ReactOS", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDPATH=reactos.img /RDIMAGEOFFSET=32256"); /* ReactOS_EMS */ CreateFreeLoaderEntry(IniCache, IniSection,

9 years, 11 months

[hbelusca] 65982: [FREELDR] - Correctly append a backslash to the BootPath (if needed). - Be able to specify relative boot paths (relative to the current boot device): as a consequence, remove the ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 4 23:49:18 2015 New Revision: 65982 URL: http://svn.reactos.org/svn/reactos?rev=65982&view=rev Log: [FREELDR] - Correctly append a backslash to the BootPath (if needed). - Be able to specify relative boot paths (relative to the current boot device): as a consequence, remove the "LiveCD" hackish special value that was introduced long long ago. - Fix BootPath retrieval in ReactOSSetup mode (via the SystemPath optional value), and use a better way to build the temporary txtsetup.sif full file names. As a consequence we can now build hybrid cds with the following architecture: \ --> loader\ (bootsectors + free/setupldr.sys) --> myboot\ (contents of what_defaults_to_reactos directory for the bootcd) --> mylive\ (contents of what_defaults_to_reactos directory for the livecd) --> <regular_files> and freeldr.ini specifying the following values: ; The Setup entry [Setup] BootType=ReactOSSetup SystemPath=\myboot ; The LiveCD entry [LiveCD] BootType=Windows2003 SystemPath=\mylive Options=/MININT Part 2/2 CORE-9023 Modified: trunk/reactos/boot/bootdata/livecd.ini trunk/reactos/boot/freeldr/freeldr/CHANGELOG trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] Sun Jan 4 23:49:18 2015 @@ -32,20 +32,20 @@ [LiveCD] BootType=Windows2003 -SystemPath=LiveCD\reactos +SystemPath=\reactos Options=/MININT [LiveCD_Debug] BootType=Windows2003 -SystemPath=LiveCD\reactos +SystemPath=\reactos Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT [LiveCD_Screen] BootType=Windows2003 -SystemPath=LiveCD\reactos +SystemPath=\reactos Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT [LiveCD_LogFile] BootType=Windows2003 -SystemPath=LiveCD\reactos +SystemPath=\reactos Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT Modified: trunk/reactos/boot/freeldr/freeldr/CHANGELOG URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CHANG… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CHANGELOG [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CHANGELOG [iso-8859-1] Sun Jan 4 23:49:18 2015 @@ -1,3 +1,9 @@ +Changes in v3.0+ (05/01/2015) (hbelusca) + +- Remove support for special value "LiveCD" of SystemPath option + for loading ReactOS since now we treat non-ARC SystemPath as + a path relative to the boot path. + Changes in v3.0.0 (11/12/2007) (fball) - Support for building an ARC Tree. Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Sun Jan 4 23:49:18 2015 @@ -178,17 +178,40 @@ HasSection = IniOpenSection(SectionName, &SectionId); UiDrawBackdrop(); - UiDrawProgressBarCenter(1, 100, "Loading NT..."); + UiDrawProgressBarCenter(1, 100, "Loading ReactOS Setup..."); /* Read the system path is set in the .ini file */ if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) { + // MachDiskGetBootPath(BootPath, sizeof(BootPath)); + // strcpy(BootPath, SectionName); + } + + /* + * Check whether BootPath is a full path + * and if not, create a full boot path. + * + * See FsOpenFile for the technique used. + */ + if (strrchr(BootPath, ')') == NULL) + { + /* Temporarily save the boot path */ + strcpy(FileName, BootPath); + + /* This is not a full path. Use the current (i.e. boot) device. */ MachDiskGetBootPath(BootPath, sizeof(BootPath)); - } - - /* Append a backslash */ - if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') + + /* Append a path separator if needed */ + if (FileName[0] != '\\' && FileName[0] != '/') + strcat(BootPath, "\\"); + + /* Append the remaining path */ + strcat(BootPath, FileName); + } + + /* Append a backslash if needed */ + if ((strlen(BootPath) == 0) || BootPath[strlen(BootPath) - 1] != '\\') strcat(BootPath, "\\"); /* Read booting options */ @@ -233,10 +256,11 @@ ERR("Failed to open txtsetup.sif\n"); return; } - sprintf(File, "%stxtsetup.sif", SystemPath); - if (InfOpenFile (&InfHandle, BootPath, &ErrorLine)) + strcpy(File, SystemPath); + strcpy(FileName, BootPath); + strcat(FileName, "txtsetup.sif"); + if (InfOpenFile(&InfHandle, FileName, &ErrorLine)) { - sprintf(File, "%s", SystemPath); break; } } 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] Sun Jan 4 23:49:18 2015 @@ -621,16 +621,30 @@ strcpy(BootPath, SectionName); } - /* Special case for LiveCD */ - if (!_strnicmp(BootPath, "LiveCD", strlen("LiveCD"))) - { - strcpy(FileName, BootPath + strlen("LiveCD")); + /* + * Check whether BootPath is a full path + * and if not, create a full boot path. + * + * See FsOpenFile for the technique used. + */ + if (strrchr(BootPath, ')') == NULL) + { + /* Temporarily save the boot path */ + strcpy(FileName, BootPath); + + /* This is not a full path. Use the current (i.e. boot) device. */ MachDiskGetBootPath(BootPath, sizeof(BootPath)); + + /* Append a path separator if needed */ + if (FileName[0] != '\\' && FileName[0] != '/') + strcat(BootPath, "\\"); + + /* Append the remaining path */ strcat(BootPath, FileName); } - /* Append a backslash */ - if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') + /* Append a backslash if needed */ + if ((strlen(BootPath) == 0) || BootPath[strlen(BootPath) - 1] != '\\') strcat(BootPath, "\\"); /* Read booting options */

9 years, 11 months

[hbelusca] 65981: [FREELDR] - Some whitespace fixes in fs.h and code simplifications in fs.c - Make FsOpenFile working correctly on non-ARC and ARC file names. - Use FsOpenFile for opening ramdisks...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 4 23:41:14 2015 New Revision: 65981 URL: http://svn.reactos.org/svn/reactos?rev=65981&view=rev Log: [FREELDR] - Some whitespace fixes in fs.h and code simplifications in fs.c - Make FsOpenFile working correctly on non-ARC and ARC file names. - Use FsOpenFile for opening ramdisks instead of ArcOpen (the file "handle" returned by FsOpenFile is just the FileId for ARC functions). Therefore we can open ramdisks files using Windows OSLOADER syntax, i.e. /RDPATH=the_image_file instead of being forced to append for example: net(0) (as in: /RDPATH=net(0)\the_image_file ): see http://lokniketan.org/index.php?title=PXE_booting_to_BARTPE#Work_with_files… for an example of what I mean. Part 1/2 CORE-9023 Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/include/fs.h Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sun Jan 4 23:41:14 2015 @@ -120,9 +120,9 @@ NTAPI RamDiskLoadVirtualFile(IN PCHAR FileName) { - ULONG RamFile; + PFILE RamFile; ULONG TotalRead, ChunkSize, Count; - PCHAR MsgBuffer = "Loading ramdisk..."; + PCHAR MsgBuffer = "Loading RamDisk..."; ULONG PercentPerChunk, Percent; FILEINFORMATION Information; LARGE_INTEGER Position; @@ -136,99 +136,99 @@ // // Try opening the ramdisk file // - ret = ArcOpen(FileName, OpenReadOnly, &RamFile); - if (ret == ESUCCESS) - { - // - // Get the file size - // - ret = ArcGetFileInformation(RamFile, &Information); - if (ret != ESUCCESS) + RamFile = FsOpenFile(FileName); + if (!RamFile) + return; + + // + // Get the file size + // + ret = ArcGetFileInformation(RamFile, &Information); + if (ret != ESUCCESS) + { + FsCloseFile(RamFile); + return; + } + + // + // For now, limit RAM disks to 4GB + // + if (Information.EndingAddress.HighPart != 0) + { + UiMessageBox("RAM disk too big\n"); + FsCloseFile(RamFile); + return; + } + gRamDiskSize = Information.EndingAddress.LowPart; + + // + // Allocate memory for it + // + ChunkSize = 8 * 1024 * 1024; + if (gRamDiskSize < ChunkSize) + Percent = PercentPerChunk = 0; + else + Percent = PercentPerChunk = 100 / (gRamDiskSize / ChunkSize); + gRamDiskBase = MmAllocateMemoryWithType(gRamDiskSize, LoaderXIPRom); + if (!gRamDiskBase) + { + UiMessageBox("Failed to allocate memory for RAM disk\n"); + FsCloseFile(RamFile); + return; + } + + // + // Read it in chunks + // + for (TotalRead = 0; TotalRead < gRamDiskSize; TotalRead += ChunkSize) + { + // + // Check if we're at the last chunk + // + if ((gRamDiskSize - TotalRead) < ChunkSize) { - ArcClose(RamFile); + // + // Only need the actual data required + // + ChunkSize = gRamDiskSize - TotalRead; + } + + // + // Draw progress + // + UiDrawProgressBarCenter(Percent, 100, MsgBuffer); + Percent += PercentPerChunk; + + // + // Copy the contents + // + Position.HighPart = 0; + Position.LowPart = TotalRead; + ret = ArcSeek(RamFile, &Position, SeekAbsolute); + if (ret == ESUCCESS) + { + ret = ArcRead(RamFile, + (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead), + ChunkSize, + &Count); + } + + // + // Check for success + // + if (ret != ESUCCESS || Count != ChunkSize) + { + MmFreeMemory(gRamDiskBase); + gRamDiskBase = NULL; + gRamDiskSize = 0; + FsCloseFile(RamFile); + UiMessageBox("Failed to read RamDisk\n"); return; } - - // - // For now, limit RAM disks to 4GB - // - if (Information.EndingAddress.HighPart != 0) - { - UiMessageBox("RAM disk too big\n"); - ArcClose(RamFile); - return; - } - gRamDiskSize = Information.EndingAddress.LowPart; - - // - // Allocate memory for it - // - ChunkSize = 8 * 1024 * 1024; - if (gRamDiskSize < ChunkSize) - Percent = PercentPerChunk = 0; - else - Percent = PercentPerChunk = 100 / (gRamDiskSize / ChunkSize); - gRamDiskBase = MmAllocateMemoryWithType(gRamDiskSize, LoaderXIPRom); - if (!gRamDiskBase) - { - UiMessageBox("Failed to allocate memory for RAM disk\n"); - ArcClose(RamFile); - return; - } - - // - // Read it in chunks - // - for (TotalRead = 0; TotalRead < gRamDiskSize; TotalRead += ChunkSize) - { - // - // Check if we're at the last chunk - // - if ((gRamDiskSize - TotalRead) < ChunkSize) - { - // - // Only need the actual data required - // - ChunkSize = gRamDiskSize - TotalRead; - } - - // - // Draw progress - // - UiDrawProgressBarCenter(Percent, 100, MsgBuffer); - Percent += PercentPerChunk; - - // - // Copy the contents - // - Position.HighPart = 0; - Position.LowPart = TotalRead; - ret = ArcSeek(RamFile, &Position, SeekAbsolute); - if (ret == ESUCCESS) - { - ret = ArcRead(RamFile, - (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead), - ChunkSize, - &Count); - } - - // - // Check for success - // - if (ret != ESUCCESS || Count != ChunkSize) - { - MmFreeMemory(gRamDiskBase); - gRamDiskBase = NULL; - gRamDiskSize = 0; - ArcClose(RamFile); - UiMessageBox("Failed to read ramdisk\n"); - return; - } - } - - ArcClose(RamFile); - - // Register a new device for the ramdisk - FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); - } -} + } + + FsCloseFile(RamFile); + + // Register a new device for the ramdisk + FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); +} 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] Sun Jan 4 23:41:14 2015 @@ -54,31 +54,6 @@ static LIST_ENTRY DeviceListHead; /* ARC FUNCTIONS **************************************************************/ - -ARC_STATUS 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; - FileData[FileId].DeviceId = -1; - } - return ret; -} - -ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information) -{ - if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) - return EBADF; - return FileData[FileId].FuncTable->GetFileInformation(FileId, Information); -} ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { @@ -239,6 +214,24 @@ return ret; } +ARC_STATUS 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; + FileData[FileId].DeviceId = -1; + } + return ret; +} + ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) @@ -253,18 +246,24 @@ return FileData[FileId].FuncTable->Seek(FileId, Position, SeekMode); } +ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return EBADF; + return FileData[FileId].FuncTable->GetFileInformation(FileId, Information); +} + /* FUNCTIONS ******************************************************************/ VOID FileSystemError(PCSTR ErrorString) { ERR("%s\n", ErrorString); - UiMessageBox(ErrorString); } PFILE FsOpenFile(PCSTR FileName) { - CHAR FullPath[MAX_PATH]; + CHAR FullPath[MAX_PATH] = ""; ULONG FileId; LONG ret; @@ -274,9 +273,21 @@ TRACE("Opening file '%s'...\n", FileName); // - // Create full file name - // - MachDiskGetBootPath(FullPath, sizeof(FullPath)); + // Check whether FileName is a full path + // and if not, create a full file name. + // + // See ArcOpen: Search last ')', which delimits device and path. + // + if (strrchr(FileName, ')') == NULL) + { + /* This is not a full path. Use the current (i.e. boot) device. */ + MachDiskGetBootPath(FullPath, sizeof(FullPath)); + + /* Append a path separator if needed */ + if (FileName[0] != '\\' && FileName[0] != '/') + strcat(FullPath, "\\"); + } + // Append (or just copy) the remaining file name. strcat(FullPath, FileName); // @@ -298,14 +309,10 @@ ULONG FileId = (ULONG)FileHandle; // - // Close the handle + // Close the handle. Do not check for error, + // this function is supposed to always succeed. // ArcClose(FileId); - - // - // Do not check for error; this function is - // supposed to always succeed - // } /* @@ -315,17 +322,21 @@ BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) { ULONG FileId = (ULONG)FileHandle; - LONG ret; // // Read the file // - ret = ArcRead(FileId, Buffer, BytesToRead, BytesRead); - - // - // Check for success - // - return (ret == ESUCCESS); + return (ArcRead(FileId, Buffer, BytesToRead, BytesRead) == ESUCCESS); +} + +BOOLEAN FsGetFileInformation(PFILE FileHandle, FILEINFORMATION* Information) +{ + ULONG FileId = (ULONG)FileHandle; + + // + // Get file information + // + return (ArcGetFileInformation(FileId, Information) == ESUCCESS); } ULONG FsGetFileSize(PFILE FileHandle) @@ -357,16 +368,12 @@ LARGE_INTEGER Position; // - // Set file position + // Set file position. Do not check for error, + // this function is supposed to always succeed. // Position.HighPart = 0; Position.LowPart = NewFilePointer; ArcSeek(FileId, &Position, SeekAbsolute); - - // - // Do not check for error; this function is - // supposed to always succeed - // } /* 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] Sun Jan 4 23:41:14 2015 @@ -21,41 +21,42 @@ typedef struct tagDEVVTBL { - ARC_CLOSE Close; - ARC_GET_FILE_INFORMATION GetFileInformation; - ARC_OPEN Open; - ARC_READ Read; - ARC_SEEK Seek; - LPCWSTR ServiceName; + ARC_CLOSE Close; + ARC_GET_FILE_INFORMATION GetFileInformation; + ARC_OPEN Open; + ARC_READ Read; + ARC_SEEK Seek; + LPCWSTR ServiceName; } DEVVTBL; -#define FS_FAT 1 -#define FS_NTFS 2 -#define FS_EXT2 3 -#define FS_ISO9660 5 +#define FS_FAT 1 +#define FS_NTFS 2 +#define FS_EXT2 3 +#define FS_ISO9660 5 -#define PFILE ULONG +#define PFILE ULONG + +ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); +ARC_STATUS ArcClose(ULONG FileId); +ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); +ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); +ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information); + +VOID FileSystemError(PCSTR ErrorString); +PFILE FsOpenFile(PCSTR FileName); +VOID FsCloseFile(PFILE FileHandle); +BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); +BOOLEAN FsGetFileInformation(PFILE FileHandle, FILEINFORMATION* Information); +ULONG FsGetFileSize(PFILE FileHandle); +VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer); +ULONG FsGetNumPathParts(PCSTR Path); +VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable); LPCWSTR FsGetServiceName(ULONG FileId); -VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); +VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); VOID* FsGetDeviceSpecific(ULONG FileId); ULONG FsGetDeviceId(ULONG FileId); -VOID FsInit(VOID); - -ARC_STATUS ArcClose(ULONG FileId); -ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information); -ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); -ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); -ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); - -VOID FileSystemError(PCSTR ErrorString); -PFILE FsOpenFile(PCSTR FileName); -VOID FsCloseFile(PFILE FileHandle); -BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); -ULONG FsGetFileSize(PFILE FileHandle); -VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer); -ULONG FsGetNumPathParts(PCSTR Path); -VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); +VOID FsInit(VOID); #define MAX_FDS 60

9 years, 11 months

[jimtabor] 65980: [User32] - Disable Ime Class support until Win32k Init bugs are fixed. 8^( Fix test bot.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jan 4 19:40:56 2015 New Revision: 65980 URL: http://svn.reactos.org/svn/reactos?rev=65980&view=rev Log: [User32] - Disable Ime Class support until Win32k Init bugs are fixed. 8^( Fix test bot. Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sun Jan 4 19:40:56 2015 @@ -523,7 +523,7 @@ if (!gfServerProcess) { - InitializeImmEntryTable(); + //InitializeImmEntryTable(); // // Wine is stub and throws an exception so save this for real Imm32.dll testing!!!! //

9 years, 11 months

[hbelusca] 65979: [FREELDR] Some more code reorg before real fixes happen.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 4 19:37:12 2015 New Revision: 65979 URL: http://svn.reactos.org/svn/reactos?rev=65979&view=rev Log: [FREELDR] Some more code reorg before real fixes happen. Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Sun Jan 4 19:37:12 2015 @@ -133,10 +133,8 @@ strcpy(BootPath, Path); - strcat(BootPath, "fdisk"); - _itoa(FrldrBootDrive, Device, 10); - strcat(BootPath, "("); + strcat(BootPath, "fdisk("); strcat(BootPath, Device); strcat(BootPath, ")"); } @@ -163,10 +161,8 @@ strcpy(BootPath, Path); - strcat(BootPath, "rdisk"); - _itoa(FrldrBootDrive - 0x80, Device, 10); - strcat(BootPath, "("); + strcat(BootPath, "rdisk("); strcat(BootPath, Device); strcat(BootPath, ")"); @@ -186,10 +182,8 @@ strcpy(BootPath, Path); - strcat(BootPath, "cdrom"); - _itoa(FrldrBootDrive - 0x80, Device, 10); - strcat(BootPath, "("); + strcat(BootPath, "cdrom("); strcat(BootPath, Device); strcat(BootPath, ")"); } 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] Sun Jan 4 19:37:12 2015 @@ -18,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* INCLUDES *******************************************************************/ + #include <freeldr.h> #define NDEBUG @@ -25,180 +27,10 @@ DBG_DEFAULT_CHANNEL(FILESYSTEM); +/* GLOBALS ********************************************************************/ + #define TAG_DEVICE_NAME 'NDsF' #define TAG_DEVICE 'vDsF' - -///////////////////////////////////////////////////////////////////////////////////////////// -// FUNCTIONS -///////////////////////////////////////////////////////////////////////////////////////////// - -VOID FileSystemError(PCSTR ErrorString) -{ - ERR("%s\n", ErrorString); - - UiMessageBox(ErrorString); -} - -PFILE FsOpenFile(PCSTR FileName) -{ - CHAR FullPath[MAX_PATH]; - ULONG FileId; - LONG ret; - - // - // Print status message - // - TRACE("Opening file '%s'...\n", FileName); - - // - // Create full file name - // - MachDiskGetBootPath(FullPath, sizeof(FullPath)); - strcat(FullPath, FileName); - - // - // Open the file - // - ret = ArcOpen(FullPath, OpenReadOnly, &FileId); - - // - // Check for success - // - if (ret == ESUCCESS) - return (PFILE)FileId; - else - return (PFILE)0; -} - -VOID FsCloseFile(PFILE FileHandle) -{ - ULONG FileId = (ULONG)FileHandle; - - // - // Close the handle - // - ArcClose(FileId); - - // - // Do not check for error; this function is - // supposed to always succeed - // -} - -/* - * ReadFile() - * returns number of bytes read or EOF - */ -BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) -{ - ULONG FileId = (ULONG)FileHandle; - LONG ret; - - // - // Read the file - // - ret = ArcRead(FileId, Buffer, BytesToRead, BytesRead); - - // - // Check for success - // - return (ret == ESUCCESS); -} - -ULONG FsGetFileSize(PFILE FileHandle) -{ - ULONG FileId = (ULONG)FileHandle; - FILEINFORMATION Information; - LONG ret; - - // - // Query file informations - // - ret = ArcGetFileInformation(FileId, &Information); - - // - // Check for error - // - if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0) - return 0; - - // - // Return file size - // - return Information.EndingAddress.LowPart; -} - -VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer) -{ - ULONG FileId = (ULONG)FileHandle; - LARGE_INTEGER Position; - - // - // Set file position - // - Position.HighPart = 0; - Position.LowPart = NewFilePointer; - ArcSeek(FileId, &Position, SeekAbsolute); - - // - // Do not check for error; this function is - // supposed to always succeed - // -} - -/* - * FsGetNumPathParts() - * This function parses a path in the form of dir1\dir2\file1.ext - * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext) - */ -ULONG FsGetNumPathParts(PCSTR Path) -{ - size_t i; - ULONG num; - - for (i = 0, num = 0; i < strlen(Path); i++) - { - if ((Path[i] == '\\') || (Path[i] == '/')) - { - num++; - } - } - num++; - - TRACE("FsGetNumPathParts() Path = %s NumPathParts = %d\n", Path, num); - - return num; -} - -/* - * FsGetFirstNameFromPath() - * This function parses a path in the form of dir1\dir2\file1.ext - * and puts the first name of the path (e.g. "dir1") in buffer - * compatible with the MSDOS directory structure - */ -VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) -{ - size_t i; - - // Copy all the characters up to the end of the - // string or until we hit a '\' character - // and put them in Buffer - for (i = 0; i < strlen(Path); i++) - { - if ((Path[i] == '\\') || (Path[i] == '/')) - { - break; - } - else - { - Buffer[i] = Path[i]; - } - } - - Buffer[i] = 0; - - TRACE("FsGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); -} typedef struct tagFILEDATA { @@ -220,6 +52,8 @@ static FILEDATA FileData[MAX_FDS]; static LIST_ENTRY DeviceListHead; + +/* ARC FUNCTIONS **************************************************************/ ARC_STATUS ArcClose(ULONG FileId) { @@ -419,6 +253,176 @@ return FileData[FileId].FuncTable->Seek(FileId, Position, SeekMode); } +/* FUNCTIONS ******************************************************************/ + +VOID FileSystemError(PCSTR ErrorString) +{ + ERR("%s\n", ErrorString); + + UiMessageBox(ErrorString); +} + +PFILE FsOpenFile(PCSTR FileName) +{ + CHAR FullPath[MAX_PATH]; + ULONG FileId; + LONG ret; + + // + // Print status message + // + TRACE("Opening file '%s'...\n", FileName); + + // + // Create full file name + // + MachDiskGetBootPath(FullPath, sizeof(FullPath)); + strcat(FullPath, FileName); + + // + // Open the file + // + ret = ArcOpen(FullPath, OpenReadOnly, &FileId); + + // + // Check for success + // + if (ret == ESUCCESS) + return (PFILE)FileId; + else + return (PFILE)0; +} + +VOID FsCloseFile(PFILE FileHandle) +{ + ULONG FileId = (ULONG)FileHandle; + + // + // Close the handle + // + ArcClose(FileId); + + // + // Do not check for error; this function is + // supposed to always succeed + // +} + +/* + * ReadFile() + * returns number of bytes read or EOF + */ +BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) +{ + ULONG FileId = (ULONG)FileHandle; + LONG ret; + + // + // Read the file + // + ret = ArcRead(FileId, Buffer, BytesToRead, BytesRead); + + // + // Check for success + // + return (ret == ESUCCESS); +} + +ULONG FsGetFileSize(PFILE FileHandle) +{ + ULONG FileId = (ULONG)FileHandle; + FILEINFORMATION Information; + LONG ret; + + // + // Query file informations + // + ret = ArcGetFileInformation(FileId, &Information); + + // + // Check for error + // + if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0) + return 0; + + // + // Return file size + // + return Information.EndingAddress.LowPart; +} + +VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer) +{ + ULONG FileId = (ULONG)FileHandle; + LARGE_INTEGER Position; + + // + // Set file position + // + Position.HighPart = 0; + Position.LowPart = NewFilePointer; + ArcSeek(FileId, &Position, SeekAbsolute); + + // + // Do not check for error; this function is + // supposed to always succeed + // +} + +/* + * FsGetNumPathParts() + * This function parses a path in the form of dir1\dir2\file1.ext + * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext) + */ +ULONG FsGetNumPathParts(PCSTR Path) +{ + size_t i; + ULONG num; + + for (i = 0, num = 0; i < strlen(Path); i++) + { + if ((Path[i] == '\\') || (Path[i] == '/')) + { + num++; + } + } + num++; + + TRACE("FsGetNumPathParts() Path = %s NumPathParts = %d\n", Path, num); + + return num; +} + +/* + * FsGetFirstNameFromPath() + * This function parses a path in the form of dir1\dir2\file1.ext + * and puts the first name of the path (e.g. "dir1") in buffer + * compatible with the MSDOS directory structure + */ +VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) +{ + size_t i; + + // Copy all the characters up to the end of the + // string or until we hit a '\' character + // and put them in Buffer + for (i = 0; i < strlen(Path); i++) + { + if ((Path[i] == '\\') || (Path[i] == '/')) + { + break; + } + else + { + Buffer[i] = Path[i]; + } + } + + Buffer[i] = 0; + + TRACE("FsGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); +} + VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) { DEVICE* pNewEntry;

9 years, 11 months

[jimtabor] 65978: [User32] - Now move Dde function from stubs.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jan 4 19:34:58 2015 New Revision: 65978 URL: http://svn.reactos.org/svn/reactos?rev=65978&view=rev Log: [User32] - Now move Dde function from stubs. Modified: trunk/reactos/win32ss/user/user32/misc/dde.c trunk/reactos/win32ss/user/user32/misc/stubs.c Modified: trunk/reactos/win32ss/user/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] Sun Jan 4 19:34:58 2015 @@ -2,5 +2,13 @@ #include <user32.h> #include <wine/debug.h> -//WINE_DEFAULT_DEBUG_CHANNEL(ddeml); +WINE_DEFAULT_DEBUG_CHANNEL(ddeml); +/* + * @unimplemented + */ +BOOL WINAPI DdeGetQualityOfService(HWND hWnd, DWORD Reserved, PSECURITY_QUALITY_OF_SERVICE pqosPrev) +{ + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Sun Jan 4 19:34:58 2015 @@ -465,15 +465,6 @@ VOID WINAPI ShowStartGlass(DWORD unknown) { UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -BOOL WINAPI DdeGetQualityOfService(HWND hWnd, DWORD Reserved, PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - UNIMPLEMENTED; - return FALSE; } /*

9 years, 11 months

[jimtabor] 65977: [Win32s] - Implement Ime (only) class support. This is for the new synced class tests. Recommending Developers choice for testing real Imm32.dll support. Should include registry L...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jan 4 19:27:40 2015 New Revision: 65977 URL: http://svn.reactos.org/svn/reactos?rev=65977&view=rev Log: [Win32s] - Implement Ime (only) class support. This is for the new synced class tests. Recommending Developers choice for testing real Imm32.dll support. Should include registry Loading of IMM via Win32k. - Based on patch by Piotr Caban : Move IME window procedure to user32. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/user32/controls/regcontrol.c trunk/reactos/win32ss/user/user32/include/regcontrol.h trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/misc/imm.c trunk/reactos/win32ss/user/user32/misc/stubs.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -1120,6 +1120,32 @@ INT fCUASLayer:1; }; } IMEINFOEX, *PIMEINFOEX; + +typedef struct tagIMEUI +{ + PWND spwnd; + HIMC hIMC; + HWND hwndIMC; + HKL hKL; + HWND hwndUI; + INT nCntInIMEProc; + struct { + UINT fShowStatus:1; + UINT fActivate:1; + UINT fDestroy:1; + UINT fDefault:1; + UINT fChildThreadDef:1; + UINT fCtrlShowStatus:1; + UINT fFreeActiveEvent:1; + }; +} IMEUI, *PIMEUI; + +// Window Extra data container. +typedef struct _IMEWND +{ + WND; + PIMEUI pimeui; +} IMEWND, *PIMEWND; DWORD Modified: trunk/reactos/win32ss/user/user32/controls/regcontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/regcontrol.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/regcontrol.c [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -99,6 +99,12 @@ FALSE); if (atom) RegisterDefaultClasses |= ICLASS_TO_MASK(g_SysClasses[i].ClsId); + } + + if ( //gpsi->dwSRVIFlags & SRVINFO_IMM32 && Not supported yet, need NlsMbCodePageTag working in Win32k. + !(RegisterDefaultClasses & ICLASS_TO_MASK(ICLS_IME))) // So, work like XP. + { + RegisterIMEClass(); } return TRUE; @@ -170,8 +176,8 @@ pfnClientW.pfnMDIClientWndProc = MDIClientWndProcW; pfnClientA.pfnStaticWndProc = StaticWndProcA; pfnClientW.pfnStaticWndProc = StaticWndProcW; - pfnClientA.pfnImeWndProc = DefWindowProcA; - pfnClientW.pfnImeWndProc = DefWindowProcW; + pfnClientA.pfnImeWndProc = ImeWndProcA; + pfnClientW.pfnImeWndProc = ImeWndProcW; pfnClientA.pfnGhostWndProc = DefWindowProcA; pfnClientW.pfnGhostWndProc = DefWindowProcW; pfnClientA.pfnHkINLPCWPSTRUCT = DefWindowProcA; @@ -195,7 +201,7 @@ pfnClientWorker.pfnListBoxWndProc = ListBoxWndProc_common; pfnClientWorker.pfnMDIClientWndProc = MDIClientWndProc_common; pfnClientWorker.pfnStaticWndProc = StaticWndProc_common; - pfnClientWorker.pfnImeWndProc = User32DefWindowProc; + pfnClientWorker.pfnImeWndProc = ImeWndProc_common; pfnClientWorker.pfnGhostWndProc = User32DefWindowProc; pfnClientWorker.pfnCtfHookProc = User32DefWindowProc; Modified: trunk/reactos/win32ss/user/user32/include/regcontrol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/regcontrol.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/regcontrol.h [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -41,3 +41,8 @@ ATOM WINAPI RegisterClassExWOWW(WNDCLASSEXW *,LPDWORD,WORD,DWORD,BOOL); BOOL FASTCALL VersionRegisterClass(PCWSTR,LPCWSTR,HANDLE,HMODULE *); + +LRESULT WINAPI ImeWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL); +LRESULT WINAPI ImeWndProcA(HWND,UINT,WPARAM,LPARAM); +LRESULT WINAPI ImeWndProcW(HWND,UINT,WPARAM,LPARAM); +BOOL WINAPI RegisterIMEClass(VOID); Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -17,22 +17,49 @@ #include "resource.h" #include "ntwrapper.h" + +typedef struct +{ + BOOL (WINAPI* pImmIsIME) (HKL); + LRESULT (WINAPI* pImmEscapeA) (HKL, HIMC, UINT, LPVOID); + LRESULT (WINAPI* pImmEscapeW) (HKL, HIMC, UINT, LPVOID); + LONG (WINAPI* pImmGetCompositionStringA) (HIMC, DWORD, LPVOID, DWORD); + LONG (WINAPI* pImmGetCompositionStringW) (HIMC, DWORD, LPVOID, DWORD); + BOOL (WINAPI* pImmGetCompositionFontA) (HIMC, LPLOGFONTA); + BOOL (WINAPI* pImmGetCompositionFontW) (HIMC, LPLOGFONTW); + BOOL (WINAPI* pImmSetCompositionFontA)(HIMC, LPLOGFONTA); + BOOL (WINAPI* pImmSetCompositionFontW)(HIMC, LPLOGFONTW); + BOOL (WINAPI* pImmGetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); + BOOL (WINAPI* pImmSetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); + HIMC (WINAPI* pImmAssociateContext) (HWND, HIMC); + BOOL (WINAPI* pImmReleaseContext) (HWND, HIMC); + HIMC (WINAPI* pImmGetContext) (HWND); + HWND (WINAPI* pImmGetDefaultIMEWnd) (HWND); + BOOL (WINAPI* pImmNotifyIME) (HIMC, DWORD, DWORD, DWORD); + BOOL (WINAPI* pImmRegisterClient) (PVOID, HINSTANCE); + UINT (WINAPI* pImmProcessKey) (HWND, HKL, UINT, LPARAM, DWORD); + +} Imm32ApiTable; + + /* global variables */ extern HINSTANCE User32Instance; #define user32_module User32Instance extern PPROCESSINFO g_ppi; extern ULONG_PTR g_ulSharedDelta; extern PSERVERINFO gpsi; +extern SHAREDINFO gSharedInfo; extern BOOLEAN gfLogonProcess; extern BOOLEAN gfServerProcess; extern PUSER_HANDLE_TABLE gHandleTable; extern PUSER_HANDLE_ENTRY gHandleEntries; extern CRITICAL_SECTION U32AccelCacheLock; -extern HINSTANCE hImmInstance; +extern HINSTANCE ghImm32; extern RTL_CRITICAL_SECTION gcsUserApiHook; extern USERAPIHOOK guah; extern HINSTANCE ghmodUserApiHook; extern HICON hIconSmWindows, hIconWindows; +extern Imm32ApiTable gImmApiEntries; #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) @@ -105,5 +132,6 @@ VOID DeleteFrameBrushes(VOID); BOOL WINAPI GdiValidateHandle(HGDIOBJ); HANDLE FASTCALL UserGetProp(HWND hWnd, ATOM Atom); +BOOL WINAPI InitializeImmEntryTable(VOID); /* EOF */ Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -14,6 +14,7 @@ PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL; PSERVERINFO gpsi = NULL; +SHAREDINFO gSharedInfo = {0}; ULONG_PTR g_ulSharedDelta; BOOLEAN gfLogonProcess = FALSE; BOOLEAN gfServerProcess = FALSE; @@ -262,6 +263,7 @@ gpsi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); + gSharedInfo = UserCon.siClient; // ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); } @@ -414,6 +416,7 @@ gpsi = SharedPtrToUser(UserCon->siClient.psi); gHandleTable = SharedPtrToUser(UserCon->siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); + gSharedInfo = UserCon->siClient; } // FIXME: Yet another hack... This call should normally not be done here, but @@ -518,13 +521,22 @@ if (!Init(&ConnectInfo)) return FALSE; + if (!gfServerProcess) + { + InitializeImmEntryTable(); + // + // Wine is stub and throws an exception so save this for real Imm32.dll testing!!!! + // + //gImmApiEntries.pImmRegisterClient(&gSharedInfo, ghImm32); + } + break; } case DLL_PROCESS_DETACH: { - if (hImmInstance) - FreeLibrary(hImmInstance); + if (ghImm32) + FreeLibrary(ghImm32); Cleanup(); break; Modified: trunk/reactos/win32ss/user/user32/misc/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/i… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/imm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/imm.c [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -13,38 +13,31 @@ #include <winnls32.h> #include <wine/debug.h> +#include <strsafe.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - -typedef struct -{ - BOOL (WINAPI* pImmIsIME) (HKL); - LRESULT (WINAPI* pImmEscapeA) (HKL, HIMC, UINT, LPVOID); - LRESULT (WINAPI* pImmEscapeW) (HKL, HIMC, UINT, LPVOID); - LONG (WINAPI* pImmGetCompositionStringA) (HIMC, DWORD, LPVOID, DWORD); - LONG (WINAPI* pImmGetCompositionStringW) (HIMC, DWORD, LPVOID, DWORD); - BOOL (WINAPI* pImmGetCompositionFontA) (HIMC, LPLOGFONTA); - BOOL (WINAPI* pImmGetCompositionFontW) (HIMC, LPLOGFONTW); - BOOL (WINAPI* pImmSetCompositionFontA)(HIMC, LPLOGFONTA); - BOOL (WINAPI* pImmSetCompositionFontW)(HIMC, LPLOGFONTW); - BOOL (WINAPI* pImmGetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); - BOOL (WINAPI* pImmSetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); - HIMC (WINAPI* pImmAssociateContext) (HWND, HIMC); - BOOL (WINAPI* pImmReleaseContext) (HWND, HIMC); - HIMC (WINAPI* pImmGetContext) (HWND); - HWND (WINAPI* pImmGetDefaultIMEWnd) (HWND); - BOOL (WINAPI* pImmNotifyIME) (HIMC, DWORD, DWORD, DWORD); -} Imm32ApiTable; - -Imm32ApiTable *pImmApiTable = {0}; -HINSTANCE hImmInstance = NULL; - - -static BOOL IsInitialized() -{ - return (hImmInstance != NULL) ? TRUE : FALSE; -} +#define IMM_INIT_MAGIC 0x19650412 + + +Imm32ApiTable gImmApiEntries = {0}; +HINSTANCE ghImm32 = NULL; +BOOL bImmInitializing = FALSE; +BOOL ImmApiTableZero = TRUE; + +HRESULT WINAPI GetImmFileName(PWSTR lpBuffer, UINT uSize) +{ + UINT length; + STRSAFE_LPWSTR Safe = lpBuffer; + + length = GetSystemDirectoryW(lpBuffer, uSize); + if ( length && length < uSize ) + { + StringCchCatW(Safe, uSize, L"\\"); + return StringCchCatW(Safe, uSize, L"IMM32.DLL"); + } + return StringCchCopyW(Safe, uSize, L"IMM32.DLL"); +} /* * This function should not be implemented, it is used, @@ -63,101 +56,276 @@ HIMC WINAPI IMM_ImmGetContext(HWND hwnd) { return 0; } HWND WINAPI IMM_ImmGetDefaultIMEWnd(HWND hwnd) { return 0; } BOOL WINAPI IMM_ImmNotifyIME(HIMC himc, DWORD dword1, DWORD dword2, DWORD dword3) { return 0; } - -/* - * @unimplemented - */ -BOOL WINAPI User32InitializeImmEntryTable(DWORD dwUnknown) -{ - UNIMPLEMENTED; - - if (dwUnknown != 0x19650412) /* FIXME */ - return FALSE; - - if (IsInitialized()) +BOOL WINAPI IMM_ImmRegisterClient(PVOID ptr, HINSTANCE hMod) { return 0; } +UINT WINAPI IMM_ImmProcessKey(HWND hwnd, HKL hkl, UINT Vk, LPARAM lParam, DWORD HotKey) { return 0; } + +/* + * @unimplemented + */ +BOOL WINAPI IntInitializeImmEntryTable(VOID) +{ + WCHAR ImmFile[MAX_PATH]; + HMODULE imm32 = ghImm32;; + + if (gImmApiEntries.pImmIsIME != 0) + { + ERR("Imm Api Table Init 1\n"); + return TRUE; + } + + GetImmFileName(ImmFile, sizeof(ImmFile)); + TRACE("File %ws\n",ImmFile); + + if (imm32 == NULL) + { + imm32 = GetModuleHandleW(ImmFile); + } + + if (imm32 == NULL) + { + imm32 = ghImm32 = LoadLibraryW(ImmFile); + if (imm32 == NULL) + { + ERR("Did not load!\n"); + return FALSE; + } return TRUE; - - hImmInstance = LoadLibraryW(L"imm32.dll"); - if (!hImmInstance) - return FALSE; - - ZeroMemory(pImmApiTable, sizeof(Imm32ApiTable)); - - pImmApiTable->pImmIsIME = (BOOL (WINAPI*)(HKL)) GetProcAddress(hImmInstance, "ImmIsIME"); - if (!pImmApiTable->pImmIsIME) - pImmApiTable->pImmIsIME = IMM_ImmIsIME; - - pImmApiTable->pImmEscapeA = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(hImmInstance, "ImmEscapeA"); - if (!pImmApiTable->pImmEscapeA) - pImmApiTable->pImmEscapeA = IMM_ImmEscapeAW; - - pImmApiTable->pImmEscapeW = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(hImmInstance, "ImmEscapeW"); - if (!pImmApiTable->pImmEscapeW) - pImmApiTable->pImmEscapeW = IMM_ImmEscapeAW; - - pImmApiTable->pImmGetCompositionStringA = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(hImmInstance, "ImmGetCompositionStringA"); - if (!pImmApiTable->pImmGetCompositionStringA) - pImmApiTable->pImmGetCompositionStringA = IMM_ImmGetCompositionStringAW; - - pImmApiTable->pImmGetCompositionStringW = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(hImmInstance, "ImmGetCompositionStringW"); - if (!pImmApiTable->pImmGetCompositionStringW) - pImmApiTable->pImmGetCompositionStringW = IMM_ImmGetCompositionStringAW; - - pImmApiTable->pImmGetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(hImmInstance, "ImmGetCompositionFontA"); - if (!pImmApiTable->pImmGetCompositionFontA) - pImmApiTable->pImmGetCompositionFontA = IMM_ImmGetCompositionFontA; - - pImmApiTable->pImmGetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(hImmInstance, "ImmGetCompositionFontW"); - if (!pImmApiTable->pImmGetCompositionFontW) - pImmApiTable->pImmGetCompositionFontW = IMM_ImmGetCompositionFontW; - - pImmApiTable->pImmSetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(hImmInstance, "ImmSetCompositionFontA"); - if (!pImmApiTable->pImmSetCompositionFontA) - pImmApiTable->pImmSetCompositionFontA = IMM_ImmSetCompositionFontA; - - pImmApiTable->pImmSetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(hImmInstance, "ImmSetCompositionFontW"); - if (!pImmApiTable->pImmSetCompositionFontW) - pImmApiTable->pImmSetCompositionFontW = IMM_ImmSetCompositionFontW; - - pImmApiTable->pImmGetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(hImmInstance, "ImmGetCompositionWindow"); - if (!pImmApiTable->pImmGetCompositionWindow) - pImmApiTable->pImmGetCompositionWindow = IMM_ImmSetGetCompositionWindow; - - pImmApiTable->pImmSetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(hImmInstance, "ImmSetCompositionWindow"); - if (!pImmApiTable->pImmSetCompositionWindow) - pImmApiTable->pImmSetCompositionWindow = IMM_ImmSetGetCompositionWindow; - - pImmApiTable->pImmAssociateContext = (HIMC (WINAPI*)(HWND, HIMC)) GetProcAddress(hImmInstance, "ImmAssociateContext"); - if (!pImmApiTable->pImmAssociateContext) - pImmApiTable->pImmAssociateContext = IMM_ImmAssociateContext; - - pImmApiTable->pImmReleaseContext = (BOOL (WINAPI*)(HWND, HIMC)) GetProcAddress(hImmInstance, "ImmReleaseContext"); - if (!pImmApiTable->pImmReleaseContext) - pImmApiTable->pImmReleaseContext = IMM_ImmReleaseContext; - - pImmApiTable->pImmGetContext = (HIMC (WINAPI*)(HWND)) GetProcAddress(hImmInstance, "ImmGetContext"); - if (!pImmApiTable->pImmGetContext) - pImmApiTable->pImmGetContext = IMM_ImmGetContext; - - pImmApiTable->pImmGetDefaultIMEWnd = (HWND (WINAPI*)(HWND)) GetProcAddress(hImmInstance, "ImmGetDefaultIMEWnd"); - if (!pImmApiTable->pImmGetDefaultIMEWnd) - pImmApiTable->pImmGetDefaultIMEWnd = IMM_ImmGetDefaultIMEWnd; - - pImmApiTable->pImmNotifyIME = (BOOL (WINAPI*)(HIMC, DWORD, DWORD, DWORD)) GetProcAddress(hImmInstance, "ImmNotifyIME"); - if (!pImmApiTable->pImmNotifyIME) - pImmApiTable->pImmNotifyIME = IMM_ImmNotifyIME; + } + + if (ImmApiTableZero) + { + ImmApiTableZero = FALSE; + ZeroMemory(&gImmApiEntries, sizeof(Imm32ApiTable)); + } + + gImmApiEntries.pImmIsIME = (BOOL (WINAPI*)(HKL)) GetProcAddress(imm32, "ImmIsIME"); + if (!gImmApiEntries.pImmIsIME) + gImmApiEntries.pImmIsIME = IMM_ImmIsIME; + + gImmApiEntries.pImmEscapeA = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(imm32, "ImmEscapeA"); + if (!gImmApiEntries.pImmEscapeA) + gImmApiEntries.pImmEscapeA = IMM_ImmEscapeAW; + + gImmApiEntries.pImmEscapeW = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(imm32, "ImmEscapeW"); + if (!gImmApiEntries.pImmEscapeW) + gImmApiEntries.pImmEscapeW = IMM_ImmEscapeAW; + + gImmApiEntries.pImmGetCompositionStringA = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(imm32, "ImmGetCompositionStringA"); + if (!gImmApiEntries.pImmGetCompositionStringA) + gImmApiEntries.pImmGetCompositionStringA = IMM_ImmGetCompositionStringAW; + + gImmApiEntries.pImmGetCompositionStringW = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(imm32, "ImmGetCompositionStringW"); + if (!gImmApiEntries.pImmGetCompositionStringW) + gImmApiEntries.pImmGetCompositionStringW = IMM_ImmGetCompositionStringAW; + + gImmApiEntries.pImmGetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(imm32, "ImmGetCompositionFontA"); + if (!gImmApiEntries.pImmGetCompositionFontA) + gImmApiEntries.pImmGetCompositionFontA = IMM_ImmGetCompositionFontA; + + gImmApiEntries.pImmGetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(imm32, "ImmGetCompositionFontW"); + if (!gImmApiEntries.pImmGetCompositionFontW) + gImmApiEntries.pImmGetCompositionFontW = IMM_ImmGetCompositionFontW; + + gImmApiEntries.pImmSetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(imm32, "ImmSetCompositionFontA"); + if (!gImmApiEntries.pImmSetCompositionFontA) + gImmApiEntries.pImmSetCompositionFontA = IMM_ImmSetCompositionFontA; + + gImmApiEntries.pImmSetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(imm32, "ImmSetCompositionFontW"); + if (!gImmApiEntries.pImmSetCompositionFontW) + gImmApiEntries.pImmSetCompositionFontW = IMM_ImmSetCompositionFontW; + + gImmApiEntries.pImmGetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(imm32, "ImmGetCompositionWindow"); + if (!gImmApiEntries.pImmGetCompositionWindow) + gImmApiEntries.pImmGetCompositionWindow = IMM_ImmSetGetCompositionWindow; + + gImmApiEntries.pImmSetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(imm32, "ImmSetCompositionWindow"); + if (!gImmApiEntries.pImmSetCompositionWindow) + gImmApiEntries.pImmSetCompositionWindow = IMM_ImmSetGetCompositionWindow; + + gImmApiEntries.pImmAssociateContext = (HIMC (WINAPI*)(HWND, HIMC)) GetProcAddress(imm32, "ImmAssociateContext"); + if (!gImmApiEntries.pImmAssociateContext) + gImmApiEntries.pImmAssociateContext = IMM_ImmAssociateContext; + + gImmApiEntries.pImmReleaseContext = (BOOL (WINAPI*)(HWND, HIMC)) GetProcAddress(imm32, "ImmReleaseContext"); + if (!gImmApiEntries.pImmReleaseContext) + gImmApiEntries.pImmReleaseContext = IMM_ImmReleaseContext; + + gImmApiEntries.pImmGetContext = (HIMC (WINAPI*)(HWND)) GetProcAddress(imm32, "ImmGetContext"); + if (!gImmApiEntries.pImmGetContext) + gImmApiEntries.pImmGetContext = IMM_ImmGetContext; + + gImmApiEntries.pImmGetDefaultIMEWnd = (HWND (WINAPI*)(HWND)) GetProcAddress(imm32, "ImmGetDefaultIMEWnd"); + if (!gImmApiEntries.pImmGetDefaultIMEWnd) + gImmApiEntries.pImmGetDefaultIMEWnd = IMM_ImmGetDefaultIMEWnd; + + gImmApiEntries.pImmNotifyIME = (BOOL (WINAPI*)(HIMC, DWORD, DWORD, DWORD)) GetProcAddress(imm32, "ImmNotifyIME"); + if (!gImmApiEntries.pImmNotifyIME) + gImmApiEntries.pImmNotifyIME = IMM_ImmNotifyIME; /* * TODO: Load more functions from imm32.dll * Function like IMPSetIMEW, IMPQueryIMEW etc. call functions - * from imm32.dll through pointers in the structure pImmApiTable. + * from imm32.dll through pointers in the structure gImmApiEntries. * I do not know whether it is necessary to initialize a table * of functions to load user32 (DLL_PROCESS_ATTACH) */ + gImmApiEntries.pImmRegisterClient = (BOOL (WINAPI*)(PVOID, HINSTANCE)) GetProcAddress(imm32, "ImmRegisterClient"); + if (!gImmApiEntries.pImmRegisterClient) + gImmApiEntries.pImmRegisterClient = IMM_ImmRegisterClient; + + gImmApiEntries.pImmProcessKey = (UINT (WINAPI*)(HWND, HKL, UINT, LPARAM, DWORD)) GetProcAddress(imm32, "ImmProcessKey"); + if (!gImmApiEntries.pImmProcessKey) + gImmApiEntries.pImmProcessKey = IMM_ImmProcessKey; + return TRUE; } +BOOL WINAPI InitializeImmEntryTable(VOID) +{ + bImmInitializing = TRUE; + return IntInitializeImmEntryTable(); +} + +BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) +{ + TRACE("(%x)\n", magic); + + if (magic != IMM_INIT_MAGIC) + return FALSE; + + if (gImmApiEntries.pImmIsIME != 0) + { + ERR("Imm Api Table Init 2\n"); + return TRUE; + } + + IntInitializeImmEntryTable(); + + if (ghImm32 == NULL && !bImmInitializing) + { + WCHAR ImmFile[MAX_PATH]; + ERR("IMM32 not installed!\n"); + GetImmFileName(ImmFile, sizeof(ImmFile)); + ERR("File %ws\n",ImmFile); + ghImm32 = LoadLibraryW(ImmFile); + if (ghImm32 == NULL) + { + ERR("Did not load! 2\n"); + return FALSE; + } + } +#if 0 // For real Imm32.dll testing!!!! + if (ghImm32 && !gImmApiEntries.pImmRegisterClient(&gSharedInfo, ghImm32)) + { + ERR("Wine is stubed!\n"); + } +#endif + return TRUE; +} + +LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) // ReactOS +{ + PWND pWnd; + PIMEUI pimeui; + + pWnd = ValidateHwnd(hwnd); + if (pWnd) + { + if (!pWnd->fnid) + { + if (msg != WM_NCCREATE) + { + if (unicode) + return DefWindowProcW(hwnd, msg, wParam, lParam); + return DefWindowProcA(hwnd, msg, wParam, lParam); + } + NtUserSetWindowFNID(hwnd, FNID_IME); + pimeui = HeapAlloc( GetProcessHeap(), 0, sizeof(IMEUI) ); + SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pimeui); + } + else + { + if (pWnd->fnid != FNID_IME) + { + ERR("Wrong window class for Ime! fnId 0x%x\n",pWnd->fnid); + return 0; + } + pimeui = ((PIMEWND)pWnd)->pimeui; + if (pimeui == NULL) + { + ERR("Window is not set to IME!\n"); + return 0; + } + } + } + + if (msg==WM_CREATE || msg==WM_NCCREATE) + return TRUE; + + if (msg==WM_NCDESTROY) + { + HeapFree( GetProcessHeap(), 0, pimeui ); + SetWindowLongPtrW(hwnd, 0, 0); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); + } + + if (unicode) + return DefWindowProcW(hwnd, msg, wParam, lParam); + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return ImeWndProc_common(hwnd, msg, wParam, lParam, FALSE); +} + +LRESULT WINAPI ImeWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return ImeWndProc_common(hwnd, msg, wParam, lParam, TRUE); +} + +static const WCHAR imeW[] = {'I','M','E',0}; + +BOOL +WINAPI +RegisterIMEClass(VOID) +{ + WNDCLASSEXW WndClass; + ATOM atom; + + ZeroMemory(&WndClass, sizeof(WndClass)); + + WndClass.cbSize = sizeof(WndClass); + WndClass.lpszClassName = imeW; + WndClass.style = CS_GLOBALCLASS; + WndClass.lpfnWndProc = ImeWndProcW; + WndClass.cbWndExtra = sizeof(LONG_PTR); + WndClass.hCursor = LoadCursorW(NULL, IDC_ARROW); + + atom = RegisterClassExWOWW( &WndClass, + 0, + FNID_IME, + 0, + FALSE); + if (atom) + { + RegisterDefaultClasses |= ICLASS_TO_MASK(ICLS_IME); + return TRUE; + } + ERR("Failed to register IME Class!\n"); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl) +{ + UNIMPLEMENTED; + return FALSE; +} + /* * @unimplemented */ @@ -269,12 +437,11 @@ } /* - * @unimplemented + * @implemented */ UINT WINAPI WINNLSGetIMEHotkey(HWND hwnd) { - UNIMPLEMENTED; - return FALSE; -} + return FALSE; +} Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -471,15 +471,6 @@ * @unimplemented */ BOOL WINAPI DdeGetQualityOfService(HWND hWnd, DWORD Reserved, PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl) { UNIMPLEMENTED; return FALSE;

9 years, 11 months

[jimtabor] 65976: [Win32k] - Move DDE stuff into its own file. Oh, the stub file too... Fix build.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jan 4 18:15:20 2015 New Revision: 65976 URL: http://svn.reactos.org/svn/reactos?rev=65976&view=rev Log: [Win32k] - Move DDE stuff into its own file. Oh, the stub file too... Fix build. Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Sun Jan 4 18:15:20 2015 @@ -66,44 +66,6 @@ return 0; } -BOOL -APIENTRY -NtUserDdeGetQualityOfService( - IN HWND hwndClient, - IN HWND hWndServer, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserDdeInitialize( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserDdeSetQualityOfService( - IN HWND hwndClient, - IN PSECURITY_QUALITY_OF_SERVICE pqosNew, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - STUB - - return 0; -} - DWORD APIENTRY NtUserDragObject( @@ -162,17 +124,6 @@ LPWSTR pszItemText, UINT cchItemText, BOOL Ansi) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserImpersonateDdeClientWindow( - HWND hWndClient, - HWND hWndServer) { STUB

9 years, 11 months

[jimtabor] 65975: [Win32k] - Move DDE stuff into its own file.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jan 4 18:12:41 2015 New Revision: 65975 URL: http://svn.reactos.org/svn/reactos?rev=65975&view=rev Log: [Win32k] - Move DDE stuff into its own file. Added: trunk/reactos/win32ss/user/ntuser/dde.c - copied, changed from r65974, trunk/reactos/win32ss/user/user32/misc/dde.c Modified: trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Jan 4 18:12:41 2015 @@ -106,6 +106,7 @@ user/ntuser/class.c user/ntuser/clipboard.c user/ntuser/csr.c + user/ntuser/dde.c user/ntuser/defwnd.c user/ntuser/desktop.c user/ntuser/display.c Copied: trunk/reactos/win32ss/user/ntuser/dde.c (from r65974, trunk/reactos/win32ss/user/user32/misc/dde.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Sun Jan 4 18:12:41 2015 @@ -1,6 +1,54 @@ -#include <user32.h> -#include <wine/debug.h> +#include <win32k.h> +//DBG_DEFAULT_CHANNEL(UserMisc); -//WINE_DEFAULT_DEBUG_CHANNEL(ddeml); +BOOL +APIENTRY +NtUserDdeGetQualityOfService( + IN HWND hwndClient, + IN HWND hWndServer, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) +{ + STUB + + return 0; +} + +DWORD +APIENTRY +NtUserDdeInitialize( + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4) +{ + STUB + + return 0; +} + +BOOL +APIENTRY +NtUserDdeSetQualityOfService( + IN HWND hwndClient, + IN PSECURITY_QUALITY_OF_SERVICE pqosNew, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) +{ + STUB + + return 0; +} + +BOOL +APIENTRY +NtUserImpersonateDdeClientWindow( + HWND hWndClient, + HWND hWndServer) +{ + STUB + + return 0; +} +

9 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
20
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2015