Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[pschweitzer] 31538: Updated NTFS header : - Separate a field into two distinct fields. One will be used when mounting volume - Added comment to unusedX fields that are used anyway when mounting volume

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Jan 1 22:26:26 2008 New Revision: 31538 URL: http://svn.reactos.org/svn/reactos?rev=31538&view=rev Log: Updated NTFS header : - Separate a field into two distinct fields. One will be used when mounting volume - Added comment to unusedX fields that are used anyway when mounting volume Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Tue Jan 1 22:26:26 2008 @@ -24,12 +24,13 @@ { USHORT BytesPerSector; // 0x0B UCHAR SectorsPerCluster; // 0x0D - UCHAR Unused0[7]; // 0x0E + UCHAR Unused0[7]; // 0x0E, checked when volume is mounted UCHAR MediaId; // 0x15 UCHAR Unused1[2]; // 0x16 USHORT SectorsPerTrack; // 0x18 USHORT Heads; // 0x1A - UCHAR Unused2[8]; // 0x1C + UCHAR Unused2[4]; // 0x1C + UCHAR Unused3[4]; // 0x20, checked when volume is mounted } BIOS_PARAMETERS_BLOCK, *PBIOS_PARAMETERS_BLOCK; typedef struct _EXTENDED_BIOS_PARAMETERS_BLOCK @@ -39,9 +40,9 @@ ULONGLONG MftLocation; // 0x30 ULONGLONG MftMirrLocation; // 0x38 CHAR ClustersPerMftRecord; // 0x40 - UCHAR Unused3[3]; // 0x41 + UCHAR Unused4[3]; // 0x41 CHAR ClustersPerIndexRecord; // 0x44 - UCHAR Unused4[3]; // 0x45 + UCHAR Unused5[3]; // 0x45 ULONGLONG SerialNumber; // 0x48 UCHAR Checksum[4]; // 0x50 } EXTENDED_BIOS_PARAMETERS_BLOCK, *PEXTENDED_BIOS_PARAMETERS_BLOCK;

16 years, 8 months

[greatlrd] 31537: adding documentations for DxEngGetDCState

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jan 1 22:15:22 2008 New Revision: 31537 URL: http://svn.reactos.org/svn/reactos?rev=31537&view=rev Log: adding documentations for DxEngGetDCState Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Tue Jan 1 22:15:22 2008 @@ -399,14 +399,31 @@ return FALSE; } -/************************************************************************/ -/* DxEngGetDCState */ -/************************************************************************/ -/* Note type 0 = N/A */ -/* Note type 1 = Is DC full screen */ -/* Note type 2 = Get Complexity of visiable region. */ -/* Note type 3 = Get Driver hdev, which is pPDev. */ - + + +/*++ +* @name DxEngGetDCState +* @implemented +* +* The function DxEngGetDCState getting sate +* if it DC full screen / Get Complexity of visiable region or +* Get Driver hdev, which is pPDev +* +* @param HDC hdc +* The hdc +* +* @param DWORD type +* value 1 = Is DC full screen +* value 2 = Get Complexity of visiable region. +* value 3 = Get Driver hdev, which is pPDev. +* +* @return +* return one of the type value +* +* @remarks. +* we do not have type 2 implement yet +* +*--*/ DWORD DxEngGetDCState(HDC hDC, DWORD type) @@ -425,12 +442,14 @@ UNIMPLEMENTED; break; case 3: - { // Return HDEV of this DC. + { + /* Return HDEV of this DC. */ retVal = (DWORD) pDC->pPDev; break; } default: - UNIMPLEMENTED; + /* if it does not found a type it wanted we return 0 as value */ + DPRINT1("warning did not found type %d\n",type); break; } DC_UnlockDc(pDC);

16 years, 8 months

