Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 69181: [BOOTMGFW] - Hey Arch, your buddies gave you ETFS support for native EFI boot, of course reading sector 0 is all zeroes, you're not on FAT, you idiot! ETFS has data at sector 16 and 17...
by ion＠svn.reactos.org 11 Sep '15

11 Sep '15

Author: ion Date: Fri Sep 11 04:33:24 2015 New Revision: 69181 URL: http://svn.reactos.org/svn/reactos?rev=69181&view=rev Log: [BOOTMGFW] - Hey Arch, your buddies gave you ETFS support for native EFI boot, of course reading sector 0 is all zeroes, you're not on FAT, you idiot! ETFS has data at sector 16 and 17. - Implement beginning of ETFS support. We correctly mount the reactOS boot cd as ETFS and open the root directory entry! Added: trunk/reactos/boot/environ/lib/io/etfs.c (with props) Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/boot/environ/lib/io/fat.c trunk/reactos/boot/environ/lib/io/file.c Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Fri Sep 11 04:33:24 2015 @@ -20,6 +20,7 @@ lib/mm/descriptor.c lib/platform/time.c lib/io/blkcache.c + lib/io/etfs.c lib/io/io.c lib/io/device.c lib/io/file.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Fri Sep 11 04:33:24 2015 @@ -269,9 +269,9 @@ typedef NTSTATUS (*PBL_FILE_OPEN) ( - _In_ struct _BL_FILE_ENTRY* ParentFileEntry, + _In_ struct _BL_FILE_ENTRY* Directory, _In_ PWCHAR FileName, - _In_ ULONG OpenFlags, + _In_ ULONG Flags, _Out_ struct _BL_FILE_ENTRY** FileEntry ); @@ -758,16 +758,17 @@ typedef struct _BL_FILE_ENTRY { + PWCHAR FilePath; + ULONG DeviceId; + ULONG FileId; + ULONG Flags; ULONG ReferenceCount; - ULONG FileId; - ULONG DeviceId; - ULONG Flags; - PWCHAR FilePath; ULONG Unknown; - ULONG Unknown1; - ULONG Unknown2; + ULONGLONG Unknown1; + ULONGLONG Unknown2; BL_FILE_CALLBACKS Callbacks; - PBL_FILE_DESTROY_CALLBACK DestroyCallback; + //PBL_FILE_DESTROY_CALLBACK DestroyCallback; + PVOID FsSpecificData; } BL_FILE_ENTRY, *PBL_FILE_ENTRY; typedef struct _BL_FILE_SYSTEM_ENTRY @@ -1225,6 +1226,18 @@ _Out_ PBL_FILE_ENTRY* FileEntry ); +NTSTATUS +EtfsInitialize ( + VOID + ); + +NTSTATUS +EtfsMount ( + _In_ ULONG DeviceId, + _In_ ULONG Unknown, + _Out_ PBL_FILE_ENTRY* FileEntry + ); + /* UTILITY ROUTINES **********************************************************/ EFI_STATUS Modified: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Fri Sep 11 04:33:24 2015 @@ -130,8 +130,8 @@ break; } - EfiPrintf(L"EFI Reading BLOCK %d off media %lx (%d blocks)\r\n", - Block, BlockProtocol->Media->MediaId, BlockCount); + //EfiPrintf(L"EFI Reading BLOCK %d off media %lx (%d blocks)\r\n", + //Block, BlockProtocol->Media->MediaId, BlockCount); EfiStatus = BlockProtocol->ReadBlocks(BlockProtocol, BlockProtocol->Media->MediaId, Block, @@ -139,8 +139,8 @@ Buffer); if (EfiStatus == EFI_SUCCESS) { - EfiPrintf(L"EFI Read complete into buffer\r\n"); - EfiPrintf(L"Buffer data: %lx %lx %lx %lx\r\n", *(PULONG)Buffer, *((PULONG)Buffer + 1), *((PULONG)Buffer + 2), *((PULONG)Buffer + 3)); + //EfiPrintf(L"EFI Read complete into buffer\r\n"); + //EfiPrintf(L"Buffer data: %lx %lx %lx %lx\r\n", *(PULONG)Buffer, *((PULONG)Buffer + 1), *((PULONG)Buffer + 2), *((PULONG)Buffer + 3)); } if (OldMode != 1) Added: trunk/reactos/boot/environ/lib/io/etfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/etfs.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/etfs.c (added) +++ trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] Fri Sep 11 04:33:24 2015 @@ -0,0 +1,433 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/etfs.c + * PURPOSE: Boot Library El Torito File System Management Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" +#include "../drivers/filesystems/cdfs_new/cd.h" +typedef struct _RAW_ET_VD +{ + UCHAR BootIndicator; + UCHAR StandardId[5]; + UCHAR Version; + UCHAR SystemId[32]; + UCHAR Reserved[32]; + ULONG BootCatalogOffset; + UCHAR Padding[1973]; +} RAW_ET_VD, *PRAW_ET_VD; + +/* DATA VARIABLES ************************************************************/ + +typedef struct _BL_ETFS_CONTEXT +{ + ULONG RootDirOffset; + ULONG RootDirSize; + ULONG BlockSize; + ULONG VolumeSize; + BOOLEAN IsIso; + PRAW_ISO_VD MemoryBlock; + ULONG Offset; +} BL_ETFS_CONTEXT, *PBL_ETFS_CONTEXT; + +typedef struct _BL_ETFS_FILE +{ + ULONG Flags; + ULONG DeviceId; + ULONG Offset; + ULONG Unknown; + ULONGLONG Size; + PWCHAR FsName; +} BL_ETFS_FILE, *PBL_ETFS_FILE; + +ULONG EtfsDeviceTableEntries; +PVOID* EtfsDeviceTable; + +NTSTATUS +EtfsOpen ( + _In_ PBL_FILE_ENTRY Directory, + _In_ PWCHAR FileName, + _In_ ULONG Flags, + _Out_ PBL_FILE_ENTRY *FileEntry + ); + +BL_FILE_CALLBACKS EtfsFunctionTable = +{ + EtfsOpen, +}; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +EtfsOpen ( + _In_ PBL_FILE_ENTRY Directory, + _In_ PWCHAR FileName, + _In_ ULONG Flags, + _Out_ PBL_FILE_ENTRY *FileEntry + ) +{ + EfiPrintf(L"Attempting to open file %s in directory %s. Not yet supported\r\n", FileName, Directory->FilePath); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +EtfspCheckCdfs ( + _In_ PBL_ETFS_CONTEXT EtfsContext, + _In_ ULONG DeviceId, + _Out_ PRAW_ISO_VD *VolumeDescriptor, + _Out_ PBOOLEAN VolumeIsIso + ) +{ + EfiPrintf(L"Raw Cdfs not implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +EtfspCheckEtfs ( + _In_ PBL_ETFS_CONTEXT EtfsContext, + _In_ ULONG DeviceId, + _Out_ PRAW_ISO_VD *VolumeDescriptor, + _Out_ PBOOLEAN VolumeIsIso + ) +{ + PRAW_ISO_VD IsoVd; + PRAW_ET_VD EtVd; + NTSTATUS Status; + BOOLEAN IsIso; + BL_DEVICE_INFORMATION DeviceInformation; + ULONG Unknown, BytesRead; + ANSI_STRING CompareString, String; + + /* Save our static buffer pointer */ + IsoVd = EtfsContext->MemoryBlock; + EtVd = (PRAW_ET_VD)IsoVd; + + /* First, read the El Torito Volume Descriptor */ + BlDeviceGetInformation(DeviceId, &DeviceInformation); + Unknown = DeviceInformation.BlockDeviceInfo.Unknown; + DeviceInformation.BlockDeviceInfo.Unknown |= 1; + BlDeviceSetInformation(DeviceId, &DeviceInformation); + Status = BlDeviceReadAtOffset(DeviceId, + CD_SECTOR_SIZE, + (FIRST_VD_SECTOR + 1) * CD_SECTOR_SIZE, + EtfsContext->MemoryBlock, + &BytesRead); + DeviceInformation.BlockDeviceInfo.Unknown = Unknown; + BlDeviceSetInformation(DeviceId, &DeviceInformation); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L" read failed\r\n"); + return Status; + } + + /* Remember that's where we last read */ + EtfsContext->Offset = (FIRST_VD_SECTOR + 1) * CD_SECTOR_SIZE; + + /* Check if it's EL TORITO! */ + RtlInitString(&String, "EL TORITO SPECIFICATION"); + CompareString.Buffer = (PCHAR)EtVd->SystemId; + CompareString.Length = 23; + CompareString.MaximumLength = 23; + if (!RtlEqualString(&CompareString, &String, TRUE)) + { + return STATUS_UNSUCCESSFUL; + } + + /* Check the version and boot indicator */ + if ((EtVd->Version != 1) || (EtVd->BootIndicator)) + { + return STATUS_UNSUCCESSFUL; + } + + /* Check if it has the CD0001 identifier */ + RtlInitString(&String, ISO_VOL_ID); + CompareString.Buffer = (PCHAR)EtVd->StandardId; + CompareString.Length = 5; + CompareString.MaximumLength = 5; + if (!RtlEqualString(&CompareString, &String, TRUE)) + { + return STATUS_UNSUCCESSFUL; + } + + /* Step two, we now want to read the ISO Volume Descriptor */ + DeviceInformation.BlockDeviceInfo.Unknown |= 1u; + BlDeviceSetInformation(DeviceId, &DeviceInformation); + Status = BlDeviceReadAtOffset(DeviceId, + CD_SECTOR_SIZE, + FIRST_VD_SECTOR * CD_SECTOR_SIZE, + EtfsContext->MemoryBlock, + &BytesRead); + DeviceInformation.BlockDeviceInfo.Unknown = Unknown; + BlDeviceSetInformation(DeviceId, &DeviceInformation); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Remember where we left off */ + EtfsContext->Offset = FIRST_VD_SECTOR * CD_SECTOR_SIZE; + + /* This should also say CD0001 */ + CompareString.Buffer = (PCHAR)IsoVd->StandardId; + CompareString.Length = 5; + CompareString.MaximumLength = 5; + IsIso = RtlEqualString(&CompareString, &String, TRUE); + if (!IsIso) + { + return STATUS_UNSUCCESSFUL; + } + + /* And should be a version we support */ + if ((IsoVd->Version != VERSION_1) || (IsoVd->DescType != VD_PRIMARY)) + { + return STATUS_UNSUCCESSFUL; + } + + /* Return back to the caller */ + *VolumeDescriptor = IsoVd; + *VolumeIsIso = IsIso; + EfiPrintf(L"Recognized!!!\r\n"); + return STATUS_SUCCESS; +} + +VOID +EtfspGetDirectoryInfo ( + _In_ PBL_ETFS_CONTEXT EtfsContext, + _In_ PRAW_DIR_REC DirEntry, + _Out_ PULONG FileOffset, + _Out_ PULONG FileSize, + _Out_opt_ PBOOLEAN IsDirectory + ) +{ + ULONG SectorOffset; + BOOLEAN IsDir; + + *FileOffset = *(PULONG)DirEntry->FileLoc * EtfsContext->BlockSize; + *FileOffset += (DirEntry->XarLen * EtfsContext->BlockSize); + + SectorOffset = ALIGN_DOWN_BY(*FileOffset, CD_SECTOR_SIZE); + + *FileSize = *(PULONG)DirEntry->DataLen; + + IsDir = DE_FILE_FLAGS(EtfsContext->IsIso, DirEntry) & ISO_ATTR_DIRECTORY; + if (IsDir) + { + *FileSize += ALIGN_UP_BY(SectorOffset, CD_SECTOR_SIZE) - SectorOffset; + } + + if (IsDirectory) + { + *IsDirectory = IsDir; + } +} + +NTSTATUS +EtfspDeviceContextDestroy ( + _In_ PBL_ETFS_CONTEXT EtfsContext + ) +{ + if (EtfsContext->MemoryBlock) + { + BlMmFreeHeap(EtfsContext->MemoryBlock); + } + BlMmFreeHeap(EtfsContext); + return 0; +} + +NTSTATUS +EtfspCreateContext ( + _In_ ULONG DeviceId, + _Out_ PBL_ETFS_CONTEXT *EtfsContext + ) +{ + PBL_ETFS_CONTEXT NewContext; + PVOID MemoryBlock; + NTSTATUS Status; + BOOLEAN IsIso; + PRAW_ISO_VD RawVd; + + NewContext = (PBL_ETFS_CONTEXT)BlMmAllocateHeap(sizeof(*NewContext)); + if (!NewContext) + { + return STATUS_NO_MEMORY; + } + RtlZeroMemory(NewContext, sizeof(*NewContext)); + + MemoryBlock = BlMmAllocateHeap(CD_SECTOR_SIZE); + NewContext->MemoryBlock = MemoryBlock; + if (!MemoryBlock) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + Status = EtfspCheckEtfs(NewContext, DeviceId, &RawVd, &IsIso); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Drive not EDFS. Checking for CDFS: %lx\r\n"); + Status = EtfspCheckCdfs(NewContext, DeviceId, &RawVd, &IsIso); + } + + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Drive not CDFS. Failing: %lx\r\n"); + goto Quickie; + } + + NewContext->IsIso = IsIso; + NewContext->BlockSize = RVD_LB_SIZE(RawVd, IsIso); + NewContext->VolumeSize = RVD_VOL_SIZE(RawVd, IsIso); + + EtfspGetDirectoryInfo(NewContext, + (PRAW_DIR_REC)RVD_ROOT_DE(RawVd, IsIso), + &NewContext->RootDirOffset, + &NewContext->RootDirSize, + 0); + +Quickie: + EtfspDeviceContextDestroy(NewContext); + NewContext = NULL; + + *EtfsContext = NewContext; + return Status; +} + +NTSTATUS +EtfspDeviceTableDestroyEntry ( + _In_ PBL_ETFS_CONTEXT EtfsContext, + _In_ ULONG Index + ) +{ + EtfspDeviceContextDestroy(EtfsContext); + EtfsDeviceTable[Index] = NULL; + + return STATUS_SUCCESS; +} + +NTSTATUS +EtfsMount ( + _In_ ULONG DeviceId, + _In_ ULONG Unknown, + _Out_ PBL_FILE_ENTRY* FileEntry + ) +{ + PBL_ETFS_CONTEXT EtfsContext = NULL; + PBL_FILE_ENTRY RootEntry; + NTSTATUS Status; + PBL_ETFS_FILE EtfsFile; + + EfiPrintf(L"Trying to mount as ETFS...\r\n"); + + Status = EtfspCreateContext(DeviceId, &EtfsContext); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"ETFS context failed: %lx\r\n"); + return Status; + } + + Status = BlTblSetEntry(&EtfsDeviceTable, + &EtfsDeviceTableEntries, + EtfsContext, + &DeviceId, + TblDoNotPurgeEntry); + if (!NT_SUCCESS(Status)) + { + EtfspDeviceContextDestroy(EtfsContext); + return Status; + } + + RootEntry = BlMmAllocateHeap(sizeof(*RootEntry)); + if (!RootEntry) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + RtlZeroMemory(RootEntry, sizeof(*RootEntry)); + + RootEntry->FilePath = BlMmAllocateHeap(4); + if (!RootEntry->FilePath) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + wcsncpy(RootEntry->FilePath, L"\\", 1); + + RootEntry->DeviceId = DeviceId; + RtlCopyMemory(&RootEntry->Callbacks, + &EtfsFunctionTable, + sizeof(RootEntry->Callbacks)); + + EtfsFile = (PBL_ETFS_FILE)BlMmAllocateHeap(sizeof(*EtfsFile)); + if (!EtfsFile) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + RootEntry->Flags |= 0x10000; + + RtlZeroMemory(EtfsFile, sizeof(*EtfsFile)); + RootEntry->FsSpecificData = EtfsFile; + EtfsFile->DeviceId = DeviceId; + EtfsFile->Flags |= 1; + EtfsFile->Offset = EtfsContext->RootDirOffset; + EtfsFile->Unknown = 0; + EtfsFile->Size = EtfsContext->RootDirSize; + EtfsFile->FsName = L"cdfs"; + *FileEntry = RootEntry; + + return STATUS_SUCCESS; + +Quickie: + if (RootEntry->FilePath) + { + BlMmFreeHeap(RootEntry->FilePath); + } + if (RootEntry->FsSpecificData) + { + BlMmFreeHeap(RootEntry->FsSpecificData); + } + if (RootEntry) + { + BlMmFreeHeap(RootEntry); + } + + EtfspDeviceTableDestroyEntry(EtfsContext, DeviceId); + + return Status; +} + +NTSTATUS +EtfsInitialize ( + VOID + ) +{ + NTSTATUS Status; + + /* Allocate the device table with 2 entries*/ + EtfsDeviceTableEntries = 2; + EtfsDeviceTable = BlMmAllocateHeap(sizeof(PBL_FILE_ENTRY) * + EtfsDeviceTableEntries); + if (EtfsDeviceTable) + { + /* Zero it out */ + RtlZeroMemory(EtfsDeviceTable, + sizeof(PBL_FILE_ENTRY) * EtfsDeviceTableEntries); + Status = STATUS_SUCCESS; + } + else + { + /* No memory, fail */ + Status = STATUS_NO_MEMORY; + } + + /* Return back to caller */ + return Status; +} + Propchange: trunk/reactos/boot/environ/lib/io/etfs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/lib/io/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/fat.c?… ============================================================================== --- trunk/reactos/boot/environ/lib/io/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/fat.c [iso-8859-1] Fri Sep 11 04:33:24 2015 @@ -43,7 +43,6 @@ BlDeviceSetInformation(DeviceId, &DeviceInformation); /* Read the boot sector */ - EfiPrintf(L"Reading fat boot sector...\r\n"); Status = BlDeviceReadAtOffset(DeviceId, sizeof(FatBootSector), 0, @@ -61,7 +60,11 @@ FatUnpackBios(&BiosBlock, &FatBootSector.PackedBpb); - EfiPrintf(L"Drive read\r\n"); + /* For now, quickly fail if this isn't FAT */ + if (FatBootSector.Jump[0] != 0xE9) + { + return STATUS_UNSUCCESSFUL; + } EfiPrintf(L"Jump: %lx Bytes Per Sector: %d Sectors Per Cluster: %d Reserved: %d Fats: %d Sectors: %d Large Sectors: %d Media: %lx RootEntries: %d\r\n", FatBootSector.Jump[0], @@ -74,7 +77,6 @@ BiosBlock.Media, BiosBlock.RootEntries); - EfiStall(3000000); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/boot/environ/lib/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/file.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] Fri Sep 11 04:33:24 2015 @@ -23,6 +23,14 @@ FatMount, NULL }; +BL_FILE_SYSTEM_REGISTRATION_TABLE EtfsRegisterFunctionTable = +{ + EtfsInitialize, + NULL, + EtfsMount, + NULL +}; + extern ULONG DmTableEntries; extern PVOID* DmDeviceTable; @@ -106,7 +114,7 @@ PBL_FILE_ENTRY FileEntry = (PBL_FILE_ENTRY)Entry; ULONG DeviceId = *(PULONG)Argument1; PWCHAR FilePath = (PWCHAR)Argument2; - ULONG OpenFlags = *(PULONG)Argument3; + ULONG Flags = *(PULONG)Argument3; ULONG Unknown = *(PULONG)Argument4; BOOLEAN Found; @@ -114,9 +122,9 @@ if ((FileEntry->DeviceId == DeviceId) && !(_wcsicmp(FileEntry->FilePath, FilePath)) && (FileEntry->Unknown == Unknown)) { - if ((!(OpenFlags & 1) || (FileEntry->Flags & 2)) && (!(OpenFlags & 2) || (FileEntry->Flags & 4))) - { - if ((!(OpenFlags & 4) || (FileEntry->Flags & 0x10000)) && ((OpenFlags & 4) || !(FileEntry->Flags & 0x10000))) + if ((!(Flags & 1) || (FileEntry->Flags & 2)) && (!(Flags & 2) || (FileEntry->Flags & 4))) + { + if ((!(Flags & 4) || (FileEntry->Flags & 0x10000)) && ((Flags & 4) || !(FileEntry->Flags & 0x10000))) { Found = TRUE; } @@ -137,7 +145,7 @@ PBL_FILE_ENTRY FileEntry = (PBL_FILE_ENTRY)Entry; ULONG DeviceId = *(PULONG)Argument1; PWCHAR FilePath = (PWCHAR)Argument2; - ULONG OpenFlags = *(PULONG)Argument3; + ULONG Flags = *(PULONG)Argument3; ULONG Unknown = *(PULONG)Argument4; BOOLEAN Found; @@ -145,9 +153,9 @@ if ((FileEntry->DeviceId == DeviceId) && !(_wcsicmp(FileEntry->FilePath, FilePath)) && (FileEntry->Unknown == Unknown)) { - if ((!(OpenFlags & 1) || (FileEntry->Flags & 2)) && ((OpenFlags & 1) || !(FileEntry->Flags & 2)) && (!(OpenFlags & 2) || (FileEntry->Flags & 4)) && ((OpenFlags & 2) || !(FileEntry->Flags & 4))) - { - if ((!(OpenFlags & 4) || (FileEntry->Flags & 0x10000)) && ((OpenFlags & 4) || !(FileEntry->Flags & 0x10000))) + if ((!(Flags & 1) || (FileEntry->Flags & 2)) && ((Flags & 1) || !(FileEntry->Flags & 2)) && (!(Flags & 2) || (FileEntry->Flags & 4)) && ((Flags & 2) || !(FileEntry->Flags & 4))) + { + if ((!(Flags & 4) || (FileEntry->Flags & 0x10000)) && ((Flags & 4) || !(FileEntry->Flags & 0x10000))) { Found = TRUE; } @@ -240,7 +248,7 @@ FileIoOpen ( _In_ ULONG DeviceId, _In_ PWCHAR FileName, - _In_ ULONG OpenFlags, + _In_ ULONG Flags, _In_ ULONG Unknown, _In_ PBL_TBL_LOOKUP_ROUTINE CompareRoutine, _Out_ PBL_FILE_ENTRY *ReturnFileEntry @@ -256,7 +264,7 @@ ParentDirectoryEntry = NULL; FileNameCopy = NULL; - OpenFlags |= 1; + Flags |= 1; ParentFileName = NULL; Status = STATUS_SUCCESS; @@ -271,13 +279,13 @@ return STATUS_ACCESS_DENIED; } - if ((OpenFlags & 1) && (!(DeviceEntry->Flags & 1) || !(DeviceEntry->Flags & 2))) + if ((Flags & 1) && (!(DeviceEntry->Flags & 1) || !(DeviceEntry->Flags & 2))) { EfiPrintf(L"Access denied\r\n"); return STATUS_ACCESS_DENIED; } - if ((OpenFlags & 2) && (!(DeviceEntry->Flags & 1) || !(DeviceEntry->Flags & 4))) + if ((Flags & 2) && (!(DeviceEntry->Flags & 1) || !(DeviceEntry->Flags & 4))) { EfiPrintf(L"Access denied2\r\n"); return STATUS_ACCESS_DENIED; @@ -289,7 +297,7 @@ CompareRoutine, &DeviceId, FileName, - &OpenFlags, + &Flags, &Unknown); if (FileEntry) { @@ -326,7 +334,7 @@ Status = ParentDirectoryEntry->Callbacks.Open(ParentDirectoryEntry, FileNameCopy, - OpenFlags, + Flags, &FileEntry); } else @@ -350,7 +358,7 @@ NextEntry = NextEntry->Flink; } - FileNameCopy = 0; + FileNameCopy = NULL; } if (!NT_SUCCESS(Status)) @@ -361,12 +369,12 @@ FileEntry->Unknown = Unknown; - if (OpenFlags & 1) + if (Flags & 1) { FileEntry->Flags |= 2u; } - if (OpenFlags & 2) + if (Flags & 2) { FileEntry->Flags |= 4u; } @@ -385,6 +393,7 @@ ++DeviceEntry->ReferenceCount; Status = STATUS_SUCCESS; + EfiPrintf(L"File %s opened with ID: %lx\r\n", FileEntry->FilePath, FileId); FileEntry->FileId = FileId; FileOpened: @@ -396,7 +405,7 @@ FileEntry->Flags |= 1; - if (OpenFlags & 0x10) + if (Flags & 0x10) { FileEntry->Flags |= 0x10; } @@ -426,7 +435,7 @@ BlFileOpen ( _In_ ULONG DeviceId, _In_ PWCHAR FileName, - _In_ ULONG OpenFlags, + _In_ ULONG Flags, _Out_ PULONG FileId ) { @@ -437,7 +446,7 @@ if (!(FileName) || (*FileName != OBJ_NAME_PATH_SEPARATOR) || !(FileId) || - !(OpenFlags & 3)) + !(Flags & 3)) { EfiPrintf(L"Invalid file options\r\n"); return STATUS_INVALID_PARAMETER; @@ -460,7 +469,7 @@ Status = FileIoOpen(DeviceId, FileName, - OpenFlags, + Flags, 0, FileTableCompareWithSameAttributes, &FileEntry); @@ -597,7 +606,7 @@ UdfsRegisterFunctionTable.Purge, 0); } - +#endif if (NT_SUCCESS(Status)) { /* Initialize El-Torito CDFS */ @@ -607,7 +616,6 @@ EtfsRegisterFunctionTable.Purge, 0); } -#endif /* Destroy the file manager if any of the file systems didn't initialize */ if (!NT_SUCCESS(Status))

