Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbirr] 15700: - Added a missing dereferencing in NtTerminateProcess.
by hbirr＠svn.reactos.com 31 May '05

31 May '05

- Added a missing dereferencing in NtTerminateProcess. - Don't access already freed memory while sending messages to the termination port (in PspExitThread). Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-05-31 14:56:55 UTC (rev 15699) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-05-31 15:01:29 UTC (rev 15700) @@ -266,19 +266,18 @@ } /* Process the Termination Ports */ - TerminationPort = CurrentThread->TerminationPort; - DPRINT("TerminationPort: %p\n", TerminationPort); - while (TerminationPort) { + while ((TerminationPort = CurrentThread->TerminationPort)) { + DPRINT("TerminationPort: %p\n", TerminationPort); + + /* Get the next one */ + CurrentThread->TerminationPort = TerminationPort->Next; + /* Send the LPC Message */ LpcSendTerminationPort(TerminationPort->Port, CurrentThread->CreateTime); /* Free the Port */ ExFreePool(TerminationPort); - - /* Get the next one */ - TerminationPort = TerminationPort->Next; - DPRINT("TerminationPort: %p\n", TerminationPort); } /* Rundown Win32 Structures */ @@ -463,6 +462,7 @@ if(Process->ExitTime.QuadPart != 0) { PsUnlockProcess(Process); + ObDereferenceObject(Process); return STATUS_PROCESS_IS_TERMINATING; }

1 0

[hbirr] 15699: Try always to open a file as named object first.
by hbirr＠svn.reactos.com 31 May '05

31 May '05

Try always to open a file as named object first. This is necessary for the redirection to NUL which is used by the new build system. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-31 14:51:53 UTC (rev 15698) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-31 14:56:55 UTC (rev 15699) @@ -844,44 +844,39 @@ DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n"); } - if (CreateDisposition == FILE_OPEN || - CreateDisposition == FILE_OPEN_IF) - { + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + NULL, + AccessMode, + DesiredAccess, + NULL, + &LocalHandle); - Status = ObOpenObjectByName(ObjectAttributes, - NULL, - NULL, - AccessMode, - DesiredAccess, - NULL, - &LocalHandle); - - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(LocalHandle, + DesiredAccess, + NULL, + AccessMode, + (PVOID*)&DeviceObject, + NULL); + ZwClose(LocalHandle); + if (!NT_SUCCESS(Status)) { - Status = ObReferenceObjectByHandle(LocalHandle, - DesiredAccess, - NULL, - AccessMode, - (PVOID*)&DeviceObject, - NULL); - ZwClose(LocalHandle); - if (!NT_SUCCESS(Status)) - { - return Status; - } - if (BODY_TO_HEADER(DeviceObject)->Type != IoDeviceObjectType) - { - ObDereferenceObject (DeviceObject); - return STATUS_OBJECT_NAME_COLLISION; - } - /* FIXME: wt... */ - FileObject = IoCreateStreamFileObject(NULL, DeviceObject); - /* HACK */ - FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; - DPRINT("%wZ\n", ObjectAttributes->ObjectName); - + return Status; + } + if (BODY_TO_HEADER(DeviceObject)->Type != IoDeviceObjectType) + { ObDereferenceObject (DeviceObject); + return STATUS_OBJECT_NAME_COLLISION; } + /* FIXME: wt... */ + FileObject = IoCreateStreamFileObject(NULL, DeviceObject); + /* HACK */ + FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + DPRINT("%wZ\n", ObjectAttributes->ObjectName); + + ObDereferenceObject (DeviceObject); }

1 0

[hbirr] 15698: Changed the indentation to a more readable format (no other changes).
by hbirr＠svn.reactos.com 31 May '05

31 May '05