[pschweitzer] 31536: [FORMATTING] Fix indentation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Jan 1 21:55:52 2008 New Revision: 31536 URL: http://svn.reactos.org/svn/reactos?rev=31536&view=rev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Tue Jan 1 21:55:52 2008 @@ -54,64 +54,64 @@ Size = sizeof(DISK_GEOMETRY); Status = NtfsDeviceIoControl(DeviceToMount, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size, - TRUE); - if (!NT_SUCCESS(Status)) + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + &Size, + TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtfsDeviceIoControl() failed (Status %lx)\n", Status); + return(Status); + } + + if (DiskGeometry.MediaType == FixedMedia) + { + /* We have found a hard disk */ + Size = sizeof(PARTITION_INFORMATION); + Status = NtfsDeviceIoControl(DeviceToMount, + IOCTL_DISK_GET_PARTITION_INFO, + NULL, + 0, + &PartitionInfo, + &Size, + TRUE); + if (!NT_SUCCESS(Status)) { DPRINT1("NtfsDeviceIoControl() failed (Status %lx)\n", Status); return(Status); } - if (DiskGeometry.MediaType == FixedMedia) + if (PartitionInfo.PartitionType != PARTITION_IFS) { - /* We have found a hard disk */ - Size = sizeof(PARTITION_INFORMATION); - Status = NtfsDeviceIoControl(DeviceToMount, - IOCTL_DISK_GET_PARTITION_INFO, - NULL, - 0, - &PartitionInfo, - &Size, - TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtfsDeviceIoControl() failed (Status %lx)\n", Status); - return(Status); - } - - if (PartitionInfo.PartitionType != PARTITION_IFS) - { - DPRINT1("Invalid partition type\n"); - return(STATUS_UNRECOGNIZED_VOLUME); - } + DPRINT1("Invalid partition type\n"); + return(STATUS_UNRECOGNIZED_VOLUME); } + } DPRINT1("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); BootSector = ExAllocatePool(NonPagedPool, - DiskGeometry.BytesPerSector); + DiskGeometry.BytesPerSector); if (BootSector == NULL) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + Status = NtfsReadSectors (DeviceToMount, + 0, + 1, + DiskGeometry.BytesPerSector, + (PVOID)BootSector, + TRUE); + if (NT_SUCCESS(Status)) + { + DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OEMID); + if (RtlCompareMemory(BootSector->OEMID, "NTFS ", 8) != 8) { - return(STATUS_INSUFFICIENT_RESOURCES); + Status = STATUS_UNRECOGNIZED_VOLUME; } - - Status = NtfsReadSectors (DeviceToMount, - 0, - 1, - DiskGeometry.BytesPerSector, - (PVOID)BootSector, - TRUE); - if (NT_SUCCESS(Status)) - { - DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OEMID); - if (RtlCompareMemory(BootSector->OEMID, "NTFS ", 8) != 8) - { - Status = STATUS_UNRECOGNIZED_VOLUME; - } - } + } ExFreePool(BootSector); @@ -137,37 +137,37 @@ Size = sizeof(DISK_GEOMETRY); Status = NtfsDeviceIoControl(DeviceObject, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size, - TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtfsDeviceIoControl() failed (Status %lx)\n", Status); - return(Status); - } + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + &Size, + TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsDeviceIoControl() failed (Status %lx)\n", Status); + return(Status); + } DPRINT("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); BootSector = ExAllocatePool(NonPagedPool, - DiskGeometry.BytesPerSector); + DiskGeometry.BytesPerSector); if (BootSector == NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } + { + return(STATUS_INSUFFICIENT_RESOURCES); + } Status = NtfsReadSectors(DeviceObject, - 0, /* Partition boot sector */ - 1, - DiskGeometry.BytesPerSector, - (PVOID)BootSector, - TRUE); - if (!NT_SUCCESS(Status)) - { - ExFreePool(BootSector); - return Status; - } + 0, /* Partition boot sector */ + 1, + DiskGeometry.BytesPerSector, + (PVOID)BootSector, + TRUE); + if (!NT_SUCCESS(Status)) + { + ExFreePool(BootSector); + return Status; + } /* Read data from the bootsector */ NtfsInfo->BytesPerSector = BootSector->BPB.BytesPerSector; @@ -202,39 +202,39 @@ ExFreePool(BootSector); MftRecord = ExAllocatePool(NonPagedPool, - NtfsInfo->BytesPerFileRecord); + NtfsInfo->BytesPerFileRecord); if (MftRecord == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } + { + return STATUS_INSUFFICIENT_RESOURCES; + } Status = NtfsReadSectors(DeviceObject, - NtfsInfo->MftStart.u.LowPart * NtfsInfo->SectorsPerCluster, - NtfsInfo->BytesPerFileRecord / NtfsInfo->BytesPerSector, - NtfsInfo->BytesPerSector, - (PVOID)MftRecord, - TRUE); - if (!NT_SUCCESS(Status)) - { - ExFreePool (MftRecord); - return Status; - } + NtfsInfo->MftStart.u.LowPart * NtfsInfo->SectorsPerCluster, + NtfsInfo->BytesPerFileRecord / NtfsInfo->BytesPerSector, + NtfsInfo->BytesPerSector, + (PVOID)MftRecord, + TRUE); + if (!NT_SUCCESS(Status)) + { + ExFreePool (MftRecord); + return Status; + } VolumeRecord = ExAllocatePool(NonPagedPool, NtfsInfo->BytesPerFileRecord); if (VolumeRecord == NULL) - { - ExFreePool (MftRecord); - return STATUS_INSUFFICIENT_RESOURCES; - } + { + ExFreePool (MftRecord); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Read Volume File (MFT index 3) */ DeviceExt->StorageDevice = DeviceObject; Status = ReadFileRecord(DeviceExt, 3, VolumeRecord, MftRecord); if (!NT_SUCCESS(Status)) - { - ExFreePool (MftRecord); - return Status; - } + { + ExFreePool (MftRecord); + return Status; + } #ifndef NDEBUG DbgPrint("\n\n"); @@ -253,32 +253,32 @@ DPRINT("Attribute %p\n", Attribute); if (Attribute != NULL && ((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength != 0) - { - DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); - NtfsInfo->VolumeLabelLength = - min (((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength, MAXIMUM_VOLUME_LABEL_LENGTH); - RtlCopyMemory (NtfsInfo->VolumeLabel, - (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset), - NtfsInfo->VolumeLabelLength); - } + { + DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); + NtfsInfo->VolumeLabelLength = + min (((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength, MAXIMUM_VOLUME_LABEL_LENGTH); + RtlCopyMemory (NtfsInfo->VolumeLabel, + (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset), + NtfsInfo->VolumeLabelLength); + } else - { - NtfsInfo->VolumeLabelLength = 0; - } + { + NtfsInfo->VolumeLabelLength = 0; + } /* Get volume information */ Attribute = FindAttribute (VolumeRecord, AttributeVolumeInformation, NULL); DPRINT("Attribute %p\n", Attribute); if (Attribute != NULL && ((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength != 0) - { - DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); - VolumeInfo = (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset); - - NtfsInfo->MajorVersion = VolumeInfo->MajorVersion; - NtfsInfo->MinorVersion = VolumeInfo->MinorVersion; - NtfsInfo->Flags = VolumeInfo->Flags; - } + { + DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); + VolumeInfo = (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset); + + NtfsInfo->MajorVersion = VolumeInfo->MajorVersion; + NtfsInfo->MinorVersion = VolumeInfo->MinorVersion; + NtfsInfo->Flags = VolumeInfo->Flags; + } ExFreePool (MftRecord); @@ -288,7 +288,7 @@ static NTSTATUS NtfsMountVolume(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { PDEVICE_EXTENSION DeviceExt = NULL; PDEVICE_OBJECT NewDeviceObject = NULL; @@ -302,10 +302,10 @@ DPRINT1("NtfsMountVolume() called\n"); if (DeviceObject != NtfsGlobalData->DeviceObject) - { - Status = STATUS_INVALID_DEVICE_REQUEST; - goto ByeBye; - } + { + Status = STATUS_INVALID_DEVICE_REQUEST; + goto ByeBye; + } Stack = IoGetCurrentIrpStackLocation(Irp); DeviceToMount = Stack->Parameters.MountVolume.DeviceObject; @@ -313,28 +313,28 @@ Status = NtfsHasFileSystem(DeviceToMount); if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } + { + goto ByeBye; + } Status = IoCreateDevice(NtfsGlobalData->DriverObject, - sizeof(DEVICE_EXTENSION), - NULL, - FILE_DEVICE_FILE_SYSTEM, -// FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &NewDeviceObject); + sizeof(DEVICE_EXTENSION), + NULL, + FILE_DEVICE_FILE_SYSTEM, +// FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + &NewDeviceObject); if (!NT_SUCCESS(Status)) goto ByeBye; NewDeviceObject->Flags = NewDeviceObject->Flags | DO_DIRECT_IO; DeviceExt = (PVOID)NewDeviceObject->DeviceExtension; RtlZeroMemory(DeviceExt, - sizeof(DEVICE_EXTENSION)); + sizeof(DEVICE_EXTENSION)); Status = NtfsGetVolumeData(DeviceToMount, - DeviceExt); + DeviceExt); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -348,26 +348,26 @@ NewDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; DeviceExt->StreamFileObject = IoCreateStreamFileObject(NULL, - DeviceExt->StorageDevice); + DeviceExt->StorageDevice); Fcb = NtfsCreateFCB(NULL); if (Fcb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } Ccb = ExAllocatePoolWithTag(NonPagedPool, - sizeof(CCB), - TAG_CCB); + sizeof(CCB), + TAG_CCB); if (Ccb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } RtlZeroMemory(Ccb, - sizeof(CCB)); + sizeof(CCB)); DeviceExt->StreamFileObject->FsContext = Fcb; DeviceExt->StreamFileObject->FsContext2 = Ccb; @@ -388,12 +388,12 @@ // Fcb->Entry.DataLengthL = DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSIZE; #ifdef ROS_USE_CC_AND_FS Status = CcRosInitializeFileCache(DeviceExt->StreamFileObject, - CACHEPAGESIZE(DeviceExt)); + CACHEPAGESIZE(DeviceExt)); if (!NT_SUCCESS (Status)) - { - DbgPrint("CcRosInitializeFileCache() failed (Status %lx)\n", Status); - goto ByeBye; - } + { + DbgPrint("CcRosInitializeFileCache() failed (Status %lx)\n", Status); + goto ByeBye; + } #else CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), @@ -413,24 +413,24 @@ /* Get volume label */ NewDeviceObject->Vpb->VolumeLabelLength = DeviceExt->NtfsInfo.VolumeLabelLength; RtlCopyMemory (NewDeviceObject->Vpb->VolumeLabel, - DeviceExt->NtfsInfo.VolumeLabel, - DeviceExt->NtfsInfo.VolumeLabelLength); + DeviceExt->NtfsInfo.VolumeLabel, + DeviceExt->NtfsInfo.VolumeLabelLength); Status = STATUS_SUCCESS; ByeBye: if (!NT_SUCCESS(Status)) - { - /* Cleanup */ - if (DeviceExt && DeviceExt->StreamFileObject) - ObDereferenceObject(DeviceExt->StreamFileObject); - if (Fcb) - ExFreePool(Fcb); - if (Ccb) - ExFreePool(Ccb); - if (NewDeviceObject) - IoDeleteDevice(NewDeviceObject); - } + { + /* Cleanup */ + if (DeviceExt && DeviceExt->StreamFileObject) + ObDereferenceObject(DeviceExt->StreamFileObject); + if (Fcb) + ExFreePool(Fcb); + if (Ccb) + ExFreePool(Ccb); + if (NewDeviceObject) + IoDeleteDevice(NewDeviceObject); + } DPRINT("NtfsMountVolume() done (Status: %lx)\n", Status); @@ -440,7 +440,7 @@ static NTSTATUS NtfsVerifyVolume(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { DPRINT1("NtfsVerifyVolume() called\n"); @@ -450,7 +450,7 @@ NTSTATUS STDCALL NtfsFileSystemControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { PIO_STACK_LOCATION Stack; NTSTATUS Status; @@ -460,27 +460,27 @@ Stack = IoGetCurrentIrpStackLocation(Irp); switch (Stack->MinorFunction) - { - case IRP_MN_USER_FS_REQUEST: - DPRINT("NTFS: IRP_MN_USER_FS_REQUEST\n"); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - - case IRP_MN_MOUNT_VOLUME: - DPRINT("NTFS: IRP_MN_MOUNT_VOLUME\n"); - Status = NtfsMountVolume(DeviceObject, Irp); - break; - - case IRP_MN_VERIFY_VOLUME: - DPRINT1("NTFS: IRP_MN_VERIFY_VOLUME\n"); - Status = NtfsVerifyVolume(DeviceObject, Irp); - break; - - default: - DPRINT("NTFS FSC: MinorFunction %d\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } + { + case IRP_MN_USER_FS_REQUEST: + DPRINT("NTFS: IRP_MN_USER_FS_REQUEST\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + + case IRP_MN_MOUNT_VOLUME: + DPRINT("NTFS: IRP_MN_MOUNT_VOLUME\n"); + Status = NtfsMountVolume(DeviceObject, Irp); + break; + + case IRP_MN_VERIFY_VOLUME: + DPRINT1("NTFS: IRP_MN_VERIFY_VOLUME\n"); + Status = NtfsVerifyVolume(DeviceObject, Irp); + break; + + default: + DPRINT("NTFS FSC: MinorFunction %d\n", Stack->MinorFunction); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0;