1 0

[ion] 69180: [CDFS_NEW] - Resurrect back 7 years later (revert commit 34622). - Add correct MS-PL (Public) License. Not added to build/used, but I need some of the headers/data structures in here. ...
by ion＠svn.reactos.org 11 Sep '15

11 Sep '15

Author: ion Date: Fri Sep 11 04:02:21 2015 New Revision: 69180 URL: http://svn.reactos.org/svn/reactos?rev=69180&view=rev Log: [CDFS_NEW] - Resurrect back 7 years later (revert commit 34622). - Add correct MS-PL (Public) License. Not added to build/used, but I need some of the headers/data structures in here. - Source: https://github.com/Microsoft/Windows-driver-samples/blob/master/filesys/cdfs Added: trunk/reactos/drivers/filesystems/cdfs_new/ - copied from r34621, trunk/reactos/drivers/filesystems/cdfs_new/ trunk/reactos/drivers/filesystems/cdfs_new/LICENSE (with props) Removed: trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild Added: trunk/reactos/drivers/filesystems/cdfs_new/LICENSE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/LICENSE (added) +++ trunk/reactos/drivers/filesystems/cdfs_new/LICENSE [iso-8859-1] Fri Sep 11 04:02:21 2015 @@ -0,0 +1,23 @@ +The Microsoft Public License (MS-PL) +Copyright (c) 2015 Microsoft + +This license governs use of the accompanying software. If you use the software, you + accept this license. If you do not accept the license, do not use the software. + +1. Definitions + The terms "reproduce," "reproduction," "derivative works," and "distribution" have the + same meaning here as under U.S. copyright law. + A "contribution" is the original software, or any additions or changes to the software. + A "contributor" is any person that distributes its contribution under this license. + "Licensed patents" are a contributor's patent claims that read directly on its contribution. + +2. Grant of Rights + (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. + (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. + +3. Conditions and Limitations + (A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. + (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. + (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. + (D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. + (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. Propchange: trunk/reactos/drivers/filesystems/cdfs_new/LICENSE ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/cdfs.rbuild (removed) @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> - <include base="cdfs">.</include> - <library>ntoskrnl</library> - <library>hal</library> - <file>allocsup.c</file> - <file>cachesup.c</file> - <file>cddata.c</file> - <file>cdinit.c</file> - <file>cleanup.c</file> - <file>close.c</file> - <file>create.c</file> - <file>devctrl.c</file> - <file>deviosup.c</file> - <file>dirctrl.c</file> - <file>dirsup.c</file> - <file>fileinfo.c</file> - <file>filobsup.c</file> - <file>fsctrl.c</file> - <file>fspdisp.c</file> - <file>lockctrl.c</file> - <file>namesup.c</file> - <file>pathsup.c</file> - <file>pnp.c</file> - <file>prefxsup.c</file> - <file>read.c</file> - <file>resrcsup.c</file> - <file>strucsup.c</file> - <file>verfysup.c</file> - <file>volinfo.c</file> - <file>workque.c</file> - <file>cdfs.rc</file> - <pch>cdprocs.h</pch> -</module>