Changed the indentation to a more readable format (no other changes). Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-31 14:11:02 UTC (rev 15697) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-31 14:51:53 UTC (rev 15698) @@ -51,9 +51,9 @@ NTSTATUS Status; DPRINT("IopCreateFile(ObjectBody %x, Parent %x, RemainingPath %S)\n", - ObjectBody, - Parent, - RemainingPath); + ObjectBody, + Parent, + RemainingPath); if (NULL == Parent) { @@ -69,16 +69,16 @@ ParentObjectType != IoFileObjectType) { DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", - &BODY_TO_HEADER(Parent)->NameInfo->Name, - BODY_TO_HEADER(Parent)->Type->Name.Buffer, - RemainingPath); + &BODY_TO_HEADER(Parent)->NameInfo->Name, + BODY_TO_HEADER(Parent)->Type->Name.Buffer, + RemainingPath); return(STATUS_UNSUCCESSFUL); } Status = ObReferenceObjectByPointer(Parent, - STANDARD_RIGHTS_REQUIRED, - ParentObjectType, - UserMode); + STANDARD_RIGHTS_REQUIRED, + ParentObjectType, + UserMode); if (!NT_SUCCESS(Status)) { CPRINT("Failed to reference parent object %x\n", Parent); @@ -92,56 +92,55 @@ DPRINT("DeviceObject %x\n", DeviceObject); if (RemainingPath == NULL) - { - FileObject->Flags = FileObject->Flags | FO_DIRECT_DEVICE_OPEN; - FileObject->FileName.Buffer = 0; - FileObject->FileName.Length = FileObject->FileName.MaximumLength = 0; - } + { + FileObject->Flags = FileObject->Flags | FO_DIRECT_DEVICE_OPEN; + FileObject->FileName.Buffer = 0; + FileObject->FileName.Length = FileObject->FileName.MaximumLength = 0; + } else - { - if ((DeviceObject->DeviceType != FILE_DEVICE_FILE_SYSTEM) - && (DeviceObject->DeviceType != FILE_DEVICE_DISK) - && (DeviceObject->DeviceType != FILE_DEVICE_CD_ROM) - && (DeviceObject->DeviceType != FILE_DEVICE_TAPE) - && (DeviceObject->DeviceType != FILE_DEVICE_NETWORK) - && (DeviceObject->DeviceType != FILE_DEVICE_NAMED_PIPE) - && (DeviceObject->DeviceType != FILE_DEVICE_MAILSLOT)) - { - CPRINT("Device was wrong type\n"); - return(STATUS_UNSUCCESSFUL); - } + { + if ((DeviceObject->DeviceType != FILE_DEVICE_FILE_SYSTEM) + && (DeviceObject->DeviceType != FILE_DEVICE_DISK) + && (DeviceObject->DeviceType != FILE_DEVICE_CD_ROM) + && (DeviceObject->DeviceType != FILE_DEVICE_TAPE) + && (DeviceObject->DeviceType != FILE_DEVICE_NETWORK) + && (DeviceObject->DeviceType != FILE_DEVICE_NAMED_PIPE) + && (DeviceObject->DeviceType != FILE_DEVICE_MAILSLOT)) + { + CPRINT("Device was wrong type\n"); + return(STATUS_UNSUCCESSFUL); + } - if (DeviceObject->DeviceType != FILE_DEVICE_NETWORK - && (DeviceObject->DeviceType != FILE_DEVICE_NAMED_PIPE) - && (DeviceObject->DeviceType != FILE_DEVICE_MAILSLOT)) - { - if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) - { - DPRINT("Mount the logical volume\n"); - Status = IoMountVolume(DeviceObject, FALSE); - DPRINT("Status %x\n", Status); - if (!NT_SUCCESS(Status)) - { - CPRINT("Failed to mount logical volume (Status %x)\n", - Status); - return(Status); - } - } - DeviceObject = DeviceObject->Vpb->DeviceObject; - DPRINT("FsDeviceObject %lx\n", DeviceObject); - } - RtlpCreateUnicodeString(&(FileObject->FileName), - RemainingPath, NonPagedPool); - } + if (DeviceObject->DeviceType != FILE_DEVICE_NETWORK + && (DeviceObject->DeviceType != FILE_DEVICE_NAMED_PIPE) + && (DeviceObject->DeviceType != FILE_DEVICE_MAILSLOT)) + { + if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) + { + DPRINT("Mount the logical volume\n"); + Status = IoMountVolume(DeviceObject, FALSE); + DPRINT("Status %x\n", Status); + if (!NT_SUCCESS(Status)) + { + CPRINT("Failed to mount logical volume (Status %x)\n", Status); + return(Status); + } + } + DeviceObject = DeviceObject->Vpb->DeviceObject; + DPRINT("FsDeviceObject %lx\n", DeviceObject); + } + RtlpCreateUnicodeString(&(FileObject->FileName), + RemainingPath, NonPagedPool); + } } else { /* Parent is a file object */ if (RemainingPath == NULL) - { - CPRINT("Device is unnamed\n"); - return STATUS_UNSUCCESSFUL; - } + { + CPRINT("Device is unnamed\n"); + return STATUS_UNSUCCESSFUL; + } DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject; DPRINT("DeviceObject %x\n", DeviceObject); @@ -149,15 +148,15 @@ FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; RtlpCreateUnicodeString(&(FileObject->FileName), - RemainingPath, NonPagedPool); + RemainingPath, NonPagedPool); } DPRINT("FileObject->FileName %wZ\n", - &FileObject->FileName); + &FileObject->FileName); FileObject->DeviceObject = DeviceObject; DPRINT("FileObject %x DeviceObject %x\n", - FileObject, - DeviceObject); + FileObject, + DeviceObject); FileObject->Vpb = DeviceObject->Vpb; FileObject->Type = IO_TYPE_FILE; @@ -760,9 +759,9 @@ NTSTATUS Status = STATUS_SUCCESS; DPRINT("IoCreateFile(FileHandle %x, DesiredAccess %x, " - "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", - FileHandle,DesiredAccess,ObjectAttributes, - ObjectAttributes->ObjectName->Buffer); + "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", + FileHandle,DesiredAccess,ObjectAttributes, + ObjectAttributes->ObjectName->Buffer); ASSERT_IRQL(PASSIVE_LEVEL); @@ -850,38 +849,38 @@ { Status = ObOpenObjectByName(ObjectAttributes, - NULL, - NULL, - AccessMode, - DesiredAccess, - NULL, - &LocalHandle); + NULL, + NULL, + AccessMode, + DesiredAccess, + NULL, + &LocalHandle); if (NT_SUCCESS(Status)) { Status = ObReferenceObjectByHandle(LocalHandle, - DesiredAccess, - NULL, - AccessMode, - (PVOID*)&DeviceObject, - NULL); + DesiredAccess, + NULL, + AccessMode, + (PVOID*)&DeviceObject, + NULL); ZwClose(LocalHandle); - if (!NT_SUCCESS(Status)) - { - return Status; - } + if (!NT_SUCCESS(Status)) + { + return Status; + } if (BODY_TO_HEADER(DeviceObject)->Type != IoDeviceObjectType) - { - ObDereferenceObject (DeviceObject); - return STATUS_OBJECT_NAME_COLLISION; - } + { + ObDereferenceObject (DeviceObject); + return STATUS_OBJECT_NAME_COLLISION; + } /* FIXME: wt... */ FileObject = IoCreateStreamFileObject(NULL, DeviceObject); /* HACK */ FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; DPRINT("%wZ\n", ObjectAttributes->ObjectName); - ObDereferenceObject (DeviceObject); + ObDereferenceObject (DeviceObject); } } @@ -889,43 +888,43 @@ if (FileObject == NULL) { Status = ObCreateObject(AccessMode, - IoFileObjectType, - ObjectAttributes, - AccessMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); + IoFileObjectType, + ObjectAttributes, + AccessMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); if (!NT_SUCCESS(Status)) { - DPRINT("ObCreateObject() failed! (Status %lx)\n", Status); - return Status; + DPRINT("ObCreateObject() failed! (Status %lx)\n", Status); + return Status; } } RtlMapGenericMask(&DesiredAccess, - &BODY_TO_HEADER(FileObject)->Type->TypeInfo.GenericMapping); + &BODY_TO_HEADER(FileObject)->Type->TypeInfo.GenericMapping); Status = ObInsertObject ((PVOID)FileObject, - NULL, - DesiredAccess, - 0, - NULL, - &LocalHandle); + NULL, + DesiredAccess, + 0, + NULL, + &LocalHandle); if (!NT_SUCCESS(Status)) { - DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); - ObDereferenceObject (FileObject); - return Status; + DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); + ObDereferenceObject (FileObject); + return Status; } if (CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) { - FileObject->Flags |= (FO_ALERTABLE_IO | FO_SYNCHRONOUS_IO); + FileObject->Flags |= (FO_ALERTABLE_IO | FO_SYNCHRONOUS_IO); } if (CreateOptions & FILE_SYNCHRONOUS_IO_NONALERT) { - FileObject->Flags |= FO_SYNCHRONOUS_IO; + FileObject->Flags |= FO_SYNCHRONOUS_IO; } if (CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) @@ -949,8 +948,8 @@ Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, FALSE); if (Irp == NULL) { - ZwClose(LocalHandle); - return STATUS_UNSUCCESSFUL; + ZwClose(LocalHandle); + return STATUS_UNSUCCESSFUL; } //trigger FileObject/Event dereferencing @@ -976,34 +975,34 @@ switch (CreateFileType) { - default: - case CreateFileTypeNone: - StackLoc->MajorFunction = IRP_MJ_CREATE; - StackLoc->Parameters.Create.SecurityContext = &SecurityContext; - StackLoc->Parameters.Create.Options = (CreateOptions & FILE_VALID_OPTION_FLAGS); - StackLoc->Parameters.Create.Options |= (CreateDisposition << 24); - StackLoc->Parameters.Create.FileAttributes = (USHORT)FileAttributes; - StackLoc->Parameters.Create.ShareAccess = (USHORT)ShareAccess; - StackLoc->Parameters.Create.EaLength = SystemEaBuffer != NULL ? EaLength : 0; - break; + default: + case CreateFileTypeNone: + StackLoc->MajorFunction = IRP_MJ_CREATE; + StackLoc->Parameters.Create.SecurityContext = &SecurityContext; + StackLoc->Parameters.Create.Options = (CreateOptions & FILE_VALID_OPTION_FLAGS); + StackLoc->Parameters.Create.Options |= (CreateDisposition << 24); + StackLoc->Parameters.Create.FileAttributes = (USHORT)FileAttributes; + StackLoc->Parameters.Create.ShareAccess = (USHORT)ShareAccess; + StackLoc->Parameters.Create.EaLength = SystemEaBuffer != NULL ? EaLength : 0; + break; - case CreateFileTypeNamedPipe: - StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; - StackLoc->Parameters.CreatePipe.SecurityContext = &SecurityContext; - StackLoc->Parameters.CreatePipe.Options = (CreateOptions & FILE_VALID_OPTION_FLAGS); - StackLoc->Parameters.CreatePipe.Options |= (CreateDisposition << 24); - StackLoc->Parameters.CreatePipe.ShareAccess = (USHORT)ShareAccess; - StackLoc->Parameters.CreatePipe.Parameters = ExtraCreateParameters; - break; + case CreateFileTypeNamedPipe: + StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; + StackLoc->Parameters.CreatePipe.SecurityContext = &SecurityContext; + StackLoc->Parameters.CreatePipe.Options = (CreateOptions & FILE_VALID_OPTION_FLAGS); + StackLoc->Parameters.CreatePipe.Options |= (CreateDisposition << 24); + StackLoc->Parameters.CreatePipe.ShareAccess = (USHORT)ShareAccess; + StackLoc->Parameters.CreatePipe.Parameters = ExtraCreateParameters; + break; - case CreateFileTypeMailslot: - StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; - StackLoc->Parameters.CreateMailslot.SecurityContext = &SecurityContext; - StackLoc->Parameters.CreateMailslot.Options = (CreateOptions & FILE_VALID_OPTION_FLAGS); - StackLoc->Parameters.CreateMailslot.Options |= (CreateDisposition << 24); - StackLoc->Parameters.CreateMailslot.ShareAccess = (USHORT)ShareAccess; - StackLoc->Parameters.CreateMailslot.Parameters = ExtraCreateParameters; - break; + case CreateFileTypeMailslot: + StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; + StackLoc->Parameters.CreateMailslot.SecurityContext = &SecurityContext; + StackLoc->Parameters.CreateMailslot.Options = (CreateOptions & FILE_VALID_OPTION_FLAGS); + StackLoc->Parameters.CreateMailslot.Options |= (CreateDisposition << 24); + StackLoc->Parameters.CreateMailslot.ShareAccess = (USHORT)ShareAccess; + StackLoc->Parameters.CreateMailslot.Parameters = ExtraCreateParameters; + break; } /* @@ -1017,33 +1016,33 @@ if (Status == STATUS_PENDING) { - KeWaitForSingleObject(&FileObject->Event, - Executive, - AccessMode, - FALSE, - NULL); - Status = LocalIoStatusBlock.Status; + KeWaitForSingleObject(&FileObject->Event, + Executive, + AccessMode, + FALSE, + NULL); + Status = LocalIoStatusBlock.Status; } if (!NT_SUCCESS(Status)) { - DPRINT("Failing create request with status %x\n", Status); - FileObject->DeviceObject = NULL; - FileObject->Vpb = NULL; + DPRINT("Failing create request with status %x\n", Status); + FileObject->DeviceObject = NULL; + FileObject->Vpb = NULL; - ZwClose(LocalHandle); + ZwClose(LocalHandle); } else { - _SEH_TRY - { - *FileHandle = LocalHandle; - *IoStatusBlock = LocalIoStatusBlock; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + _SEH_TRY + { + *FileHandle = LocalHandle; + *IoStatusBlock = LocalIoStatusBlock; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } /* cleanup EABuffer if captured */ @@ -1875,8 +1874,8 @@ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); if (Irp==NULL) { - ObDereferenceObject(FileObject); - return STATUS_UNSUCCESSFUL; + ObDereferenceObject(FileObject); + return STATUS_UNSUCCESSFUL; } if (Event == NULL) @@ -1906,7 +1905,7 @@ if (WatchTree) { - IoStack->Flags = SL_WATCH_TREE; + IoStack->Flags = SL_WATCH_TREE; } IoStack->Parameters.NotifyDirectory.CompletionFilter = CompletionFilter;

1 0

[greatlrd] 15697: implement strechblt for all 8bpp this code are not optimze.
by greatlrd＠svn.reactos.com 31 May '05

31 May '05

implement strechblt for all 8bpp this code are not optimze. tested with winquake 8bpp to 16/32bpp. /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-31 13:49:41 UTC (rev 15696) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-31 14:11:02 UTC (rev 15697) @@ -617,21 +617,176 @@ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { + int SrcSizeY; + int SrcSizeX; + int DesSizeY; + int DesSizeX; + int sx; + int sy; + int DesX; + int DesY; + int color; + DPRINT("DIB_16BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; + + switch(SourceSurf->iBitmapFormat) { - case BMF_1BPP: + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + { + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } else { + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } + } + } + break; + case BMF_4BPP: - case BMF_8BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + + if (sy > SourceRect->bottom) break; + + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_8BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + case BMF_24BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + case BMF_32BPP: - /* Not implemented yet. */ - return FALSE; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } break; + case BMF_16BPP: return ScaleRectAvg16(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode); _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-31 13:49:41 UTC (rev 15696) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-31 14:11:02 UTC (rev 15697) @@ -478,16 +478,208 @@ return TRUE; } -BOOLEAN -DIB_1BPP_StretchBlt ( - SURFOBJ *DestSurf, SURFOBJ *SourceSurf, - RECTL* DestRect, RECTL *SourceRect, - POINTL* MaskOrigin, POINTL BrushOrigin, - CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, - ULONG Mode) +//NOTE: If you change something here, please do the same in other dibXXbpp.c files! +BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, + RECTL* DestRect, RECTL *SourceRect, + POINTL* MaskOrigin, POINTL BrushOrigin, + CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, + ULONG Mode) { - DbgPrint("DIB_1BPP_StretchBlt: Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); - return FALSE; + int SrcSizeY; + int SrcSizeX; + int DesSizeY; + int DesSizeX; + int sx; + int sy; + int DesX; + int DesY; + int color; + + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; + + switch(SourceSurf->iBitmapFormat) + { + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + + if (sy > SourceRect->bottom) break; + + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, color); + } + } + break; + + case BMF_4BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + + if (sy > SourceRect->bottom) break; + + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_8BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_16BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_24BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + case BMF_32BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + default: + //DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + return FALSE; + } + + return TRUE; } BOOLEAN _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-31 13:49:41 UTC (rev 15696) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-31 14:11:02 UTC (rev 15697) @@ -302,14 +302,211 @@ return TRUE; } +//NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, POINTL* MaskOrigin, POINTL BrushOrigin, CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { - DbgPrint("DIB_24BPP_StretchBlt: Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); - return FALSE; + int SrcSizeY; + int SrcSizeX; + int DesSizeY; + int DesSizeX; + int sx; + int sy; + int DesX; + int DesY; + int color; + + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; + + switch(SourceSurf->iBitmapFormat) + { + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + { + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } else { + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } + } + } + break; + + case BMF_4BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + + if (sy > SourceRect->bottom) break; + + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_8BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_16BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_24BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + } + } + break; + + case BMF_32BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + default: + //DPRINT1("DIB_24BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + return FALSE; + } + + return TRUE; } BOOLEAN _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-31 13:49:41 UTC (rev 15696) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-31 14:11:02 UTC (rev 15697) @@ -79,6 +79,7 @@ switch(BltInfo->SourceSurface->iBitmapFormat) { case BMF_1BPP: + sx = BltInfo->SourcePoint.x; sy = BltInfo->SourcePoint.y; @@ -541,6 +542,7 @@ return TRUE; } + //NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, @@ -548,19 +550,173 @@ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { - DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", + + int SrcSizeY; + int SrcSizeX; + int DesSizeY; + int DesSizeX; + int sx; + int sy; + int DesX; + int DesY; + int color; + + DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + { + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } else { + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } + } + } + break; + case BMF_4BPP: - case BMF_8BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + + if (sy > SourceRect->bottom) break; + + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_8BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + case BMF_16BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + case BMF_24BPP: - /* Not implemented yet. */ - return FALSE; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } break; case BMF_32BPP: _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-31 13:49:41 UTC (rev 15696) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-31 14:11:02 UTC (rev 15697) @@ -356,14 +356,211 @@ return TRUE; } +//NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, POINTL* MaskOrigin, POINTL BrushOrigin, CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { - DbgPrint("DIB_4BPP_StretchBlt: Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); - return FALSE; + int SrcSizeY; + int SrcSizeX; + int DesSizeY; + int DesSizeX; + int sx; + int sy; + int DesX; + int DesY; + int color; + + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; + + switch(SourceSurf->iBitmapFormat) + { + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + { + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } else { + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } + } + } + break; + + case BMF_4BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + + if (sy > SourceRect->bottom) break; + + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, color); + } + } + break; + + case BMF_8BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_16BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + + case BMF_24BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=0; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + for (DesX=0; DesX<DestRect->right; DesX++) + { + if (DesSizeY>SrcSizeY) + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + else + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); [truncated at 1000 lines; 223 more skipped]

1 0

[hpoussin] 15696: Add registry entries for serial mouse driver
by hpoussin＠svn.reactos.com 31 May '05

31 May '05

Add registry entries for serial mouse driver Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-05-31 10:35:22 UTC (rev 15695) +++ trunk/reactos/bootdata/hivesys.inf 2005-05-31 13:49:41 UTC (rev 15696) @@ -811,7 +811,7 @@ ; Serial device driver HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ErrorControl",0x0001000 1,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Group",0x00000000,"Bas e" +HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Group",0x00000000,"Ext ended Base" HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000," system32\drivers\serial.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x000 00001 HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x0000 0001 @@ -870,8 +870,15 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Group",0x00000000,"Po inter Port" HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","ImagePath",0x00020000 ,"system32\drivers\sermouse.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0x 00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0x 00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Type",0x00010001,0x00 000001 +;hard coded values for some serial mice +HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F01","Service",0x0000000,"serm ouse" +HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F01","ClassGUID",0x0000000,"{4 D36E96F-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F08","Service",0x0000000,"serm ouse" +HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F08","ClassGUID",0x0000000,"{4 D36E96F-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F09","Service",0x0000000,"serm ouse" +HKLM,"SYSTEM\CurrentControlSet\Enum\*PNP0F09","ClassGUID",0x0000000,"{4 D36E96F-E325-11CE-BFC1-08002BE10318}" ; TCP/IP driver HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ErrorControl",0x00010001 ,0x00000001

1 0

[hpoussin] 15695: Don't try to detect serial ports at known I/O addresses. They have to be written in registry and enumerated by Root bus enumerator.
by hpoussin＠svn.reactos.com 31 May '05

31 May '05

Don't try to detect serial ports at known I/O addresses. They have to be written in registry and enumerated by Root bus enumerator. Get interrupt informations from AllocatedResourcesTranslated in IRP_MN_START_DEVICE Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/serial.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-05-31 08:02:29 UTC (rev 15694) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-05-31 10:35:22 UTC (rev 15695) @@ -73,157 +73,3 @@ /* FIFO is only functional for 16550A+ */ return Uart16550A; } - -static NTSTATUS -DetectLegacyDevice( - IN PDRIVER_OBJECT DriverObject, - IN ULONG ComPortBase, - IN ULONG Irq, - IN PULONG pComPortNumber OPTIONAL) -{ - ULONG ResourceListSize; - PCM_RESOURCE_LIST ResourceList; - PCM_RESOURCE_LIST ResourceListTranslated; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptorTranslated; - BOOLEAN ConflictDetected; - UART_TYPE UartType; - PDEVICE_OBJECT Pdo = NULL; - PDEVICE_OBJECT Fdo; - NTSTATUS Status; - - /* Create resource list */ - ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); - if (!ResourceList) - return STATUS_INSUFFICIENT_RESOURCES; - ResourceListTranslated = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); - if (!ResourceListTranslated) - { - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Resource header */ - ResourceList->Count = ResourceListTranslated->Count - = 1; - ResourceList->List[0].InterfaceType = ResourceListTranslated->List[0].InterfaceType - = InterfaceTypeUndefined; - ResourceList->List[0].BusNumber = ResourceListTranslated->List[0].BusNumber - = -1; /* unknown */ - ResourceList->List[0].PartialResourceList.Version = ResourceListTranslated->List[0].PartialResourceList.Version - = 1; - ResourceList->List[0].PartialResourceList.Revision = ResourceListTranslated->List[0].PartialResourceList.Revision - = 1; - ResourceList->List[0].PartialResourceList.Count = ResourceListTranslated->List[0].PartialResourceList.Count - = 2; - - /* I/O port */ - ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; - ResourceDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[ 0]; - ResourceDescriptor->Type = ResourceDescriptorTranslated->Type - = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = ResourceDescriptorTranslated->ShareDisposition - = CmResourceShareDriverExclusive; - ResourceDescriptor->Flags = ResourceDescriptorTranslated->Flags - = CM_RESOURCE_PORT_IO; - ResourceDescriptor->u.Port.Start.u.HighPart = ResourceDescriptorTranslated->u.Port.Start.u.HighPart - = 0; - ResourceDescriptor->u.Port.Start.u.LowPart = ResourceDescriptorTranslated->u.Port.Start.u.LowPart - = ComPortBase; - ResourceDescriptor->u.Port.Length = ResourceDescriptorTranslated->u.Port.Length - = 8; - - ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; - ResourceDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[ 1]; - ResourceDescriptor->Type = ResourceDescriptorTranslated->Type - = CmResourceTypeInterrupt; - ResourceDescriptor->ShareDisposition = ResourceDescriptorTranslated->ShareDisposition - = CmResourceShareShared; - ResourceDescriptor->Flags = ResourceDescriptorTranslated->Flags - = CM_RESOURCE_INTERRUPT_LATCHED; - ResourceDescriptor->u.Interrupt.Level = Irq; - ResourceDescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector( - ResourceList->List[0].InterfaceType, - ResourceList->List[0].BusNumber, - ResourceDescriptor->u.Interrupt.Level, - ResourceDescriptor->u.Interrupt.Vector, - (PKIRQL)&ResourceDescriptorTranslated->u.Interrupt.Level, - &ResourceDescriptor->u.Interrupt.Affinity); - ResourceDescriptorTranslated->u.Interrupt.Affinity = ResourceDescriptor->u.Interrupt.Affinity; - - /* Report resource list */ - Status = IoReportResourceForDetection( - DriverObject, ResourceList, ResourceListSize, - NULL, NULL, 0, - &ConflictDetected); - if (Status == STATUS_CONFLICTING_ADDRESSES) - { - DPRINT("Serial: conflict detected for serial port at 0x%lx (Irq %lu)\n", ComPortBase, Irq); - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - ExFreePoolWithTag(ResourceListTranslated, SERIAL_TAG); - return STATUS_DEVICE_NOT_CONNECTED; - } - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - ExFreePoolWithTag(ResourceListTranslated, SERIAL_TAG); - return Status; - } - - /* Test if port exists */ - UartType = SerialDetectUartType((PUCHAR)ComPortBase); - - /* Report device if detected... */ - if (UartType != UartUnknown) - { - Status = IoReportDetectedDevice( - DriverObject, - ResourceList->List[0].InterfaceType, ResourceList->List[0].BusNumber, -1 /* unknown */, - ResourceList, NULL, - TRUE, - &Pdo); - if (NT_SUCCESS(Status)) - { - Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, pComPortNumber, &Fdo); - if (NT_SUCCESS(Status)) - { - Status = SerialPnpStartDevice(Fdo, ResourceList, ResourceListTranslated); - } - } - } - else - { - /* Release resources */ - Status = IoReportResourceForDetection( - DriverObject, NULL, 0, - NULL, NULL, 0, - &ConflictDetected); - Status = STATUS_DEVICE_NOT_CONNECTED; - } - ExFreePoolWithTag(ResourceList, SERIAL_TAG); - ExFreePoolWithTag(ResourceListTranslated, SERIAL_TAG); - return Status; -} - -NTSTATUS -DetectLegacyDevices( - IN PDRIVER_OBJECT DriverObject) -{ - ULONG ComPortBase[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; - ULONG Irq[] = { 4, 3, 4, 3 }; - ULONG ComPortNumber[] = { 1, 2, 3, 4 }; - ULONG i; - NTSTATUS Status; - NTSTATUS ReturnedStatus = STATUS_SUCCESS; - - for (i = 0; i < sizeof(ComPortBase)/sizeof(ComPortBase[0]); i++) - { - Status = DetectLegacyDevice(DriverObject, ComPortBase[i], Irq[i], &ComPortNumber[i]); - if (!NT_SUCCESS(Status) && Status != STATUS_DEVICE_NOT_CONNECTED) - ReturnedStatus = Status; - DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status = 0x%08lx\n", ComPortBase[i], Irq[i], Status); - } - - return ReturnedStatus; -} _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-05-31 08:02:29 UTC (rev 15694) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-05-31 10:35:22 UTC (rev 15695) @@ -163,6 +163,7 @@ for (j = 0; j < ResourceList->List[i].PartialResourceList.Count; j++) { PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[i].PartialResourceList.PartialDescriptors[j]; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptorTranslated = &ResourceListTranslated->List[i].PartialResourceList.PartialDescriptors[ j]; switch (PartialDescriptor->Type) { case CmResourceTypePort: @@ -173,16 +174,14 @@ DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart; break; case CmResourceTypeInterrupt: - if (Dirql != 0) - return STATUS_UNSUCCESSFUL; - Dirql = (KIRQL)ResourceListTranslated->List[i].PartialResourceList.PartialDescri ptors[j].u.Interrupt.Level; - Vector = ResourceListTranslated->List[i].PartialResourceList.PartialDescriptors[j ].u.Interrupt.Vector; - Affinity = PartialDescriptor->u.Interrupt.Affinity; - if (PartialDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) + Dirql = (KIRQL)PartialDescriptorTranslated->u.Interrupt.Level; + Vector = PartialDescriptorTranslated->u.Interrupt.Vector; + Affinity = PartialDescriptorTranslated->u.Interrupt.Affinity; + if (PartialDescriptorTranslated->Flags & CM_RESOURCE_INTERRUPT_LATCHED) InterruptMode = Latched; else InterruptMode = LevelSensitive; - ShareInterrupt = (PartialDescriptor->ShareDisposition == CmResourceShareShared); + ShareInterrupt = (PartialDescriptorTranslated->ShareDisposition == CmResourceShareShared); break; } } _____ Modified: trunk/reactos/drivers/dd/serial/serial.c --- trunk/reactos/drivers/dd/serial/serial.c 2005-05-31 08:02:29 UTC (rev 15694) +++ trunk/reactos/drivers/dd/serial/serial.c 2005-05-31 10:35:22 UTC (rev 15695) @@ -42,5 +42,5 @@ DriverObject->MajorFunction[IRP_MJ_PNP] = SerialPnp; DriverObject->MajorFunction[IRP_MJ_POWER] = SerialPower; - return DetectLegacyDevices(DriverObject); + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-05-31 08:02:29 UTC (rev 15694) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-05-31 10:35:22 UTC (rev 15695) @@ -274,10 +274,6 @@ SerialDetectUartType( IN PUCHAR ComPortBase); -NTSTATUS -DetectLegacyDevices( - IN PDRIVER_OBJECT DriverObject); - /************************************ misc.c */ NTSTATUS

1 0

[jimtabor] 15694: Change Xml from msafd32.dll to msafd.dll.
by jimtabor＠svn.reactos.com 31 May '05

31 May '05

Change Xml from msafd32.dll to msafd.dll. Modified: trunk/reactos/lib/msafd/msafd.xml _____ Modified: trunk/reactos/lib/msafd/msafd.xml --- trunk/reactos/lib/msafd/msafd.xml 2005-05-30 23:22:15 UTC (rev 15693) +++ trunk/reactos/lib/msafd/msafd.xml 2005-05-31 08:02:29 UTC (rev 15694) @@ -1,4 +1,4 @@ -<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd32.dll"> +<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll"> <importlibrary definition="msafd.def" /> <include base="msafd">include</include> <define name="UNICODE" />

1 0

[hbirr] 15693: Build a correct console handle.
by hbirr＠svn.reactos.com 30 May '05

30 May '05

Build a correct console handle. Modified: trunk/reactos/subsys/csrss/api/process.c _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-05-30 23:01:37 UTC (rev 15692) +++ trunk/reactos/subsys/csrss/api/process.c 2005-05-30 23:22:15 UTC (rev 15693) @@ -156,7 +156,7 @@ { if (pProcessData->HandleTable[c]) { - CsrReleaseObject(pProcessData, (HANDLE)((c + 1) << 2)); + CsrReleaseObject(pProcessData, (HANDLE)(((c + 1) << 2)|0x3)); } } RtlFreeHeap(CsrssApiHeap, 0, pProcessData->HandleTable);

1 0

[hpoussin] 15691: Write resource requirements list in the registry, instead of its address
by hpoussin＠svn.reactos.com 30 May '05

30 May '05

Write resource requirements list in the registry, instead of its address Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-30 21:35:07 UTC (rev 15690) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-30 22:55:09 UTC (rev 15691) @@ -886,7 +886,7 @@ &KeyName, 0, REG_RESOURCE_REQUIREMENTS_LIST, - &DeviceNode->ResourceRequirements, + DeviceNode->ResourceRequirements, DeviceNode->ResourceRequirements->ListSize); }

1 0

[gvg] 15690: Work around problem in wrc
by gvg＠svn.reactos.com 30 May '05

30 May '05

Work around problem in wrc Modified: trunk/reactos/lib/comdlg32/comdlg32.xml _____ Modified: trunk/reactos/lib/comdlg32/comdlg32.xml --- trunk/reactos/lib/comdlg32/comdlg32.xml 2005-05-30 20:37:29 UTC (rev 15689) +++ trunk/reactos/lib/comdlg32/comdlg32.xml 2005-05-30 21:35:07 UTC (rev 15690) @@ -1,4 +1,4 @@ -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true" usewrc="false"> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> <include base="ReactOS">include/wine</include>

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