16 years, 8 months

[jimtabor] 31535: Update DxEngGetDCState and fix retun val for HDEV.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jan 1 21:50:42 2008 New Revision: 31535 URL: http://svn.reactos.org/svn/reactos?rev=31535&view=rev Log: Update DxEngGetDCState and fix retun val for HDEV. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Tue Jan 1 21:50:42 2008 @@ -402,10 +402,10 @@ /************************************************************************/ /* DxEngGetDCState */ /************************************************************************/ -/* Note type 0 = ? */ -/* Note type 1 = ? */ -/* Note type 2 = ? */ -/* Note type 3 = Get Driver hdev */ +/* Note type 0 = N/A */ +/* Note type 1 = Is DC full screen */ +/* Note type 2 = Get Complexity of visiable region. */ +/* Note type 3 = Get Driver hdev, which is pPDev. */ DWORD DxEngGetDCState(HDC hDC, @@ -419,15 +419,15 @@ switch (type) { case 1: - UNIMPLEMENTED; - return 0; + retVal = (DWORD) pDC->DC_Flags & DC_FLAG_FULLSCREEN; + break; case 2: UNIMPLEMENTED; - return 0; + break; case 3: - { - PGDIDEVICE GDIDevice = (PGDIDEVICE)pDC->pPDev; - retVal = (DWORD)GDIDevice->hPDev; + { // Return HDEV of this DC. + retVal = (DWORD) pDC->pPDev; + break; } default: UNIMPLEMENTED;