1 0

[jimtabor] 69179: [Win32SS] - Hackplement Layered Window Support from wine. - See CORE-1576 for more information. Three days work, ReactOS needs more support for playing with GDI bits.
by jimtabor＠svn.reactos.org 11 Sep '15

11 Sep '15

Author: jimtabor Date: Fri Sep 11 02:34:11 2015 New Revision: 69179 URL: http://svn.reactos.org/svn/reactos?rev=69179&view=rev Log: [Win32SS] - Hackplement Layered Window Support from wine. - See CORE-1576 for more information. Three days work, ReactOS needs more support for playing with GDI bits. Added: trunk/reactos/win32ss/user/ntuser/layered.c - copied, changed from r69117, trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/windows/window.c 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] Fri Sep 11 02:34:11 2015 @@ -122,6 +122,7 @@ user/ntuser/ime.c user/ntuser/keyboard.c user/ntuser/kbdlayout.c + user/ntuser/layered.c user/ntuser/menu.c user/ntuser/message.c user/ntuser/metric.c Copied: trunk/reactos/win32ss/user/ntuser/layered.c (from r69117, trunk/reactos/win32ss/user/ntuser/ntstubs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/layere… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] Fri Sep 11 02:34:11 2015 @@ -1,954 +1,216 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem - * PURPOSE: Native User stubs - * FILE: win32ss/user/ntuser/ntstubs.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PURPOSE: Layered window support + * FILE: win32ss/user/ntuser/layered.c + * PROGRAMER: */ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); -DWORD -APIENTRY -NtUserAssociateInputContext( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB - return 0; -} - -// -// Works like BitBlt, http://msdn.microsoft.com/en-us/library/ms532278(VS.85).aspx -// -BOOL -APIENTRY -NtUserBitBltSysBmp( - HDC hdc, - INT nXDest, - INT nYDest, - INT nWidth, - INT nHeight, - INT nXSrc, - INT nYSrc, - DWORD dwRop ) -{ - BOOL Ret = FALSE; - UserEnterExclusive(); - - Ret = NtGdiBitBlt( hdc, - nXDest, - nYDest, - nWidth, - nHeight, - hSystemBM, - nXSrc, - nYSrc, - dwRop, - 0, - 0); - - UserLeave(); - return Ret; -} - -DWORD -APIENTRY -NtUserBuildHimcList( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 -) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserDrawAnimatedRects( - HWND hwnd, - INT idAni, - RECT *lprcFrom, - RECT *lprcTo) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserEvent( - DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserExcludeUpdateRgn( - HDC hDC, - HWND hWnd) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserGetAltTabInfo( - HWND hwnd, - INT iItem, - PALTTABINFO pati, - LPWSTR pszItemText, - UINT cchItemText, - BOOL Ansi) -{ - STUB - - return 0; -} - -NTSTATUS -APIENTRY -NtUserInitializeClientPfnArrays( - PPFNCLIENT pfnClientA, - PPFNCLIENT pfnClientW, - PPFNCLIENTWORKER pfnClientWorker, - HINSTANCE hmodUser) -{ - NTSTATUS Status = STATUS_SUCCESS; - TRACE("Enter NtUserInitializeClientPfnArrays User32 0x%p\n", hmodUser); - - if (ClientPfnInit) return Status; - - UserEnterExclusive(); - - _SEH2_TRY - { - ProbeForRead( pfnClientA, sizeof(PFNCLIENT), 1); - ProbeForRead( pfnClientW, sizeof(PFNCLIENT), 1); - ProbeForRead( pfnClientWorker, sizeof(PFNCLIENTWORKER), 1); - RtlCopyMemory(&gpsi->apfnClientA, pfnClientA, sizeof(PFNCLIENT)); - RtlCopyMemory(&gpsi->apfnClientW, pfnClientW, sizeof(PFNCLIENT)); - RtlCopyMemory(&gpsi->apfnClientWorker, pfnClientWorker, sizeof(PFNCLIENTWORKER)); - - //// FIXME: HAX! Temporary until server side is finished. - //// Copy the client side procs for now. - RtlCopyMemory(&gpsi->aStoCidPfn, pfnClientW, sizeof(gpsi->aStoCidPfn)); - - hModClient = hmodUser; - ClientPfnInit = TRUE; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status =_SEH2_GetExceptionCode(); - } - _SEH2_END - - if (!NT_SUCCESS(Status)) - { - ERR("Failed reading Client Pfns from user space.\n"); - SetLastNtError(Status); - } - - UserLeave(); - return Status; -} - -DWORD -APIENTRY -NtUserInitTask( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7, - DWORD Unknown8, - DWORD Unknown9, - DWORD Unknown10, - DWORD Unknown11) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserMNDragLeave(VOID) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserMNDragOver( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserModifyUserStartupInfoFlags( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserQueryUserCounters( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserRegisterTasklist( - DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserSetConsoleReserveKeys( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserSetDbgTag( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserSetRipFlags( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserSetSysColors( - int cElements, - IN CONST INT *lpaElements, - IN CONST COLORREF *lpaRgbValues, - FLONG Flags) -{ - DWORD Ret = TRUE; - - if (cElements == 0) + +typedef struct _LRD_PROP +{ + COLORREF Key; + BYTE Alpha; + BYTE is_Layered; + BYTE NoUsed[2]; + DWORD Flags; +} LRD_PROP, *PLRD_PROP; + +BOOL FASTCALL +GetLayeredStatus(PWND pWnd) +{ + PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer); + if (pLrdProp) + { + return pLrdProp->is_Layered; + } + return FALSE; +} + +BOOL FASTCALL +SetLayeredStatus(PWND pWnd, BYTE set) +{ + PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer); + if (pLrdProp) + { + pLrdProp->is_Layered = set; return TRUE; - - /* We need this check to prevent overflow later */ - if ((ULONG)cElements >= 0x40000000) - { - EngSetLastError(ERROR_NOACCESS); + } + return FALSE; +} + +BOOL FASTCALL +IntSetLayeredWindowAttributes(PWND pWnd, + COLORREF crKey, + BYTE bAlpha, + DWORD dwFlags) +{ + PLRD_PROP pLrdProp; + INT was_Layered; + + if (!(pWnd->ExStyle & WS_EX_LAYERED) ) + { + ERR("Not a Layered Window!\n"); return FALSE; } - UserEnterExclusive(); - - _SEH2_TRY - { - ProbeForRead(lpaElements, cElements * sizeof(INT), 1); - ProbeForRead(lpaRgbValues, cElements * sizeof(COLORREF), 1); - - IntSetSysColors(cElements, lpaElements, lpaRgbValues); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Ret = FALSE; - } - _SEH2_END; - - if (Ret) - { - UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); - - UserRedrawDesktop(); - } - - UserLeave(); - return Ret; -} - -DWORD -APIENTRY -NtUserUpdateInputContext( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserUpdateInstance( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserUserHandleGrantAccess( - IN HANDLE hUserHandle, - IN HANDLE hJob, - IN BOOL bGrant) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserWaitForMsgAndEvent( - DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserWin32PoolAllocationStats( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserYieldTask(VOID) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserCreateInputContext( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserDestroyInputContext( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputBuffer( - PRAWINPUT pData, - PUINT pcbSize, - UINT cbSizeHeader) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputData( - HRAWINPUT hRawInput, - UINT uiCommand, - LPVOID pData, - PUINT pcbSize, - UINT cbSizeHeader) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputDeviceInfo( - HANDLE hDevice, - UINT uiCommand, - LPVOID pData, - PUINT pcbSize -) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputDeviceList( - PRAWINPUTDEVICELIST pRawInputDeviceList, - PUINT puiNumDevices, - UINT cbSize) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRegisteredRawInputDevices( - PRAWINPUTDEVICE pRawInputDevices, - PUINT puiNumDevices, - UINT cbSize) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserHardErrorControl( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB; - return 0; -} - -BOOL -NTAPI -NtUserNotifyProcessCreate( - HANDLE NewProcessId, - HANDLE ParentThreadId, - ULONG dwUnknown, - ULONG CreateFlags) -{ - // STUB; - TRACE("NtUserNotifyProcessCreate is UNIMPLEMENTED\n"); - return FALSE; -} - -NTSTATUS -APIENTRY -NtUserProcessConnect( - IN HANDLE ProcessHandle, - OUT PUSERCONNECT pUserConnect, - IN ULONG Size) -{ - NTSTATUS Status; - PEPROCESS Process = NULL; - PPROCESSINFO W32Process; - - TRACE("NtUserProcessConnect\n"); - - if ( pUserConnect == NULL || - Size != sizeof(*pUserConnect) ) - { - return STATUS_UNSUCCESSFUL; - } - - /* Get the process object the user handle was referencing */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - *PsProcessType, - UserMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - UserEnterShared(); - - /* Get Win32 process information */ - W32Process = PsGetProcessWin32Process(Process); - - _SEH2_TRY - { - // FIXME: Check that pUserConnect->ulVersion == USER_VERSION; - - ProbeForWrite(pUserConnect, sizeof(*pUserConnect), sizeof(PVOID)); - pUserConnect->siClient.psi = gpsi; - pUserConnect->siClient.aheList = gHandleTable; - pUserConnect->siClient.ulSharedDelta = - (ULONG_PTR)W32Process->HeapMappings.KernelMapping - - (ULONG_PTR)W32Process->HeapMappings.UserMapping; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - SetLastNtError(Status); - - UserLeave(); - - /* Dereference the process object */ - ObDereferenceObject(Process); - - return Status; -} - -NTSTATUS -APIENTRY -NtUserQueryInformationThread(IN HANDLE ThreadHandle, - IN USERTHREADINFOCLASS ThreadInformationClass, - OUT PVOID ThreadInformation, - IN ULONG ThreadInformationLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - PETHREAD Thread; - - /* Allow only CSRSS to perform this operation */ - if (PsGetCurrentProcess() != gpepCSRSS) - return STATUS_ACCESS_DENIED; - - UserEnterExclusive(); - - /* Get the Thread */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_QUERY_INFORMATION, - *PsThreadType, - UserMode, - (PVOID)&Thread, - NULL); - if (!NT_SUCCESS(Status)) goto Quit; - - switch (ThreadInformationClass) - { - default: - { - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - } - - ObDereferenceObject(Thread); - -Quit: - UserLeave(); - return Status; -} - -DWORD -APIENTRY -NtUserQueryInputContext( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserRealInternalGetMessage( - LPMSG lpMsg, - HWND hWnd, - UINT wMsgFilterMin, - UINT wMsgFilterMax, - UINT wRemoveMsg, - BOOL bGMSG) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserRealWaitMessageEx( - DWORD dwWakeMask, - UINT uTimeout) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserRegisterRawInputDevices( - IN PCRAWINPUTDEVICE pRawInputDevices, - IN UINT uiNumDevices, - IN UINT cbSize) -{ - STUB; - return 0; -} - -DWORD APIENTRY -NtUserResolveDesktopForWOW(DWORD Unknown0) -{ - STUB - return 0; -} - -DWORD -APIENTRY -NtUserSetInformationProcess( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} - -NTSTATUS -APIENTRY -NtUserSetInformationThread(IN HANDLE ThreadHandle, - IN USERTHREADINFOCLASS ThreadInformationClass, - IN PVOID ThreadInformation, - IN ULONG ThreadInformationLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - PETHREAD Thread; - - /* Allow only CSRSS to perform this operation */ - if (PsGetCurrentProcess() != gpepCSRSS) - return STATUS_ACCESS_DENIED; - - UserEnterExclusive(); - - /* Get the Thread */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SET_INFORMATION, - *PsThreadType, - UserMode, - (PVOID)&Thread, - NULL); - if (!NT_SUCCESS(Status)) goto Quit; - - switch (ThreadInformationClass) - { - case UserThreadInitiateShutdown: - { - ULONG CapturedFlags = 0; - - ERR("Shutdown initiated\n"); - - if (ThreadInformationLength != sizeof(ULONG)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - /* Capture the caller value */ - Status = STATUS_SUCCESS; - _SEH2_TRY - { - ProbeForWrite(ThreadInformation, sizeof(CapturedFlags), sizeof(PVOID)); - CapturedFlags = *(PULONG)ThreadInformation; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(break); - } - _SEH2_END; - - Status = UserInitiateShutdown(Thread, &CapturedFlags); - - /* Return the modified value to the caller */ - _SEH2_TRY - { - *(PULONG)ThreadInformation = CapturedFlags; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - break; - } - - case UserThreadEndShutdown: - { - NTSTATUS ShutdownStatus; - - ERR("Shutdown ended\n"); - - if (ThreadInformationLength != sizeof(ShutdownStatus)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - /* Capture the caller value */ - Status = STATUS_SUCCESS; - _SEH2_TRY - { - ProbeForRead(ThreadInformation, sizeof(ShutdownStatus), sizeof(PVOID)); - ShutdownStatus = *(NTSTATUS*)ThreadInformation; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(break); - } - _SEH2_END; - - Status = UserEndShutdown(Thread, ShutdownStatus); - break; - } - - case UserThreadCsrApiPort: - { - HANDLE CsrPortHandle; - - ERR("Set CSR API Port for Win32k\n"); - - if (ThreadInformationLength != sizeof(CsrPortHandle)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - /* Capture the caller value */ - Status = STATUS_SUCCESS; - _SEH2_TRY - { - ProbeForRead(ThreadInformation, sizeof(CsrPortHandle), sizeof(PVOID)); - CsrPortHandle = *(PHANDLE)ThreadInformation; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(break); - } - _SEH2_END; - - Status = InitCsrApiPort(CsrPortHandle); - break; - } - - default: - { - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - } - - ObDereferenceObject(Thread); - -Quit: - UserLeave(); - return Status; -} - -DWORD -APIENTRY -NtUserSetThreadLayoutHandles( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserSoundSentry(VOID) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserTestForInteractiveUser( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -/* http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ -DWORD -APIENTRY -NtUserCalcMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserPaintMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6) -{ - STUB; - return 0; -} - - -DWORD -APIENTRY -NtUserRemoteConnect( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserRemoteRedrawRectangle( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserRemoteRedrawScreen(VOID) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserRemoteStopScreenUpdates(VOID) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserCtxDisplayIOCtl( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB; - return 0; -} + pLrdProp = UserGetProp(pWnd, AtomLayer); + + if (!pLrdProp) + { + pLrdProp = ExAllocatePoolWithTag(PagedPool, sizeof(LRD_PROP), USERTAG_REDIRECT); + if (pLrdProp == NULL) + { + ERR("failed to allocate LRD_PROP\n"); + return FALSE; + } + RtlZeroMemory(pLrdProp, sizeof(LRD_PROP)); + IntSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp); + } + + if (pLrdProp) + { + was_Layered = pLrdProp->is_Layered; + + pLrdProp->Key = crKey; + + if (dwFlags & LWA_ALPHA) + { + pLrdProp->Alpha = bAlpha; + } + else + { + if (!pLrdProp->is_Layered) pLrdProp->Alpha = 0; + } + + pLrdProp->Flags = dwFlags; + + pLrdProp->is_Layered = 1; + + if (!was_Layered) + co_UserRedrawWindow(pWnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME ); + } + // FIXME: Now set some bits to the Window DC!!!! + return TRUE; +} + +BOOL FASTCALL +IntUpdateLayeredWindowI( PWND pWnd, + UPDATELAYEREDWINDOWINFO *info ) +{ + PWND Parent; + RECT Window, Client; + SIZE Offset; + BOOL ret = FALSE; + DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW; + + Window = pWnd->rcWindow; + Client = pWnd->rcClient; + + Parent = pWnd->spwndParent; + if (pWnd->style & WS_CHILD && Parent) + { + RECTL_vOffsetRect(&Window, - Parent->rcClient.left, - Parent->rcClient.top); + RECTL_vOffsetRect(&Client, - Parent->rcClient.left, - Parent->rcClient.top); + } + + if (info->pptDst) + { + Offset.cx = info->pptDst->x - Window.left; + Offset.cy = info->pptDst->y - Window.top; + RECTL_vOffsetRect( &Client, Offset.cx, Offset.cy ); + RECTL_vOffsetRect( &Window, Offset.cx, Offset.cy ); + flags &= ~SWP_NOMOVE; + } + if (info->psize) + { + Offset.cx = info->psize->cx - (Window.right - Window.left); + Offset.cy = info->psize->cy - (Window.bottom - Window.top); + if (info->psize->cx <= 0 || info->psize->cy <= 0) + { + ERR("Update Layered Invalid Parameters\n"); + EngSetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if ((info->dwFlags & ULW_EX_NORESIZE) && (Offset.cx || Offset.cy)) + { + ERR("Wrong Size\n"); + EngSetLastError( ERROR_INCORRECT_SIZE ); + return FALSE; + } + Client.right += Offset.cx; + Client.bottom += Offset.cy; + Window.right += Offset.cx; + Window.bottom += Offset.cy; + flags &= ~SWP_NOSIZE; + } + + if (info->hdcSrc) + { + HBRUSH hBr; + HDC hdc; + RECT Rect; + BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; + COLORREF color_key = (info->dwFlags & ULW_COLORKEY) ? info->crKey : CLR_INVALID; + + Rect = Window; + + RECTL_vOffsetRect( &Rect, -Window.left, -Window.top ); + + TRACE("H %d W %d\n",Rect.bottom - Rect.top,Rect.right - Rect.left); + + if (!info->hdcDst) hdc = UserGetDCEx(pWnd, NULL, DCX_USESTYLE); + else hdc = info->hdcDst; + + hBr = NtGdiCreateSolidBrush(color_key, NULL); + if (hBr) + { + TRACE("Fill Color Key %x\n",color_key); + FillRect(hdc, &Rect, hBr); + } + + if (info->prcDirty) + { + ERR("prcDirty\n"); + RECTL_bIntersectRect( &Rect, &Rect, info->prcDirty ); + NtGdiPatBlt( hdc, Rect.left, Rect.top, Rect.right - Rect.left, Rect.bottom - Rect.top, BLACKNESS ); + } + + if (info->dwFlags & ULW_ALPHA) + { + blend = *info->pblend; + TRACE("ULW_ALPHA bop %d scA %d aF %d\n", blend.BlendOp, blend.SourceConstantAlpha, blend.AlphaFormat); + } + + ret = NtGdiAlphaBlend( hdc, + Rect.left, + Rect.top, + Rect.right - Rect.left, + Rect.bottom - Rect.top, + info->hdcSrc, + Rect.left + (info->pptSrc ? info->pptSrc->x : 0), + Rect.top + (info->pptSrc ? info->pptSrc->y : 0), + Rect.right - Rect.left, Rect.bottom - Rect.top, + blend, + 0); + + if (hBr) GreDeleteObject(hBr); + if (!info->hdcDst) UserReleaseDC(pWnd, hdc, FALSE); + } + else + ret = TRUE; + + co_WinPosSetWindowPos(pWnd, 0, Window.left, Window.top, Window.right - Window.left, Window.bottom - Window.top, flags); + return ret; +} + /* - * FillWindow: Called from User; Dialog, Edit and ListBox procs during a WM_ERASEBKGND. + * @implemented */ -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserFillWindow(HWND hWndPaint, - HWND hWndPaint1, - HDC hDC, - HBRUSH hBrush) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserLockWindowUpdate(HWND hWnd) -{ - STUB - - return 0; -} - BOOL APIENTRY NtUserGetLayeredWindowAttributes( @@ -957,12 +219,56 @@ BYTE *pbAlpha, DWORD *pdwFlags) { - STUB; - return 0; + PLRD_PROP pLrdProp; + PWND pWnd; + BOOL Ret = FALSE; + + TRACE("Enter NtUserGetLayeredWindowAttributes\n"); + + if (!(pWnd = UserGetWindowObject(hwnd)) || + !(pWnd->ExStyle & WS_EX_LAYERED) ) + { + return FALSE; + } + + UserEnterExclusive(); + + pLrdProp = UserGetProp(pWnd, AtomLayer); + + if (!pLrdProp) + { + TRACE("No Prop!\n"); + goto Exit; + } + + if (pLrdProp->is_Layered == 0) + { + goto Exit; + } + + _SEH2_TRY + { + if (pcrKey) *pcrKey = pLrdProp->Key; + if (pbAlpha) *pbAlpha = pLrdProp->Alpha; + if (pdwFlags) *pdwFlags = pLrdProp->Flags; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(goto Exit); + } + _SEH2_END; + + Ret = TRUE; + +Exit: + TRACE("Leave NtUserGetLayeredWindowAttributes, ret=%i\n", Ret); + UserLeave(); + return Ret; } /* - * @unimplemented + * @implemented */ BOOL APIENTRY NtUserSetLayeredWindowAttributes(HWND hwnd, @@ -970,12 +276,28 @@ BYTE bAlpha, DWORD dwFlags) { - STUB; - return FALSE; + PWND pWnd; + BOOL Ret = FALSE; + + TRACE("Enter NtUserSetLayeredWindowAttributes\n"); + UserEnterExclusive(); + + if (!(pWnd = UserGetWindowObject(hwnd)) || + !(pWnd->ExStyle & WS_EX_LAYERED) ) + { + ERR("Not a Layered Window!\n"); + goto Exit; + } + + Ret = IntSetLayeredWindowAttributes(pWnd, crKey, bAlpha, dwFlags); +Exit: + TRACE("Leave NtUserSetLayeredWindowAttributes, ret=%i\n", Ret); + UserLeave(); + return Ret; } /* - * @unimplemented + * @implemented */ BOOL APIENTRY @@ -991,43 +313,79 @@ DWORD dwFlags, RECT *prcDirty) { - STUB - - return 0; -} - -DWORD APIENTRY -NtUserQuerySendMessage(DWORD Unknown0) -{ - STUB; - - return 0; -} - -BOOL APIENTRY NtUserAddClipboardFormatListener( - HWND hwnd -) -{ - STUB; - return FALSE; -} - -BOOL APIENTRY NtUserRemoveClipboardFormatListener( - HWND hwnd -) -{ - STUB; - return FALSE; -} - -BOOL APIENTRY NtUserGetUpdatedClipboardFormats( - PUINT lpuiFormats, - UINT cFormats, - PUINT pcFormatsOut -) -{ - STUB; - return FALSE; + UPDATELAYEREDWINDOWINFO info; + POINT Dst, Src; + SIZE Size; + RECT Dirty; + BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; + PWND pWnd; + BOOL Ret = FALSE; + + TRACE("Enter NtUserUpdateLayeredWindow\n"); + + if (!(pWnd = UserGetWindowObject(hwnd))) + { + return FALSE; + } + + _SEH2_TRY + { + if (pptDst) + { + ProbeForRead(pptDst, sizeof(POINT), 1); + Dst = *pptDst; + } + if (pptSrc) + { + ProbeForRead(pptSrc, sizeof(POINT), 1); + Src = *pptSrc; + } + ProbeForRead(psize, sizeof(SIZE), 1); + Size = *psize; + if (pblend) + { + ProbeForRead(pblend, sizeof(BLENDFUNCTION), 1); + blend = *pblend; + } + if (prcDirty) + { + ProbeForRead(prcDirty, sizeof(RECT), 1); + Dirty = *prcDirty; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + EngSetLastError( ERROR_INVALID_PARAMETER ); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + UserEnterExclusive(); + + if ( GetLayeredStatus(pWnd) || + dwFlags & ~(ULW_COLORKEY | ULW_ALPHA | ULW_OPAQUE | ULW_EX_NORESIZE) || + !(pWnd->ExStyle & WS_EX_LAYERED) ) + { + ERR("Layered Window Invalid Parameters\n"); + EngSetLastError( ERROR_INVALID_PARAMETER ); + goto Exit; + } + + info.cbSize = sizeof(info); + info.hdcDst = hdcDst; + info.pptDst = pptDst? &Dst : 0; + info.psize = &Size; + info.hdcSrc = hdcSrc; + info.pptSrc = pptSrc ? &Src : 0; + info.crKey = crKey; + info.pblend = &blend; + info.dwFlags = dwFlags; + info.prcDirty = prcDirty ? &Dirty : 0; + Ret = IntUpdateLayeredWindowI( pWnd, &info ); +Exit: + TRACE("Leave NtUserUpdateLayeredWindow, ret=%i\n", Ret); + UserLeave(); + return Ret; } /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Fri Sep 11 02:34:11 2015 @@ -62,7 +62,7 @@ } if ((pWnd->style & WS_VISIBLE) && - (pWnd->ExStyle & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == 0 && + (pWnd->ExStyle & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) != (WS_EX_LAYERED|WS_EX_TRANSPARENT) && IntPtInWindow(pWnd, x, y)) return pWnd; } 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] Fri Sep 11 02:34:11 2015 @@ -980,53 +980,6 @@ return 0; } -BOOL -APIENTRY -NtUserGetLayeredWindowAttributes( - HWND hwnd, - COLORREF *pcrKey, - BYTE *pbAlpha, - DWORD *pdwFlags) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserSetLayeredWindowAttributes(HWND hwnd, - COLORREF crKey, - BYTE bAlpha, - DWORD dwFlags) -{ - STUB; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtUserUpdateLayeredWindow( - HWND hwnd, - HDC hdcDst, - POINT *pptDst, - SIZE *psize, - HDC hdcSrc, - POINT *pptSrc, - COLORREF crKey, - BLENDFUNCTION *pblend, - DWORD dwFlags, - RECT *prcDirty) -{ - STUB - - return 0; -} - DWORD APIENTRY NtUserQuerySendMessage(DWORD Unknown0) { Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Fri Sep 11 02:34:11 2015 @@ -145,4 +145,9 @@ BOOL UserDrawSysMenuButton(PWND pWnd, HDC hDC, LPRECT Rect, BOOL Down); BOOL UserPaintCaption(PWND pWnd, INT Flags); +/************** LAYERED **************/ + +BOOL FASTCALL SetLayeredStatus(PWND pWnd, BYTE set); +BOOL FASTCALL GetLayeredStatus(PWND pWnd); + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Fri Sep 11 02:34:11 2015 @@ -3546,6 +3546,11 @@ else Style.styleNew &= ~WS_EX_WINDOWEDGE; + if (!(Window->ExStyle & WS_EX_LAYERED)) + { + SetLayeredStatus(Window, 0); + } + Window->ExStyle = (DWORD)Style.styleNew; co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_EXSTYLE, (LPARAM) &Style); Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Fri Sep 11 02:34:11 2015 @@ -1713,8 +1713,11 @@ BLENDFUNCTION *pbl, DWORD dwFlags) { - if ( dwFlags & ULW_EX_NORESIZE) - dwFlags = ~(ULW_EX_NORESIZE|ULW_OPAQUE|ULW_ALPHA|ULW_COLORKEY); + if (dwFlags & ULW_EX_NORESIZE) /* only valid for UpdateLayeredWindowIndirect */ + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } return NtUserUpdateLayeredWindow( hwnd, hdcDst, pptDst,