16 years, 8 months

[hpoussin] 31534: Bugcheck if no miniport driver is available See issue #2899 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Jan 1 19:35:21 2008 New Revision: 31534 URL: http://svn.reactos.org/svn/reactos?rev=31534&view=rev Log: Bugcheck if no miniport driver is available See issue #2899 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Jan 1 19:35:21 2008 @@ -16,28 +16,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * DC.C - Device context functions * */ #include <w32k.h> +#include <bugcodes.h> #define NDEBUG #include <debug.h> - -/* ROS Internal. Please deprecate */ -NTHALAPI -BOOLEAN -NTAPI -HalQueryDisplayOwnership( - VOID -); - -#ifndef OBJ_COLORSPACE -#define OBJ_COLORSPACE (14) -#endif static GDIDEVICE PrimarySurface; static KEVENT VideoDriverNeedsPreparation; @@ -740,8 +728,15 @@ { if (! IntPrepareDriverIfNeeded()) { - DPRINT1("Unable to prepare graphics driver, returning NULL ic\n"); - return NULL; + /* Here, we have two possibilities: + * a) return NULL, and hope that the caller + * won't call us in a loop + * b) bugcheck, but caller is unable to + * react on the problem + */ + /*DPRINT1("Unable to prepare graphics driver, returning NULL ic\n"); + return NULL;*/ + KeBugCheck(VIDEO_DRIVER_INIT_FAILURE); } } else @@ -2846,7 +2841,11 @@ return FALSE; } - IntPrepareDriverIfNeeded(); + if (!IntPrepareDriverIfNeeded()) + { + DPRINT1("IntPrepareDriverIfNeeded failed\n"); + return FALSE; + } /* * DriverFileNames may be a list of drivers in REG_SZ_MULTI format,