1 0

[ion] 69178: [BOOTMGFW] - Implement Block I/O read operations & related functions. Code needs cleanup, TBD. - Unfortunately, I wish I could say it works, but it seems like all we get back are zeroe...
by ion＠svn.reactos.org 10 Sep '15

10 Sep '15

Author: ion Date: Thu Sep 10 23:13:31 2015 New Revision: 69178 URL: http://svn.reactos.org/svn/reactos?rev=69178&view=rev Log: [BOOTMGFW] - Implement Block I/O read operations & related functions. Code needs cleanup, TBD. - Unfortunately, I wish I could say it works, but it seems like all we get back are zeroes (from EFI itself). I suspect we are reading from the wrong device -- will have to investigate for a bit. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/boot/environ/lib/io/fat.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Thu Sep 10 23:13:31 2015 @@ -898,7 +898,7 @@ BL_PARTITION_TYPE PartitionType; ULONG BlockSize; ULONG Alignment; - ULONGLONG MaxBlock; + ULONGLONG LastBlock; ULONGLONG Offset; ULONG Block; struct @@ -929,7 +929,7 @@ typedef struct _BL_BLOCK_DEVICE { BL_BLOCK_DEVICE_INFORMATION; - ULONGLONG LastBlock; + ULONGLONG StartOffset; EFI_BLOCK_IO* Protocol; EFI_HANDLE Handle; } BL_BLOCK_DEVICE, *PBL_BLOCK_DEVICE; Modified: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Thu Sep 10 23:13:31 2015 @@ -73,18 +73,488 @@ _Out_ PBL_DEVICE_INFORMATION DeviceInformation ); +NTSTATUS +BlockIoRead ( + _In_ PBL_DEVICE_ENTRY DeviceEntry, + _In_ PVOID Buffer, + _In_ ULONG Size, + _Out_ PULONG BytesRead + ); + BL_DEVICE_CALLBACKS BlockIoDeviceFunctionTable = { NULL, BlockIoOpen, NULL, - NULL, + BlockIoRead, NULL, BlockIoGetInformation, BlockIoSetInformation }; NTSTATUS +BlockIoFirmwareWrite ( + _In_ PBL_BLOCK_DEVICE BlockDevice, + _In_ PVOID Buffer, + _In_ ULONGLONG Block, + _In_ ULONGLONG BlockCount + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlockIoFirmwareRead ( + _In_ PBL_BLOCK_DEVICE BlockDevice, + _In_ PVOID Buffer, + _In_ ULONGLONG Block, + _In_ ULONGLONG BlockCount + ) +{ + NTSTATUS Status; + EFI_BLOCK_IO *BlockProtocol; + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + ULONG FailureCount; + + for (FailureCount = 0, Status = STATUS_SUCCESS; + FailureCount < 2 && NT_SUCCESS(Status); + FailureCount++) + { + BlockProtocol = BlockDevice->Protocol; + + OldMode = CurrentExecutionContext->Mode; + if (CurrentExecutionContext->Mode != 1) + { + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + EfiPrintf(L"EFI Reading BLOCK %d off media %lx (%d blocks)\r\n", + Block, BlockProtocol->Media->MediaId, BlockCount); + EfiStatus = BlockProtocol->ReadBlocks(BlockProtocol, + BlockProtocol->Media->MediaId, + Block, + BlockProtocol->Media->BlockSize * BlockCount, + Buffer); + if (EfiStatus == EFI_SUCCESS) + { + EfiPrintf(L"EFI Read complete into buffer\r\n"); + EfiPrintf(L"Buffer data: %lx %lx %lx %lx\r\n", *(PULONG)Buffer, *((PULONG)Buffer + 1), *((PULONG)Buffer + 2), *((PULONG)Buffer + 3)); + } + + if (OldMode != 1) + { + BlpArchSwitchContext(OldMode); + } + + Status = EfiGetNtStatusCode(EfiStatus); + if (Status != STATUS_MEDIA_CHANGED) + { + break; + } + + EfiCloseProtocol(BlockDevice->Handle, &EfiBlockIoProtocol); + + Status = EfiOpenProtocol(BlockDevice->Handle, + &EfiBlockIoProtocol, + (PVOID*)BlockDevice->Protocol); + } + + return Status; +} + +NTSTATUS +BlockIopFirmwareOperation ( + PBL_DEVICE_ENTRY DeviceEntry, + _In_ PVOID Buffer, + _In_ ULONGLONG Block, + _In_ ULONGLONG BlockCount, + _In_ ULONG OperationType + ) +{ + ULONG FailureCount; + PBL_BLOCK_DEVICE BlockDevice; + NTSTATUS Status; + + BlockDevice = DeviceEntry->DeviceSpecificData; + + if (OperationType == 1) + { + for (FailureCount = 0; FailureCount < 3; FailureCount++) + { + Status = BlockIoFirmwareWrite(BlockDevice, Buffer, Block, BlockCount); + if (Status >= 0) + { + break; + } + } + } + else + { + for (FailureCount = 0; FailureCount < 3; FailureCount++) + { + Status = BlockIoFirmwareRead(BlockDevice, Buffer, Block, BlockCount); + if (Status >= 0) + { + break; + } + } + } + return Status; +} + +NTSTATUS +BlockIopFreeAlignedBuffer ( + _Inout_ PVOID* Buffer, + _Inout_ PULONG BufferSize + ) +{ + NTSTATUS Status; + + if (*BufferSize) + { + EfiPrintf(L"Aligned free not yet implemented\r\n"); + Status = STATUS_NOT_IMPLEMENTED; + //Status = MmPapFreePages(*Buffer, 1); + + *Buffer = NULL; + *BufferSize = 0; + } + else + { + Status = STATUS_SUCCESS; + } + + return Status; +} + +NTSTATUS +BlockIopAllocateAlignedBuffer ( + _Inout_ PVOID* Buffer, + _Inout_ PULONG BufferSize, + _In_ ULONG Size, + _In_ ULONG Alignment + ) +{ + NTSTATUS Status; + + if (!Alignment) + { + ++Alignment; + } + + Status = STATUS_SUCCESS; + if ((Size > *BufferSize) || ((Alignment - 1) & (ULONG_PTR)*Buffer)) + { + BlockIopFreeAlignedBuffer(Buffer, BufferSize); + + *BufferSize = ROUND_TO_PAGES(Size); + + Status = MmPapAllocatePagesInRange(Buffer, + BlLoaderDeviceMemory, + *BufferSize >> PAGE_SHIFT, + 0, + Alignment >> PAGE_SHIFT, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + *BufferSize = 0; + } + } + + return Status; +} + +NTSTATUS +BlockIopReadUsingPrefetch ( + _In_ PBL_DEVICE_ENTRY DeviceEntry, + _In_ PVOID Buffer, + _In_ ULONG BlockCount + ) +{ + EfiPrintf(L"No prefetch support\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlockIopOperation ( + _In_ PBL_DEVICE_ENTRY DeviceEntry, + _In_ PVOID Buffer, + _In_ ULONG BlockCount, + _In_ ULONG OperationType + ) +{ + PBL_BLOCK_DEVICE BlockDevice; + ULONG BufferSize, Alignment; + ULONGLONG Offset; + NTSTATUS Status; + + BlockDevice = DeviceEntry->DeviceSpecificData; + BufferSize = BlockDevice->BlockSize * BlockCount; + Offset = BlockDevice->Block + BlockDevice->StartOffset; + if ((BlockDevice->LastBlock + 1) < (BlockDevice->Block + BlockCount)) + { + EfiPrintf(L"Read past end of device\r\n"); + return STATUS_INVALID_PARAMETER; + } + + Alignment = BlockDevice->Alignment; + if (!Alignment || !((Alignment - 1) & (ULONG_PTR)Buffer)) + { + Status = BlockIopFirmwareOperation(DeviceEntry, + Buffer, + Offset, + BlockCount, + OperationType); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"EFI op failed: %lx\r\n", Status); + return Status; + } + + return STATUS_SUCCESS; + } + + EfiPrintf(L"Firmware alignment fixup required\r\n"); + Status = BlockIopAllocateAlignedBuffer(&BlockIopAlignedBuffer, + &BlockIopAlignedBufferSize, + BufferSize, + BlockDevice->Alignment); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"No memory for align\r\n"); + return STATUS_NO_MEMORY; + } + + if (OperationType == 1) + { + RtlCopyMemory(BlockIopAlignedBuffer, Buffer, BufferSize); + } + + Status = BlockIopFirmwareOperation(DeviceEntry, + BlockIopAlignedBuffer, + Offset, + BlockCount, + OperationType); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if (!OperationType) + { + RtlCopyMemory(Buffer, BlockIopAlignedBuffer, BufferSize); + } + + return STATUS_SUCCESS; +} + +NTSTATUS +BlockIopReadWriteVirtualDevice ( + _In_ PBL_DEVICE_ENTRY DeviceEntry, + _In_ PVOID Buffer, + _In_ ULONG Size, + _In_ ULONG Operation, + _Out_ PULONG BytesRead + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlockIopReadPhysicalDevice ( + _In_ PBL_DEVICE_ENTRY DeviceEntry, + _In_ PVOID Buffer, + _In_ ULONG Size, + _Out_ PULONG BytesRead + ) +{ + PBL_BLOCK_DEVICE BlockDevice; + PVOID ReadBuffer; // edi@1 + ULONGLONG OffsetEnd, AlignedOffsetEnd, Offset; + NTSTATUS Status; + + BlockDevice = DeviceEntry->DeviceSpecificData; + ReadBuffer = Buffer; + OffsetEnd = Size + BlockDevice->Offset; + if (OffsetEnd < Size) + { + OffsetEnd = -1; + return STATUS_INTEGER_OVERFLOW; + } + + AlignedOffsetEnd = ~(BlockDevice->BlockSize - 1) & (OffsetEnd + BlockDevice->BlockSize - 1); + if (AlignedOffsetEnd < OffsetEnd) + { + return STATUS_INTEGER_OVERFLOW; + } + + if ((BlockDevice->Offset) || (Size != AlignedOffsetEnd)) + { + Status = BlockIopAllocateAlignedBuffer(&BlockIopReadBlockBuffer, + &BlockIopReadBlockBufferSize, + AlignedOffsetEnd, + BlockDevice->Alignment); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Failed to allocate buffer: %lx\r\n", Status); + return Status; + } + + ReadBuffer = BlockIopReadBlockBuffer; + } + + Offset = AlignedOffsetEnd / BlockDevice->BlockSize; + + if (BlockDevice->Unknown & 2) + { + Status = BlockIopReadUsingPrefetch(DeviceEntry, + ReadBuffer, + AlignedOffsetEnd / BlockDevice->BlockSize); + if (NT_SUCCESS(Status)) + { + goto ReadComplete; + } + } + + Status = BlockIopOperation(DeviceEntry, ReadBuffer, Offset, 0); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Block I/O failed:%lx\r\n", Status); + return Status; + } + + BlockDevice->Block += Offset; + +ReadComplete: + if (ReadBuffer != Buffer) + { + RtlCopyMemory(Buffer, + (PVOID)((ULONG_PTR)ReadBuffer + + (ULONG_PTR)BlockDevice->Offset), + Size); + } + + if (BytesRead) + { + *BytesRead = Size; + } + + return STATUS_SUCCESS; +} + +NTSTATUS +BlockIopBlockInformationCheck ( + _In_ PBL_BLOCK_DEVICE BlockDevice, + _In_opt_ PULONG DesiredSize, + _Out_opt_ PULONG Size, + _Out_opt_ PULONG OutputAdjustedSize + ) +{ + ULONG RealSize; + ULONGLONG Offset, LastOffset, RemainingOffset, MaxOffset; + NTSTATUS Status; + + RealSize = 0; + + Offset = (BlockDevice->Offset * BlockDevice->BlockSize) + BlockDevice->Block; + + if (Offset > ((BlockDevice->LastBlock + 1) * BlockDevice->BlockSize)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + LastOffset = (BlockDevice->LastBlock * BlockDevice->BlockSize) + BlockDevice->BlockSize - 1; + + MaxOffset = BlockDevice->LastBlock; + if (MaxOffset < BlockDevice->BlockSize) + { + MaxOffset = BlockDevice->BlockSize; + } + + if (LastOffset < MaxOffset) + { + + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + if (Offset > LastOffset) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + RemainingOffset = LastOffset - Offset + 1; + + if (DesiredSize != FALSE) + { + RealSize = *DesiredSize; + } + else + { + RealSize = ULONG_MAX; + } + + if (RemainingOffset < RealSize) + { + if (Size == FALSE) + { + RealSize = 0; + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + RealSize = RemainingOffset; + } + + Status = STATUS_SUCCESS; + +Quickie: + if (Size) + { + *Size = RealSize; + } + + return Status; +} + +NTSTATUS +BlockIoRead ( + _In_ PBL_DEVICE_ENTRY DeviceEntry, + _In_ PVOID Buffer, + _In_ ULONG Size, + _Out_ PULONG BytesRead + ) +{ + PBL_BLOCK_DEVICE BlockDevice; + NTSTATUS Status; + + BlockDevice = DeviceEntry->DeviceSpecificData; + + Status = BlockIopBlockInformationCheck(BlockDevice, &Size, BytesRead, &Size); + if (NT_SUCCESS(Status)) + { + if (BlockDevice->DeviceFlags & 4) + { + Status = BlockIopReadWriteVirtualDevice(DeviceEntry, Buffer, Size, 0, BytesRead); + } + else + { + Status = BlockIopReadPhysicalDevice(DeviceEntry, Buffer, Size, BytesRead); + } + } + else if (BytesRead) + { + *BytesRead = 0; + } + return Status; +} + +NTSTATUS BlockIoSetInformation ( _In_ PBL_DEVICE_ENTRY DeviceEntry, _Out_ PBL_DEVICE_INFORMATION DeviceInformation @@ -96,8 +566,9 @@ BlockDevice = DeviceEntry->DeviceSpecificData; Offset = DeviceInformation->BlockDeviceInfo.Block * BlockDevice->BlockSize + DeviceInformation->BlockDeviceInfo.Offset; - if (Offset > ((BlockDevice->MaxBlock + 1) * BlockDevice->BlockSize - 1)) - { + if (Offset > ((BlockDevice->LastBlock + 1) * BlockDevice->BlockSize - 1)) + { + EfiPrintf(L"Invalid offset\r\n"); return STATUS_INVALID_PARAMETER; } @@ -159,7 +630,7 @@ NTSTATUS BlDeviceGetInformation ( - _In_ ULONG DeviceId, + _In_ ULONG DeviceId, _Out_ PBL_DEVICE_INFORMATION DeviceInformation ) { @@ -198,33 +669,37 @@ _Out_ PULONG BytesRead ) { - PBL_DEVICE_ENTRY DeviceEntry; // ecx@3 + PBL_DEVICE_ENTRY DeviceEntry; NTSTATUS Status; ULONG BytesTransferred; - if (Buffer - && DmTableEntries > DeviceId - && (DeviceEntry = DmDeviceTable[DeviceId]) != 0 - && DeviceEntry->Flags & 1 - && DeviceEntry->Flags & 2) - { - EfiPrintf(L"Calling read...\r\n"); - Status = DeviceEntry->Callbacks.Read(DeviceEntry, Buffer, Size, &BytesTransferred); - - if (!DeviceEntry->Unknown) - { - DmDeviceIoInformation.ReadCount += BytesTransferred; - } - - if (BytesRead) - { - *BytesRead = BytesTransferred; - } - } - else - { - Status = STATUS_INVALID_PARAMETER; - } + if (!(Buffer) || (DmTableEntries <= DeviceId)) + { + return STATUS_INVALID_PARAMETER; + } + + DeviceEntry = DmDeviceTable[DeviceId]; + if (!DeviceEntry) + { + return STATUS_INVALID_PARAMETER; + } + + if (!(DeviceEntry->Flags & 1) || !(DeviceEntry->Flags & 2)) + { + return STATUS_INVALID_PARAMETER; + } + + Status = DeviceEntry->Callbacks.Read(DeviceEntry, Buffer, Size, &BytesTransferred); + if (!DeviceEntry->Unknown) + { + DmDeviceIoInformation.ReadCount += BytesTransferred; + } + + if (BytesRead) + { + *BytesRead = BytesTransferred; + } + return Status; } @@ -241,21 +716,21 @@ BL_DEVICE_INFORMATION DeviceInformation; Status = BlDeviceGetInformation(DeviceId, &DeviceInformation); - if (Status >= 0) - { - DeviceInformation.BlockDeviceInfo.Block = Offset / DeviceInformation.BlockDeviceInfo.BlockSize; - DeviceInformation.BlockDeviceInfo.Offset = Offset % DeviceInformation.BlockDeviceInfo.BlockSize; - Status = BlDeviceSetInformation(DeviceId, &DeviceInformation); - - if (NT_SUCCESS(Status)) - { - EfiPrintf(L"Block: %d Offset: %d\r\n", DeviceInformation.BlockDeviceInfo.Block, DeviceInformation.BlockDeviceInfo.Offset); - Status = BlDeviceRead(DeviceId, Buffer, Size, BytesRead); - } - } + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DeviceInformation.BlockDeviceInfo.Block = Offset / DeviceInformation.BlockDeviceInfo.BlockSize; + DeviceInformation.BlockDeviceInfo.Offset = Offset % DeviceInformation.BlockDeviceInfo.BlockSize; + Status = BlDeviceSetInformation(DeviceId, &DeviceInformation); + if (NT_SUCCESS(Status)) + { + Status = BlDeviceRead(DeviceId, Buffer, Size, BytesRead); + } + return Status; } - BOOLEAN BlpDeviceCompare ( @@ -1633,7 +2108,7 @@ { /* Clear it */ RtlZeroMemory(DmDeviceTable, DmTableEntries * sizeof(PVOID)); -#if 0 +#if BL_BITLOCKER_SUPPORT /* Initialize BitLocker support */ Status = FvebInitialize(); #else Modified: trunk/reactos/boot/environ/lib/io/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/fat.c?… ============================================================================== --- trunk/reactos/boot/environ/lib/io/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/fat.c [iso-8859-1] Thu Sep 10 23:13:31 2015 @@ -30,6 +30,7 @@ ULONG UnknownFlag; NTSTATUS Status; PACKED_BOOT_SECTOR FatBootSector; + BIOS_PARAMETER_BLOCK BiosBlock; EfiPrintf(L"FAT Mount on Device %d\r\n", DeviceId); @@ -58,7 +59,21 @@ return Status; } + FatUnpackBios(&BiosBlock, &FatBootSector.PackedBpb); + EfiPrintf(L"Drive read\r\n"); + + EfiPrintf(L"Jump: %lx Bytes Per Sector: %d Sectors Per Cluster: %d Reserved: %d Fats: %d Sectors: %d Large Sectors: %d Media: %lx RootEntries: %d\r\n", + FatBootSector.Jump[0], + BiosBlock.BytesPerSector, + BiosBlock.SectorsPerCluster, + BiosBlock.ReservedSectors, + BiosBlock.Fats, + BiosBlock.Sectors, + BiosBlock.LargeSectors, + BiosBlock.Media, + BiosBlock.RootEntries); + EfiStall(3000000); return STATUS_NOT_IMPLEMENTED; }

1 0

[spetreolle] 69177: [MOUNTMGR] Declare MountmgrReadNoAutoMount.
by spetreolle＠svn.reactos.org 10 Sep '15

10 Sep '15

Author: spetreolle Date: Thu Sep 10 22:06:10 2015 New Revision: 69177 URL: http://svn.reactos.org/svn/reactos?rev=69177&view=rev Log: [MOUNTMGR] Declare MountmgrReadNoAutoMount. Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Thu Sep 10 22:06:10 2015 @@ -234,6 +234,12 @@ IN PDEVICE_INFORMATION DeviceInformation ); +INIT_SECTION +BOOLEAN +MountmgrReadNoAutoMount( + IN PUNICODE_STRING RegistryPath +); + /* database.c */ extern PWSTR DatabasePath;

1 0

[pschweitzer] 69176: [MOUNTMGR] Move DriverEntry() and MountmgrReadNoAutoMount() to INIT_SECTION
by pschweitzer＠svn.reactos.org 10 Sep '15

10 Sep '15

Author: pschweitzer Date: Thu Sep 10 21:41:20 2015 New Revision: 69176 URL: http://svn.reactos.org/svn/reactos?rev=69176&view=rev Log: [MOUNTMGR] Move DriverEntry() and MountmgrReadNoAutoMount() to INIT_SECTION Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h trunk/reactos/drivers/filters/mountmgr/mountmgr.c Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Thu Sep 10 21:41:20 2015 @@ -7,6 +7,12 @@ #include <wdmguid.h> #include <ndk/psfuncs.h> #include <ntdddisk.h> + +#ifdef __GNUC__ +#define INIT_SECTION __attribute__((section ("INIT"))) +#else +#define INIT_SECTION /* Done via alloc_text for MSC */ +#endif /* Enter FIXME */ #ifdef IsEqualGUID Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Thu Sep 10 21:41:20 2015 @@ -28,6 +28,11 @@ #define NDEBUG #include <debug.h> + +#if defined(ALLOC_PRAGMA) +#pragma alloc_text(INIT, MountmgrReadNoAutoMount) +#pragma alloc_text(INIT, DriverEntry) +#endif /* FIXME */ GUID MountedDevicesGuid = {0x53F5630D, 0xB6BF, 0x11D0, {0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B}}; @@ -912,6 +917,7 @@ /* * @implemented */ +INIT_SECTION BOOLEAN MountmgrReadNoAutoMount(IN PUNICODE_STRING RegistryPath) { @@ -1805,6 +1811,7 @@ /* FUNCTIONS ****************************************************************/ +INIT_SECTION NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject,