16 years, 8 months

[dreimer] 31533: Fix typos in cmd. thx to amine for spotting.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 1 15:29:19 2008 New Revision: 31533 URL: http://svn.reactos.org/svn/reactos?rev=31533&view=rev Log: Fix typos in cmd. thx to amine for spotting. Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc Tue Jan 1 15:29:19 2008 @@ -596,7 +596,7 @@ STRING_HELP2, "START Starts a separate window to run a specified program or command.\n\ Executes command.\n\ TIME Displays or sets the system time.\n\ -TIMER Allow the use of ten stopwaches.\n\ +TIMER Allow the use of ten stopwatches.\n\ TITLE Sets the window title for a CMD.EXE session.\n\ TYPE Displays the contents of a text file.\n\ VER Displays the ReactOS version.\n\ Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc Tue Jan 1 15:29:19 2008 @@ -408,21 +408,21 @@ STRING_TIMER_HELP2, "Eltelt: %02d%c%02d%c%02d%c%02d\n" -STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n\ +STRING_TIMER_HELP3, "allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON Stopper bekapcsolása\n\ OFF Stopper kikapcsolása\n\ /S Split time. Return stopwatch split\n\ time without changing its value\n\ /n Stopper azonosító megadása.\n\ - Stopwaches avaliable are 0 to 9\n\ + Stopwatches avaliable are 0 to 9\n\ If it is not specified default is 1\n\ /Fn Format for output\n\ n can be:\n\ 0 milliseconds\n\ 1 hh%cmm%css%cdd\n\n\ if none of ON, OFF or /S is specified the command\n\ -will toggle stopwach state\n\n" +will toggle stopwatch state\n\n" STRING_TYPE_HELP1, "Megjeleníti az állományok tartalmát.\n\n\ TYPE [meghajtó:][elérési_út]állománynév \n\

16 years, 8 months