1 0

[pschweitzer] 69175: [FASTFAT] Move VfatInitFastIoRoutines to the INIT section
by pschweitzer＠svn.reactos.org 10 Sep '15

10 Sep '15

Author: pschweitzer Date: Thu Sep 10 21:35:15 2015 New Revision: 69175 URL: http://svn.reactos.org/svn/reactos?rev=69175&view=rev Log: [FASTFAT] Move VfatInitFastIoRoutines to the INIT section Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Thu Sep 10 21:35:15 2015 @@ -12,6 +12,10 @@ #define NDEBUG #include <debug.h> +#if defined(ALLOC_PRAGMA) +#pragma alloc_text(INIT, VfatInitFastIoRoutines) +#endif + static FAST_IO_CHECK_IF_POSSIBLE VfatFastIoCheckIfPossible; static @@ -779,6 +783,7 @@ ExReleaseResourceLite(&(Fcb->MainResource)); } +INIT_SECTION VOID VfatInitFastIoRoutines( PFAST_IO_DISPATCH FastIoDispatch)

1 0

[ekohl] 69174: [USETUP] Fix the GeoID for most languages. CORE-10073 #resolve
by ekohl＠svn.reactos.org 10 Sep '15

10 Sep '15

Author: ekohl Date: Thu Sep 10 21:28:37 2015 New Revision: 69174 URL: http://svn.reactos.org/svn/reactos?rev=69174&view=rev Log: [USETUP] Fix the GeoID for most languages. CORE-10073 #resolve Modified: trunk/reactos/base/setup/usetup/muilanguages.h Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Thu Sep 10 21:28:37 2015 @@ -415,427 +415,427 @@ { /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID page strgs,error strings, other strings, fonts, kb layouts */ #ifdef LANGUAGE_AF_ZA - {L"00000436", L"1252", L"850", L"10000", L"Afrikaans", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, afZALayouts }, + {L"00000436", L"1252", L"850", L"10000", L"Afrikaans", L"209", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, afZALayouts }, #endif #ifdef LANGUAGE_SQ_AL - {L"0000041C", L"1250", L"852", L"10029", L"Albanian (Albania)", L"355", sqALPages, sqALErrorEntries, sqALStrings, LatinFonts, sqALLayouts }, + {L"0000041C", L"1250", L"852", L"10029", L"Albanian (Albania)", L"6", sqALPages, sqALErrorEntries, sqALStrings, LatinFonts, sqALLayouts }, #endif #ifdef LANGUAGE_AR_SA - {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", L"966", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSALayouts }, + {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", L"205", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSALayouts }, #endif #ifdef LANGUAGE_AR_IQ - {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", L"964", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arIQLayouts }, + {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", L"121", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arIQLayouts }, #endif #ifdef LANGUAGE_AR_EG - {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", L"20", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arEGLayouts }, + {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", L"67", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arEGLayouts }, #endif #ifdef LANGUAGE_AR_LY - {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLYLayouts }, + {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", L"148", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLYLayouts }, #endif #ifdef LANGUAGE_AR_DZ - {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arDZLayouts }, + {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", L"4", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arDZLayouts }, #endif #ifdef LANGUAGE_AR_MA - {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arMALayouts }, + {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", L"149", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arMALayouts }, #endif #ifdef LANGUAGE_AR_TN - {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arTNLayouts }, + {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", L"234", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arTNLayouts }, #endif #ifdef LANGUAGE_AR_OM - {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arOMLayouts }, + {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", L"164", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arOMLayouts }, #endif #ifdef LANGUAGE_AR_YE - {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arYELayouts }, + {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", L"261", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arYELayouts }, #endif #ifdef LANGUAGE_AR_SY - {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSYLayouts }, + {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", L"222", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSYLayouts }, #endif #ifdef LANGUAGE_AR_JO - {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arJOLayouts }, + {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", L"126", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arJOLayouts }, #endif #ifdef LANGUAGE_AR_LB - {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLBLayouts }, + {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", L"139", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLBLayouts }, #endif #ifdef LANGUAGE_AR_KW - {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arKWLayouts }, + {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", L"136", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arKWLayouts }, #endif #ifdef LANGUAGE_AR_AE - {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", L"971", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arAELayouts }, + {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", L"224", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arAELayouts }, #endif #ifdef LANGUAGE_AR_BH - {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arBHLayouts }, + {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", L"17", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arBHLayouts }, #endif #ifdef LANGUAGE_AR_QA - {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", L"974", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arQALayouts }, + {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", L"197", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arQALayouts }, #endif #ifdef LANGUAGE_HY_AM - {L"0000042B", L"0", L"1", L"2", L"Armenian", L"374", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hyAMLayouts }, + {L"0000042B", L"0", L"1", L"2", L"Armenian", L"7", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hyAMLayouts }, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, azAZLayouts }, + {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", L"5", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, azAZLayouts }, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, azAZLayouts }, + {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", L"5", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, azAZLayouts }, #endif #ifdef LANGUAGE_EU_ES - {L"0000042D", L"1252", L"850", L"10000", L"Basque", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, euESLayouts }, + {L"0000042D", L"1252", L"850", L"10000", L"Basque", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, euESLayouts }, #endif #ifdef LANGUAGE_BE_BY - {L"00000423", L"1251", L"866", L"10007", L"Belarusian", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, beBYLayouts }, + {L"00000423", L"1251", L"866", L"10007", L"Belarusian", L"29", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, beBYLayouts }, #endif #ifdef LANGUAGE_BN_BD - {L"00000845", L"0", L"1", L"2", L"Bengali (Bangladesh)", L"1", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnBDLayouts }, + {L"00000845", L"0", L"1", L"2", L"Bengali (Bangladesh)", L"23", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnBDLayouts }, #endif #ifdef LANGUAGE_BN_IN - {L"00000445", L"0", L"1", L"2", L"Bengali (India)", L"1", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnINLayouts }, + {L"00000445", L"0", L"1", L"2", L"Bengali (India)", L"113", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnINLayouts }, #endif #ifdef LANGUAGE_BG_BG - {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"359", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, + {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"35", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, #endif #ifdef LANGUAGE_MY_MM {L"00000455", L"0", L"1", L"2", L"Burmese", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, myMMLayouts }, #endif #ifdef LANGUAGE_CA_ES - {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, + {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, #endif #ifdef LANGUAGE_ZH_TW - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"886", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhTWLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhTWLayouts }, #endif #ifdef LANGUAGE_ZH_CN - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"86", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhCNLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhCNLayouts }, #endif #ifdef LANGUAGE_ZH_HK - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhHKLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhHKLayouts }, #endif #ifdef LANGUAGE_ZH_SG - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhSGLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhSGLayouts }, #endif #ifdef LANGUAGE_ZH_MO - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhMOLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhMOLayouts }, #endif #ifdef LANGUAGE_HR_HR - {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"385", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, + {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"108", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, #endif #ifdef LANGUAGE_CS_CZ - {L"00000405", L"1250", L"852", L"10029", L"Czech", L"420", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, + {L"00000405", L"1250", L"852", L"10029", L"Czech", L"75", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, #endif #ifdef LANGUAGE_DA_DK - {L"00000406", L"1252", L"850", L"10000", L"Danish", L"45", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, daDKLayouts }, + {L"00000406", L"1252", L"850", L"10000", L"Danish", L"61", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, daDKLayouts }, #endif #ifdef LANGUAGE_DV_MV - {L"00000465", L"0", L"1", L"2", L"Dhivehi (Maldives)", L"960", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, dvMVLayouts }, + {L"00000465", L"0", L"1", L"2", L"Dhivehi (Maldives)", L"165", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, dvMVLayouts }, #endif #ifdef LANGUAGE_NL_NL - {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", L"31", nlNLPages, nlNLErrorEntries, nlNLStrings, LatinFonts, nlNLLayouts }, + {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", L"176", nlNLPages, nlNLErrorEntries, nlNLStrings, LatinFonts, nlNLLayouts }, #endif #ifdef LANGUAGE_NL_BE - {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", L"32", nlNLPages, nlNLErrorEntries, nlNLStrings, LatinFonts, nlBELayouts }, + {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", L"21", nlNLPages, nlNLErrorEntries, nlNLStrings, LatinFonts, nlBELayouts }, #endif #ifdef LANGUAGE_EN_US - {L"00000409", L"1252", L"437", L"10000", L"English (United States)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, + {L"00000409", L"1252", L"437", L"10000", L"English (United States)", L"244", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, #endif #ifdef LANGUAGE_EN_GB - {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", L"44", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enGBLayouts }, + {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", L"242", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enGBLayouts }, #endif #ifdef LANGUAGE_EN_AU - {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", L"61", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enAULayouts }, + {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", L"12", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enAULayouts }, #endif #ifdef LANGUAGE_EN_CA - {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", L"107", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCALayouts }, + {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", L"39", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCALayouts }, #endif #ifdef LANGUAGE_EN_NZ - {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", L"64", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enNZLayouts }, + {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", L"183", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enNZLayouts }, #endif #ifdef LANGUAGE_EN_IE - {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", L"353", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enIELayouts }, + {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", L"68", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enIELayouts }, #endif #ifdef LANGUAGE_EN_ZA - {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", L"27", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZALayouts }, + {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", L"209", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZALayouts }, #endif #ifdef LANGUAGE_EN_JM - {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enJMLayouts }, + {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", L"124", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enJMLayouts }, #endif #ifdef LANGUAGE_EN_CB {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCBLayouts }, #endif #ifdef LANGUAGE_EN_BZ - {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enBZLayouts }, + {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", L"24", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enBZLayouts }, #endif #ifdef LANGUAGE_EN_TT - {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enTTLayouts }, + {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", L"225", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enTTLayouts }, #endif #ifdef LANGUAGE_EN_ZW - {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZWLayouts }, + {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", L"264", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZWLayouts }, #endif #ifdef LANGUAGE_EN_PH - {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", L"63", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enPHLayouts }, + {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", L"201", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enPHLayouts }, #endif #ifdef LANGUAGE_EO_AA {L"0000048F", L"1252", L"437", L"10000", L"Esperanto", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, eoAALayouts }, #endif #ifdef LANGUAGE_ET_EE - {L"00000425", L"1252", L"775", L"10029", L"Estonian", L"372", etEEPages, etEEErrorEntries, etEEStrings, LatinFonts, etEELayouts }, + {L"00000425", L"1252", L"775", L"10029", L"Estonian", L"70", etEEPages, etEEErrorEntries, etEEStrings, LatinFonts, etEELayouts }, #endif #ifdef LANGUAGE_FO_FO - {L"00000438", L"1252", L"850", L"10079", L"Faeroese", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, foFOLayouts }, + {L"00000438", L"1252", L"850", L"10079", L"Faeroese", L"81", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, foFOLayouts }, #endif #ifdef LANGUAGE_FA_IR - {L"00000429", L"1256", L"720", L"10004", L"Farsi", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, faIRLayouts }, + {L"00000429", L"1256", L"720", L"10004", L"Farsi", L"116", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, faIRLayouts }, #endif #ifdef LANGUAGE_FI_FI - {L"0000040B", L"1252", L"850", L"10000", L"Finnish", L"358", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, fiFILayouts }, + {L"0000040B", L"1252", L"850", L"10000", L"Finnish", L"77", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, fiFILayouts }, #endif #ifdef LANGUAGE_FR_CA - {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", L"107", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCALayouts }, + {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", L"39", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCALayouts }, #endif #ifdef LANGUAGE_FR_FR - {L"0000040C", L"1252", L"850", L"10000", L"French (France)", L"33", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frFRLayouts }, + {L"0000040C", L"1252", L"850", L"10000", L"French (France)", L"84", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frFRLayouts }, #endif #ifdef LANGUAGE_FR_BE - {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", L"32", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frBELayouts }, + {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", L"21", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frBELayouts }, #endif #ifdef LANGUAGE_FR_CH - {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", L"41", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCHLayouts }, + {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", L"223", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCHLayouts }, #endif #ifdef LANGUAGE_FR_LU - {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", L"352", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frLULayouts }, + {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", L"147", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frLULayouts }, #endif #ifdef LANGUAGE_FR_MC - {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", L"1", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frMCLayouts }, + {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", L"158", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frMCLayouts }, #endif #ifdef LANGUAGE_GL_ES - {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", L"34", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, glESLayouts }, + {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, glESLayouts }, #endif #ifdef LANGUAGE_KA_GE - {L"00000437", L"0", L"1", L"2", L"Georgian", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kaGELayouts }, + {L"00000437", L"0", L"1", L"2", L"Georgian", L"88", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kaGELayouts }, #endif #ifdef LANGUAGE_DE_DE {L"00000407", L"1252", L"850", L"10000", L"German (Germany)", L"94", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deDELayouts }, #endif #ifdef LANGUAGE_DE_CH - {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", L"41", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deCHLayouts }, + {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", L"223", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deCHLayouts }, #endif #ifdef LANGUAGE_DE_AT - {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", L"43", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deATLayouts }, + {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", L"14", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deATLayouts }, #endif #ifdef LANGUAGE_DE_LU - {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", L"352", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLULayouts }, + {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", L"147", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLULayouts }, #endif #ifdef LANGUAGE_DE_LI - {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", L"423", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLILayouts }, + {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", L"145", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLILayouts }, #endif #ifdef LANGUAGE_EL_GR - {L"00000408", L"1253", L"737", L"10006", L"Greek", L"30", elGRPages, elGRErrorEntries, elGRStrings, GreekFonts, elGRLayouts }, + {L"00000408", L"1253", L"737", L"10006", L"Greek", L"98", elGRPages, elGRErrorEntries, elGRStrings, GreekFonts, elGRLayouts }, #endif #ifdef LANGUAGE_GU_IN - {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, guINLayouts }, + {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, guINLayouts }, #endif #ifdef LANGUAGE_HE_IL - {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"1", heILPages, heILErrorEntries, heILStrings, HebrewFonts, heILLayouts }, + {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"117", heILPages, heILErrorEntries, heILStrings, HebrewFonts, heILLayouts }, #endif #ifdef LANGUAGE_HI_IN - {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hiINLayouts }, + {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hiINLayouts }, #endif #ifdef LANGUAGE_HU_HU - {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", L"36", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, huHULayouts }, + {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", L"109", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, huHULayouts }, #endif #ifdef LANGUAGE_IS_IS - {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", L"354", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, isISLayouts }, + {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", L"110", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, isISLayouts }, #endif #ifdef LANGUAGE_ID_ID - {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"62", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, + {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"111", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, #endif #ifdef LANGUAGE_IT_IT - {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"39", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, + {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"118", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, #endif #ifdef LANGUAGE_IT_CH - {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"41", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, + {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"223", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, #endif #ifdef LANGUAGE_JA_JP - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", jaJPPages, jaJPErrorEntries, jaJPStrings, CJKFonts, jaJPLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", jaJPPages, jaJPErrorEntries, jaJPStrings, CJKFonts, jaJPLayouts }, #endif #ifdef LANGUAGE_KN_IN - {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, + {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, #endif #ifdef LANGUAGE_KK_KZ - {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"705", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts }, + {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"137", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts }, #endif #ifdef LANGUAGE_KOK_IN - {L"00000457", L"0", L"437", L"2", L"Konkani", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, + {L"00000457", L"0", L"437", L"2", L"Konkani", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, #endif #ifdef LANGUAGE_KO_KR - {L"00000412", L"949", L"949", L"10003", L"Korean", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, koKRLayouts }, + {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, koKRLayouts }, #endif #ifdef LANGUAGE_KY_KG - {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts }, + {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"130", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts }, #endif #ifdef LANGUAGE_LV_LV - {L"00000426", L"1257", L"775", L"10029", L"Latvian", L"371", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, lvLVLayouts }, + {L"00000426", L"1257", L"775", L"10029", L"Latvian", L"140", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, lvLVLayouts }, #endif #ifdef LANGUAGE_LT_LT - {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", L"370", ltLTPages, ltLTErrorEntries, ltLTStrings, LatinFonts, ltLTLayouts }, + {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", L"141", ltLTPages, ltLTErrorEntries, ltLTStrings, LatinFonts, ltLTLayouts }, #endif #ifdef LANGUAGE_MK_MK - {L"0000042F", L"1251", L"866", L"10007", L"FYRO Macedonian", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mkMKLayouts }, + {L"0000042F", L"1251", L"866", L"10007", L"FYRO Macedonian", L"19618", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mkMKLayouts }, #endif #ifdef LANGUAGE_MS_BN - {L"0000083E", L"1252", L"850", L"10000", L"Malay (Brunei Darussalam)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msBNLayouts }, + {L"0000083E", L"1252", L"850", L"10000", L"Malay (Brunei Darussalam)", L"37", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msBNLayouts }, #endif #ifdef LANGUAGE_MS_MY - {L"0000043E", L"1252", L"850", L"10000", L"Malay (Malaysia)", L"60", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msMYLayouts }, + {L"0000043E", L"1252", L"850", L"10000", L"Malay (Malaysia)", L"167", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msMYLayouts }, #endif #ifdef LANGUAGE_MR_IN - {L"0000044E", L"0", L"1", L"2", L"Marathi", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, mrINLayouts }, + {L"0000044E", L"0", L"1", L"2", L"Marathi", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, mrINLayouts }, #endif #ifdef LANGUAGE_MN_MN - {L"00000450", L"1251", L"866", L"10007", L"Mongolian (Mongolia)", L"976", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mnMNLayouts }, + {L"00000450", L"1251", L"866", L"10007", L"Mongolian (Mongolia)", L"154", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mnMNLayouts }, #endif #ifdef LANGUAGE_NB_NO - {L"00000414", L"1252", L"850", L"10000", L"Norwegian (Bokmal)", L"47", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nbNOLayouts }, + {L"00000414", L"1252", L"850", L"10000", L"Norwegian (Bokmal)", L"177", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nbNOLayouts }, #endif #ifdef LANGUAGE_NN_NO - {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", L"47", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, + {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", L"177", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, #endif #ifdef LANGUAGE_PL_PL - {L"00000415", L"1250", L"852", L"10029", L"Polish", L"48", plPLPages, plPLErrorEntries, plPLStrings, LatinFonts, plPLLayouts }, + {L"00000415", L"1250", L"852", L"10029", L"Polish", L"191", plPLPages, plPLErrorEntries, plPLStrings, LatinFonts, plPLLayouts }, #endif #ifdef LANGUAGE_PT_PT - {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", L"351", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptPTLayouts }, + {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", L"193", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptPTLayouts }, #endif #ifdef LANGUAGE_PT_BR - {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", L"55", ptBRPages, ptBRErrorEntries, ptBRStrings, LatinFonts, ptBRLayouts }, + {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", L"32", ptBRPages, ptBRErrorEntries, ptBRStrings, LatinFonts, ptBRLayouts }, #endif #ifdef LANGUAGE_PA_IN - {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, paINLayouts }, + {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, paINLayouts }, #endif #ifdef LANGUAGE_RO_RO - {L"00000418", L"1250", L"852", L"10029", L"Romanian", L"40", roROPages, roROErrorEntries, roROStrings, LatinFonts, roROLayouts }, + {L"00000418", L"1250", L"852", L"10029", L"Romanian", L"200", roROPages, roROErrorEntries, roROStrings, LatinFonts, roROLayouts }, #endif #ifdef LANGUAGE_RM_CH - {L"00000417", L"1252", L"850", L"10000", L"Romansh", L"41", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, rmCHLayouts }, + {L"00000417", L"1252", L"850", L"10000", L"Romansh", L"223", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, rmCHLayouts }, #endif #ifdef LANGUAGE_RU_RU - {L"00000419", L"1251", L"866", L"10007", L"Russian", L"7", ruRUPages, ruRUErrorEntries, ruRUStrings, CyrillicFonts, ruRULayouts }, + {L"00000419", L"1251", L"866", L"10007", L"Russian", L"203", ruRUPages, ruRUErrorEntries, ruRUStrings, CyrillicFonts, ruRULayouts }, #endif #ifdef LANGUAGE_SA_IN - {L"0000044F", L"0", L"1", L"2", L"Sanskrit", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, saINLayouts }, + {L"0000044F", L"0", L"1", L"2", L"Sanskrit", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, saINLayouts }, #endif #ifdef LANGUAGE_SR_SP - {L"00000C1A", L"1251", L"855", L"10007", L"Serbian (Cyrillic)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, srSPLayouts }, + {L"00000C1A", L"1251", L"855", L"10007", L"Serbian (Cyrillic)", L"271", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, srSPLayouts }, #endif #ifdef LANGUAGE_SR_SP - {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, srSPLayouts }, + {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", L"271", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, srSPLayouts }, #endif #ifdef LANGUAGE_SK_SK - {L"0000041B", L"1250", L"852", L"10029", L"Slovak", L"421", skSKPages, skSKErrorEntries, skSKStrings, LatinFonts, skSKLayouts }, + {L"0000041B", L"1250", L"852", L"10029", L"Slovak", L"143", skSKPages, skSKErrorEntries, skSKStrings, LatinFonts, skSKLayouts }, #endif #ifdef LANGUAGE_SL_SI - {L"00000424", L"1250", L"852", L"10029", L"Slovenian", L"386", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, slSILayouts }, + {L"00000424", L"1250", L"852", L"10029", L"Slovenian", L"212", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, slSILayouts }, #endif #ifdef LANGUAGE_ES_ES - {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, + {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", L"217", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, #endif #ifdef LANGUAGE_ES_MX - {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", L"52", esESPages, esESErrorEntries, esESStrings, LatinFonts, esMXLayouts }, + {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", L"166", esESPages, esESErrorEntries, esESStrings, LatinFonts, esMXLayouts }, #endif #ifdef LANGUAGE_ES_ES - {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, + {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", L"217", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, #endif #ifdef LANGUAGE_ES_GT - {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esGTLayouts }, + {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", L"99", esESPages, esESErrorEntries, esESStrings, LatinFonts, esGTLayouts }, #endif #ifdef LANGUAGE_ES_CR - {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCRLayouts }, + {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", L"54", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCRLayouts }, #endif #ifdef LANGUAGE_ES_PA - {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPALayouts }, + {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", L"192", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPALayouts }, #endif #ifdef LANGUAGE_ES_DO - {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", L"110", esESPages, esESErrorEntries, esESStrings, LatinFonts, esDOLayouts }, + {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", L"65", esESPages, esESErrorEntries, esESStrings, LatinFonts, esDOLayouts }, #endif #ifdef LANGUAGE_ES_VE - {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", L"58", esESPages, esESErrorEntries, esESStrings, LatinFonts, esVELayouts }, + {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", L"249", esESPages, esESErrorEntries, esESStrings, LatinFonts, esVELayouts }, #endif #ifdef LANGUAGE_ES_CO - {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", L"57", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCOLayouts }, + {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", L"51", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCOLayouts }, #endif #ifdef LANGUAGE_ES_PE - {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPELayouts }, + {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", L"187", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPELayouts }, #endif #ifdef LANGUAGE_ES_AR - {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", L"54", esESPages, esESErrorEntries, esESStrings, LatinFonts, esARLayouts }, + {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", L"11", esESPages, esESErrorEntries, esESStrings, LatinFonts, esARLayouts }, #endif #ifdef LANGUAGE_ES_EC - {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esECLayouts }, + {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", L"66", esESPages, esESErrorEntries, esESStrings, LatinFonts, esECLayouts }, #endif #ifdef LANGUAGE_ES_CL - {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", L"56", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCLLayouts }, + {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", L"46", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCLLayouts }, #endif #ifdef LANGUAGE_ES_UY - {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esUYLayouts }, + {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", L"246", esESPages, esESErrorEntries, esESStrings, LatinFonts, esUYLayouts }, #endif #ifdef LANGUAGE_ES_PY - {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPYLayouts }, + {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", L"185", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPYLayouts }, #endif #ifdef LANGUAGE_ES_BO - {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esBOLayouts }, + {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", L"26", esESPages, esESErrorEntries, esESStrings, LatinFonts, esBOLayouts }, #endif #ifdef LANGUAGE_ES_SV - {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esSVLayouts }, + {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", L"72", esESPages, esESErrorEntries, esESStrings, LatinFonts, esSVLayouts }, #endif #ifdef LANGUAGE_ES_HN - {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esHNLayouts }, + {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", L"106", esESPages, esESErrorEntries, esESStrings, LatinFonts, esHNLayouts }, #endif #ifdef LANGUAGE_ES_NI - {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esNILayouts }, + {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", L"182", esESPages, esESErrorEntries, esESStrings, LatinFonts, esNILayouts }, #endif #ifdef LANGUAGE_ES_PR - {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPRLayouts }, + {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", L"202", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPRLayouts }, #endif #ifdef LANGUAGE_SW_KE - {L"00000441", L"1252", L"437", L"10000", L"Swahili", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, swKELayouts }, + {L"00000441", L"1252", L"437", L"10000", L"Swahili", L"129", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, swKELayouts }, #endif #ifdef LANGUAGE_SV_SE - {L"0000041D", L"1252", L"850", L"10000", L"Swedish", L"46", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svSELayouts }, + {L"0000041D", L"1252", L"850", L"10000", L"Swedish", L"221", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svSELayouts }, #endif #ifdef LANGUAGE_SV_FI - {L"0000081D", L"1252", L"850", L"10000", L"Swedish (Finland)", L"358", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svFILayouts }, + {L"0000081D", L"1252", L"850", L"10000", L"Swedish (Finland)", L"77", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svFILayouts }, #endif #ifdef LANGUAGE_SYR_SY - {L"0000045A", L"0", L"1", L"2", L"Syriac (Syria)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, syrSYLayouts}, + {L"0000045A", L"0", L"1", L"2", L"Syriac (Syria)", L"222", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, syrSYLayouts}, #endif #ifdef LANGUAGE_TA_IN - {L"00000449", L"0", L"1", L"2", L"Tamil", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, taINLayouts }, + {L"00000449", L"0", L"1", L"2", L"Tamil", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, taINLayouts }, #endif #ifdef LANGUAGE_TT_TA {L"00000444", L"1251", L"866", L"10007", L"Tatar", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, ttTALayouts }, #endif #ifdef LANGUAGE_TE_IN - {L"0000044A", L"0", L"1", L"2", L"Telugu (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, teINLayouts }, + {L"0000044A", L"0", L"1", L"2", L"Telugu (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, teINLayouts }, #endif #ifdef LANGUAGE_TH_TH - {L"0000041E", L"874", L"874", L"10021", L"Thai", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, thTHLayouts }, + {L"0000041E", L"874", L"874", L"10021", L"Thai", L"227", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, thTHLayouts }, #endif #ifdef LANGUAGE_TR_TR - {L"0000041F", L"1254", L"857", L"10081", L"Turkish", L"90", trTRPages, trTRErrorEntries, trTRStrings, LatinFonts, trTRLayouts }, + {L"0000041F", L"1254", L"857", L"10081", L"Turkish", L"235", trTRPages, trTRErrorEntries, trTRStrings, LatinFonts, trTRLayouts }, #endif #ifdef LANGUAGE_UK_UA - {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", L"380", ukUAPages, ukUAErrorEntries, ukUAStrings, CyrillicFonts, ukUALayouts }, + {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", L"241", ukUAPages, ukUAErrorEntries, ukUAStrings, CyrillicFonts, ukUALayouts }, #endif #ifdef LANGUAGE_UR_PK - {L"00000420", L"1256", L"720", L"10004", L"Urdu", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, urPKLayouts }, + {L"00000420", L"1256", L"720", L"10004", L"Urdu", L"190", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, urPKLayouts }, #endif #ifdef LANGUAGE_UZ_UZ - {L"00000443", L"1254", L"857", L"10029", L"Uzbek (Latin)", L"998", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, uzUZLayouts }, + {L"00000443", L"1254", L"857", L"10029", L"Uzbek (Latin)", L"247", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, uzUZLayouts }, #endif #ifdef LANGUAGE_UZ_UZ - {L"00000843", L"1251", L"866", L"10007", L"Uzbek (Cyrillic)", L"998", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, uzUZLayouts }, + {L"00000843", L"1251", L"866", L"10007", L"Uzbek (Cyrillic)", L"247", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, uzUZLayouts }, #endif #ifdef LANGUAGE_VI_VN - {L"0000042A", L"1258", L"1258",L"10000", L"Vietnamese", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, viVNLayouts }, + {L"0000042A", L"1258", L"1258",L"10000", L"Vietnamese", L"251", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, viVNLayouts }, #endif #ifdef LANGUAGE_WA_BE - {L"00000490", L"1252", L"850", L"10000", L"Walon", L"32", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, waBELayouts }, + {L"00000490", L"1252", L"850", L"10000", L"Walon", L"21", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, waBELayouts }, #endif #ifdef LANGUAGE_ZU_ZU {L"00000435", L"1252", L"850", L"10000", L"Zulu", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, zuZULayouts },