[dreimer] 31532: Getting closer to what I would call Default Dialogs. Sad but true. It still does not activate skinning.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 1 15:07:06 2008 New Revision: 31532 URL: http://svn.reactos.org/svn/reactos?rev=31532&view=rev Log: Getting closer to what I would call Default Dialogs. Sad but true. It still does not activate skinning. Modified: trunk/rosapps/roscalc/lang/de-DE.rc trunk/rosapps/roscalc/lang/en-US.rc trunk/rosapps/roscalc/lang/es-ES.rc trunk/rosapps/roscalc/lang/it-IT.rc Modified: trunk/rosapps/roscalc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/de-DE.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/de-DE.rc (original) +++ trunk/rosapps/roscalc/lang/de-DE.rc Tue Jan 1 15:07:06 2008 @@ -6,7 +6,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rechner" MENU IDR_MENU_SCIENTIFIC_1 -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, @@ -166,7 +166,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Rechner" MENU IDR_MENU_STANDARD -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -229,10 +229,10 @@ DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOG DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Über ReactOS Rechner" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,105,148,52,16 CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | @@ -248,10 +248,10 @@ WS_VSCROLL END -IDD_DIALOG_STAT DIALOG DISCARDABLE 0, 0, 163, 85 +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistik Box" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP Modified: trunk/rosapps/roscalc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/en-US.rc (original) +++ trunk/rosapps/roscalc/lang/en-US.rc Tue Jan 1 15:07:06 2008 @@ -6,7 +6,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_SCIENTIFIC_1 -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, @@ -166,7 +166,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Calculator" MENU IDR_MENU_STANDARD -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -229,10 +229,10 @@ DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOG DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About ReactOS Calc" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,105,148,52,16 CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | @@ -248,10 +248,10 @@ WS_VSCROLL END -IDD_DIALOG_STAT DIALOG DISCARDABLE 0, 0, 163, 85 +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP Modified: trunk/rosapps/roscalc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/es-ES.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/es-ES.rc (original) +++ trunk/rosapps/roscalc/lang/es-ES.rc Tue Jan 1 15:07:06 2008 @@ -11,7 +11,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_SCIENTIFIC_1 -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, @@ -171,7 +171,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calculadora ReactOS" MENU IDR_MENU_STANDARD -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -234,10 +234,10 @@ DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOG DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Acerca de Calculadora ReactOS" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar",IDOK,105,148,52,16 CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | @@ -253,10 +253,10 @@ WS_VSCROLL END -IDD_DIALOG_STAT DIALOG DISCARDABLE 0, 0, 163, 85 +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP Modified: trunk/rosapps/roscalc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/it-IT.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/it-IT.rc (original) +++ trunk/rosapps/roscalc/lang/it-IT.rc Tue Jan 1 15:07:06 2008 @@ -6,7 +6,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_SCIENTIFIC_1 -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, @@ -166,7 +166,7 @@ STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Calcolatrice ReactOS" MENU IDR_MENU_STANDARD -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -229,10 +229,10 @@ DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOG DISCARDABLE 0, 0, 264, 169 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Informazioni su ReactOS Calc" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,105,148,52,16 CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | @@ -248,10 +248,10 @@ WS_VSCROLL END -IDD_DIALOG_STAT DIALOG DISCARDABLE 0, 0, 163, 85 +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Finestra di statistica" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

16 years, 8 months

[jimtabor] 31531: Merry New Year post!

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jan 1 08:53:10 2008 New Revision: 31531 URL: http://svn.reactos.org/svn/reactos?rev=31531&view=rev Log: Merry New Year post! Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Jan 1 08:53:10 2008 @@ -369,11 +369,11 @@ typedef struct _DC { HGDIOBJ hHmgr; // Handle for this DC object. - PVOID pvEntry; + ULONG Count; ULONG lucExcLock; - ULONG Tid; - - DHPDEV PDev; // GDIDEVICE.PDev + PVOID Tid; + + DHPDEV PDev; // GDIDEVICE.hPDev INT DC_Type; INT DC_Flags; PVOID pPDev; // PGDIDEVICE

16 years, 8 months

[greatlrd] 31530: rename Pdev to hPDev in GDIDEVICE struct fixed bug in DxEngGetDCState

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jan 1 04:08:07 2008 New Revision: 31530 URL: http://svn.reactos.org/svn/reactos?rev=31530&view=rev Log: rename Pdev to hPDev in GDIDEVICE struct fixed bug in DxEngGetDCState Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/icm.c Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/driverobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/driverobj.c Tue Jan 1 04:08:07 2008 @@ -84,7 +84,7 @@ DrvObjUser->pvObj = pvObj; DrvObjUser->pFreeProc = pFreeObjProc; DrvObjUser->hdev = hdev; - DrvObjUser->dhpdev = ((GDIDEVICE*)hdev)->PDev; + DrvObjUser->dhpdev = ((GDIDEVICE*)hdev)->hPDev; /* fill internal object */ ExInitializeFastMutex(&DrvObjInt->Lock); Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Tue Jan 1 04:08:07 2008 @@ -458,7 +458,7 @@ /* Associate the hdev */ SurfObj->hdev = Dev; - SurfObj->dhpdev = Device->PDev; + SurfObj->dhpdev = Device->hPDev; /* Hook up specified functions */ BitmapObj->flHooks = Hooks; Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Jan 1 04:08:07 2008 @@ -62,7 +62,7 @@ PVOID pvGammaRamp; - DHPDEV PDev; + DHPDEV hPDev; DEVMODEW DMW; HSURF FillPatterns[HS_DDI_MAX]; DEVINFO DevInfo; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Tue Jan 1 04:08:07 2008 @@ -402,12 +402,18 @@ /************************************************************************/ /* DxEngGetDCState */ /************************************************************************/ +/* Note type 0 = ? */ +/* Note type 1 = ? */ +/* Note type 2 = ? */ +/* Note type 3 = Get Driver hdev */ + DWORD DxEngGetDCState(HDC hDC, DWORD type) { - PEDD_DIRECTDRAW_GLOBAL pEDDgpl = NULL; PDC pDC = DC_LockDc(hDC); + DWORD retVal = 0; + if (pDC) { switch (type) @@ -421,17 +427,16 @@ case 3: { PGDIDEVICE GDIDevice = (PGDIDEVICE)pDC->pPDev; - pEDDgpl = GDIDevice->pEDDgpl; - DC_UnlockDc(pDC); - return (DWORD)pEDDgpl; + retVal = (DWORD)GDIDevice->hPDev; } default: UNIMPLEMENTED; break; } + DC_UnlockDc(pDC); } - return 0; + return retVal; } /************************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Jan 1 04:08:07 2008 @@ -460,7 +460,7 @@ PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW); if (SetupDevMode(&PrimarySurface.DMW, DisplayNumber)) { - PrimarySurface.PDev = PrimarySurface.DriverFunctions.EnablePDEV( + PrimarySurface.hPDev = PrimarySurface.DriverFunctions.EnablePDEV( &PrimarySurface.DMW, L"", HS_DDI_MAX, @@ -472,7 +472,7 @@ NULL, L"", (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); - DoDefault = (NULL == PrimarySurface.PDev); + DoDefault = (NULL == PrimarySurface.hPDev); if (DoDefault) { DPRINT1("DrvEnablePDev with registry parameters failed\n"); @@ -487,7 +487,7 @@ { RtlZeroMemory(&(PrimarySurface.DMW), sizeof(DEVMODEW)); PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW); - PrimarySurface.PDev = PrimarySurface.DriverFunctions.EnablePDEV( + PrimarySurface.hPDev = PrimarySurface.DriverFunctions.EnablePDEV( &PrimarySurface.DMW, L"", HS_DDI_MAX, @@ -500,7 +500,7 @@ L"", (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); - if (NULL == PrimarySurface.PDev) + if (NULL == PrimarySurface.hPDev) { ObDereferenceObject(PrimarySurface.VideoFileObject); DPRINT1("DrvEnablePDEV with default parameters failed\n"); @@ -532,7 +532,7 @@ /* Complete initialization of the physical device */ PrimarySurface.DriverFunctions.CompletePDEV( - PrimarySurface.PDev, + PrimarySurface.hPDev, (HDEV)&PrimarySurface); DPRINT("calling DRIVER_ReferenceDriver\n"); @@ -635,17 +635,17 @@ DPRINT("calling EnableSurface\n"); /* Enable the drawing surface */ PrimarySurface.Handle = - PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.PDev); + PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.hPDev); if (NULL == PrimarySurface.Handle) { -/* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE);*/ - PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev); +/* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, FALSE);*/ + PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.hPDev); ObDereferenceObject(PrimarySurface.VideoFileObject); DPRINT1("DrvEnableSurface failed\n"); return FALSE; } - PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, TRUE); + PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, TRUE); calledFromUser = UserIsEntered(); //fixme: possibly upgrade a shared lock if (!calledFromUser){ @@ -656,7 +656,7 @@ IntAttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle); - SurfObj->dhpdev = PrimarySurface.PDev; + SurfObj->dhpdev = PrimarySurface.hPDev; SurfSize = SurfObj->sizlBitmap; SurfaceRect.left = SurfaceRect.top = 0; SurfaceRect.right = SurfObj->sizlBitmap.cx; @@ -703,9 +703,9 @@ */ DPRINT("Reseting display\n" ); - PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE); - PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.PDev); - PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev); + PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, FALSE); + PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.hPDev); + PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.hPDev); PrimarySurface.PreparedDriver = FALSE; KeSetEvent(&VideoDriverNeedsPreparation, 1, FALSE); KeResetEvent(&VideoDriverPrepared); @@ -793,12 +793,12 @@ NewDC->DC_Type = DC_TYPE_DIRECT; NewDC->IsIC = CreateAsIC; - NewDC->PDev = PrimarySurface.PDev; + NewDC->PDev = PrimarySurface.hPDev; if(pUMdhpdev) pUMdhpdev = NewDC->PDev; NewDC->pPDev = (PVOID)&PrimarySurface; NewDC->w.hBitmap = PrimarySurface.Handle; - NewDC->w.bitsPerPixel = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cBitsPixel * + NewDC->w.bitsPerPixel = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cBitsPixel * ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cPlanes; DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); @@ -1272,7 +1272,7 @@ if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; sDc_Attr = dcs->pDc_Attr; if(!sDc_Attr) sDc_Attr = &dcs->Dc_Attr; - + dc->w.flags = dcs->w.flags & ~DC_SAVED; dc->w.hFirstBitmap = dcs->w.hFirstBitmap; @@ -2386,7 +2386,7 @@ } Dc_Attr = NewDC->pDc_Attr; if(!Dc_Attr) Dc_Attr = &NewDC->Dc_Attr; - + NewDC->hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. NewDC->w.xformWorld2Wnd.eM11 = 1.0f; NewDC->w.xformWorld2Wnd.eM12 = 0.0f; @@ -2653,7 +2653,7 @@ DC_UnlockDc(dc); if (!Resource) return; KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite( Resource , TRUE); + ExAcquireResourceExclusiveLite( Resource , TRUE); } VOID @@ -3366,7 +3366,7 @@ } while (pPDev != NULL); KeLeaveCriticalRegion(); if (!pPDev) return NULL; - return pGdiDevice->PDev; + return pGdiDevice->hPDev; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c Tue Jan 1 04:08:07 2008 @@ -98,7 +98,7 @@ { int NewValue = i * 256; if (NewValue > 65535) NewValue = 65535; - + Ramp->Red[i] = Ramp->Green[i] = Ramp->Blue[i] = ((WORD)NewValue); } return TRUE; @@ -122,7 +122,7 @@ dc = DC_LockDc(hDC); if (!dc) { - SetLastWin32Error(ERROR_INVALID_HANDLE); + SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } @@ -132,7 +132,7 @@ DC_UnlockDc(dc); SetLastWin32Error(STATUS_NO_MEMORY); return FALSE; - } + } Ret = IntGetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp); @@ -208,7 +208,7 @@ (pGDev->DevInfo.iDitherFormat == BMF_32BPP)) { if (pGDev->DriverFunctions.IcmSetDeviceGammaRamp) - return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->PDev, + return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->hPDev, IGRF_RGB_256WORDS, pGDev->pvGammaRamp); @@ -232,7 +232,7 @@ // PALOBJ_cGetColors check mode flags and update Gamma Correction. // Set the HDEV to pal and go. palGDI->hPDev = hPDev; - Ret = pGDev->DriverFunctions.SetPalette(pGDev->PDev, + Ret = pGDev->DriverFunctions.SetPalette(pGDev->hPDev, palPtr, 0, 0, @@ -270,9 +270,9 @@ if (!pGDev->DriverFunctions.IcmSetDeviceGammaRamp) { // No driver support if (!(pGDev->DevInfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP)) - { // Driver does not support Gamma Ramp, so test to see we + { // Driver does not support Gamma Ramp, so test to see we // have BMF_8BPP only and palette operation support. - if ((pGDev->DevInfo.iDitherFormat != BMF_8BPP) || + if ((pGDev->DevInfo.iDitherFormat != BMF_8BPP) || !(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE; } } @@ -338,7 +338,7 @@ dc = DC_LockDc(hDC); if (!dc) { - SetLastWin32Error(ERROR_INVALID_HANDLE); + SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } @@ -348,7 +348,7 @@ DC_UnlockDc(dc); SetLastWin32Error(STATUS_NO_MEMORY); return FALSE; - } + } _SEH_TRY { ProbeForRead( Ramp,

16 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008