1 0

[sginsberg] 69173: - Add some globals WinDbg expected to find when using !sysptes and !vm. Unused but makes the debugger happy
by sginsberg＠svn.reactos.org 10 Sep '15

10 Sep '15

Author: sginsberg Date: Thu Sep 10 19:47:45 2015 New Revision: 69173 URL: http://svn.reactos.org/svn/reactos?rev=69173&view=rev Log: - Add some globals WinDbg expected to find when using !sysptes and !vm. Unused but makes the debugger happy Modified: trunk/reactos/ntoskrnl/mm/ARM3/special.c trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/special.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] Thu Sep 10 19:47:45 2015 @@ -43,6 +43,8 @@ PMMPTE MiSpecialPoolFirstPte; PMMPTE MiSpecialPoolLastPte; +PFN_COUNT MmSpecialPagesInUse; +PFN_COUNT MiSpecialPagesNonPaged; PFN_NUMBER MiSpecialPagesNonPagedMaximum; BOOLEAN MmSpecialPoolCatchOverruns = TRUE; Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Thu Sep 10 19:47:45 2015 @@ -24,6 +24,7 @@ MMPTE MmFirstFreeSystemPte[MaximumPtePoolTypes]; ULONG MmTotalFreeSystemPtes[MaximumPtePoolTypes]; ULONG MmTotalSystemPtes; +ULONG MiNumberOfExtraSystemPdes; /* PRIVATE FUNCTIONS **********************************************************/

1 0

[jimtabor] 69172: [Win32k] - Trap out right button double clicks. See CORE-6754.
by jimtabor＠svn.reactos.org 10 Sep '15

10 Sep '15

Author: jimtabor Date: Thu Sep 10 14:27:14 2015 New Revision: 69172 URL: http://svn.reactos.org/svn/reactos?rev=69172&view=rev Log: [Win32k] - Trap out right button double clicks. See CORE-6754. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Sep 10 14:27:14 2015 @@ -3929,7 +3929,11 @@ case WM_RBUTTONDBLCLK: case WM_RBUTTONDOWN: - if (!(wFlags & TPM_RIGHTBUTTON)) break; + if (!(wFlags & TPM_RIGHTBUTTON)) + { + if ( msg.message == WM_RBUTTONDBLCLK ) fInsideMenuLoop = FALSE; // Must exit or loop forever! + break; + } /* fall through */ case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: @@ -3937,7 +3941,8 @@ /* Else, end menu tracking */ fRemove = MENU_ButtonDown(&mt, pmMouse, wFlags); fInsideMenuLoop = fRemove; - if (msg.message == WM_LBUTTONDBLCLK) fInsideMenuLoop = FALSE; // Must exit or loop forever! + if ( msg.message == WM_LBUTTONDBLCLK || + msg.message == WM_RBUTTONDBLCLK ) fInsideMenuLoop = FALSE; // Must exit or loop forever! break; case WM_RBUTTONUP:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs