Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[tkreuzer] 45056: Update file from trunk

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jan 13 02:10:36 2010 New Revision: 45056 URL: http://svn.reactos.org/svn/reactos?rev=45056&view=rev Log: Update file from trunk Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/fastio.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Wed Jan 13 02:10:36 2010 @@ -74,9 +74,9 @@ PFAST_IO_DISPATCH FastIoDispatch; PDEVICE_OBJECT Device; BOOLEAN Result = TRUE; - ULONG PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(FileOffset,Length); - - PAGED_CODE(); + ULONG PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(FileOffset, Length); + + PAGED_CODE(); ASSERT(FileObject); ASSERT(FileObject->FsContext); @@ -91,9 +91,9 @@ if (Length > MAXLONGLONG - FileOffset->QuadPart) { - IoStatus->Status = STATUS_INVALID_PARAMETER; - IoStatus->Information = 0; - return FALSE; + IoStatus->Status = STATUS_INVALID_PARAMETER; + IoStatus->Information = 0; + return FALSE; } /* Get the offset and FCB header */ @@ -104,7 +104,7 @@ { /* Use a Resource Acquire */ FsRtlEnterFileSystem(); - CcFastReadWait++; + CcFastReadWait++; ExAcquireResourceSharedLite(FcbHeader->Resource, TRUE); } else @@ -115,9 +115,9 @@ FsRtlEnterFileSystem(); if (!ExAcquireResourceSharedLite(FcbHeader->Resource, FALSE)) { - FsRtlExitFileSystem(); - FsRtlIncrementCcFastReadResourceMiss(); - return FALSE; + FsRtlExitFileSystem(); + FsRtlIncrementCcFastReadResourceMiss(); + return FALSE; } } @@ -126,8 +126,8 @@ (FcbHeader->IsFastIoPossible == FastIoIsNotPossible)) { /* It's not, so fail */ - Result = FALSE; - goto Cleanup; + Result = FALSE; + goto Cleanup; } /* Check if we need to find out if fast I/O is available */ @@ -138,7 +138,7 @@ /* Get the Fast I/O table */ Device = IoGetRelatedDeviceObject(FileObject); - FastIoDispatch = Device->DriverObject->FastIoDispatch; + FastIoDispatch = Device->DriverObject->FastIoDispatch; /* Sanity check */ ASSERT(FastIoDispatch != NULL); @@ -158,7 +158,7 @@ Result = FALSE; goto Cleanup; } - } + } /* Check if we read too much */ if (Offset.QuadPart > FcbHeader->FileSize.QuadPart) @@ -177,15 +177,15 @@ } /* Set this as top-level IRP */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; - - _SEH2_TRY - { - /* Make sure the IO and file size is below 4GB */ + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + _SEH2_TRY + { + /* Make sure the IO and file size is below 4GB */ if (Wait && !(Offset.HighPart | FcbHeader->FileSize.HighPart)) { - /* Call the cache controller */ + /* Call the cache controller */ CcFastCopyRead(FileObject, FileOffset->LowPart, Length, @@ -193,14 +193,14 @@ Buffer, IoStatus); - /* File was accessed */ - FileObject->Flags |= FO_FILE_FAST_IO_READ; + /* File was accessed */ + FileObject->Flags |= FO_FILE_FAST_IO_READ; if (IoStatus->Status != STATUS_END_OF_FILE) { ASSERT(FcbHeader->FileSize.QuadPart >= FileOffset->QuadPart + IoStatus->Information); - } + } } else { @@ -214,30 +214,30 @@ IoStatus); /* File was accessed */ - FileObject->Flags |= FO_FILE_FAST_IO_READ; + FileObject->Flags |= FO_FILE_FAST_IO_READ; if (Result == TRUE) { - ASSERT( (IoStatus->Status == STATUS_END_OF_FILE) || + ASSERT((IoStatus->Status == STATUS_END_OF_FILE) || ((LONGLONG)(FileOffset->QuadPart + IoStatus->Information) <= FcbHeader->FileSize.QuadPart)); - } - } + } + } /* Update the current file offset */ if (Result == TRUE) { - FileObject->CurrentByteOffset.QuadPart += IoStatus->Information; - } - } + FileObject->CurrentByteOffset.QuadPart += IoStatus->Information; + } + } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; - PsGetCurrentThread()->TopLevelIrp = 0; + PsGetCurrentThread()->TopLevelIrp = 0; /* Return to caller */ Cleanup: @@ -248,7 +248,7 @@ if (Result == FALSE) { CcFastReadNotPossible += 1; - } + } return Result; } @@ -306,11 +306,11 @@ /* Nagar p.544. * Check with Cc if we can write and check if the IO > 64kB (WDK macro). */ - if ( (CcCanIWrite(FileObject, Length,Wait, FALSE) == FALSE) || - (CcCopyWriteWontFlush(FileObject,FileOffset,Length) == FALSE) || + if ((CcCanIWrite(FileObject, Length, Wait, FALSE) == FALSE) || + (CcCopyWriteWontFlush(FileObject, FileOffset, Length) == FALSE) || ((FileObject->Flags & FO_WRITE_THROUGH) == TRUE)) { - return FALSE; + return FALSE; } /* No actual read */ @@ -334,12 +334,12 @@ if ((FileOffsetAppend == FALSE) && (Offset.LowPart <= FcbHeader->ValidDataLength.LowPart)) { - ExAcquireResourceSharedLite(FcbHeader->Resource,TRUE); - ResourceAquiredShared = TRUE; + ExAcquireResourceSharedLite(FcbHeader->Resource, TRUE); + ResourceAquiredShared = TRUE; } else { - ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); + ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); } /* Nagar p.544/545. @@ -348,15 +348,15 @@ */ if (FileOffsetAppend == TRUE) { - Offset.LowPart = FcbHeader->FileSize.LowPart; - NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; - b_4GB = (NewSize.LowPart < FcbHeader->FileSize.LowPart); + Offset.LowPart = FcbHeader->FileSize.LowPart; + NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; + b_4GB = (NewSize.LowPart < FcbHeader->FileSize.LowPart); } else { - Offset.LowPart = FileOffset->LowPart; - NewSize.LowPart = FileOffset->LowPart + Length; + Offset.LowPart = FileOffset->LowPart; + NewSize.LowPart = FileOffset->LowPart + Length; b_4GB = (NewSize.LowPart < FileOffset->LowPart) || (FileOffset->HighPart != 0); } @@ -367,10 +367,10 @@ * That we are not extending past the allocated size. * That we are not creating a hole bigger than 8k. * That we are not crossing the 4GB boundary. - */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && - (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && + */ + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && (Offset.LowPart < FcbHeader->ValidDataLength.LowPart + 0x2000) && !b_4GB) { @@ -381,133 +381,133 @@ if (ResourceAquiredShared && (NewSize.LowPart > FcbHeader->ValidDataLength.LowPart + 0x2000)) { - /* Then we need to acquire the resource exclusive */ - ExReleaseResourceLite(FcbHeader->Resource); - ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); + /* Then we need to acquire the resource exclusive */ + ExReleaseResourceLite(FcbHeader->Resource); + ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); if (FileOffsetAppend == TRUE) { - Offset.LowPart = FcbHeader->FileSize.LowPart; // ?? - NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; - - /* Make sure we don't cross the 4GB boundary */ - b_4GB = (NewSize.LowPart < Offset.LowPart); - } + Offset.LowPart = FcbHeader->FileSize.LowPart; // ?? + NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; + + /* Make sure we don't cross the 4GB boundary */ + b_4GB = (NewSize.LowPart < Offset.LowPart); + } /* Recheck some of the conditions since we let the lock go */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && - (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && - (FcbHeader->AllocationSize.HighPart == 0) && + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && + (FcbHeader->AllocationSize.HighPart == 0) && !b_4GB) - { + { /* Do nothing? */ } else - { - goto FailAndCleanup; - } - } + { + goto FailAndCleanup; + } + } } else { - goto FailAndCleanup; - } - - /* Check if we need to find out if fast I/O is available */ - if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) - { - IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; - - /* Sanity check */ - ASSERT(!KeIsExecutingDpc()); - - /* Get the Fast I/O table */ - Device = IoGetRelatedDeviceObject(FileObject); - FastIoDispatch = Device->DriverObject->FastIoDispatch; - - /* Sanity check */ - ASSERT(FastIoDispatch != NULL); - ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); - - /* Ask the driver if we can do it */ - if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + goto FailAndCleanup; + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; + + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); + + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, FileOffsetAppend ? &FcbHeader->FileSize : FileOffset, - Length, - TRUE, - LockKey, - FALSE, - &FastIoCheckIfPossibleStatus, - Device)) - { - /* It's not, fail */ - goto FailAndCleanup; - } - } + Length, + TRUE, + LockKey, + FALSE, + &FastIoCheckIfPossibleStatus, + Device)) + { + /* It's not, fail */ + goto FailAndCleanup; + } + } /* If we are going to extend the file then save * the old file size in case the operation fails. - */ + */ if (NewSize.LowPart > FcbHeader->FileSize.LowPart) { - FileSizeModified = TRUE; - OldFileSize.LowPart = FcbHeader->FileSize.LowPart; - OldValidDataLength.LowPart = FcbHeader->ValidDataLength.LowPart; - FcbHeader->FileSize.LowPart = NewSize.LowPart; - } - - /* Set this as top-level IRP */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; - - _SEH2_TRY - { + FileSizeModified = TRUE; + OldFileSize.LowPart = FcbHeader->FileSize.LowPart; + OldValidDataLength.LowPart = FcbHeader->ValidDataLength.LowPart; + FcbHeader->FileSize.LowPart = NewSize.LowPart; + } + + /* Set this as top-level IRP */ + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + _SEH2_TRY + { if (Offset.LowPart > FcbHeader->ValidDataLength.LowPart) { - LARGE_INTEGER OffsetVar; - OffsetVar.LowPart = Offset.LowPart; - OffsetVar.HighPart = 0; - CcZeroData(FileObject,&FcbHeader->ValidDataLength,&OffsetVar,TRUE); - } - - /* Call the cache manager */ - CcFastCopyWrite(FileObject,Offset.LowPart,Length,Buffer); - } + LARGE_INTEGER OffsetVar; + OffsetVar.LowPart = Offset.LowPart; + OffsetVar.HighPart = 0; + CcZeroData(FileObject, &FcbHeader->ValidDataLength, &OffsetVar, TRUE); + } + + /* Call the cache manager */ + CcFastCopyWrite(FileObject, Offset.LowPart, Length, Buffer); + } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; /* Remove ourselves at the top level component after the IO is done */ - PsGetCurrentThread()->TopLevelIrp = 0; - - /* Did the operation succeed ? */ + PsGetCurrentThread()->TopLevelIrp = 0; + + /* Did the operation succeed? */ if (Result == TRUE) { - /* Update the valid file size if necessary */ + /* Update the valid file size if necessary */ if (NewSize.LowPart > FcbHeader->ValidDataLength.LowPart) { - FcbHeader->ValidDataLength.LowPart = NewSize.LowPart ; - } + FcbHeader->ValidDataLength.LowPart = NewSize.LowPart; + } /* Flag the file as modified */ - FileObject->Flags |= FO_FILE_MODIFIED; - - /* Update the strucutres if the file size changed */ + FileObject->Flags |= FO_FILE_MODIFIED; + + /* Update the strucutres if the file size changed */ if (FileSizeModified) { SharedCacheMap = (PSHARED_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; SharedCacheMap->FileSize.LowPart = NewSize.LowPart; - FileObject->Flags |= FO_FILE_SIZE_CHANGED; - } + FileObject->Flags |= FO_FILE_SIZE_CHANGED; + } /* Update the file object current file offset */ - FileObject->CurrentByteOffset.QuadPart = NewSize.LowPart; + FileObject->CurrentByteOffset.QuadPart = NewSize.LowPart; } else @@ -515,31 +515,31 @@ /* Result == FALSE if we get here */ if (FileSizeModified) { - /* If the file size was modified then restore the old file size */ + /* If the file size was modified then restore the old file size */ if (FcbHeader->PagingIoResource != NULL) { /* Nagar P.544. * Restore the old file size if operation didn't succeed. */ - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource,TRUE); - FcbHeader->FileSize.LowPart = OldFileSize.LowPart; - FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.LowPart = OldFileSize.LowPart; + FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - /* If there is no lock and do it without */ - FcbHeader->FileSize.LowPart = OldFileSize.LowPart; - FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; - } - } + /* If there is no lock and do it without */ + FcbHeader->FileSize.LowPart = OldFileSize.LowPart; + FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; + } + } else { /* Do nothing? */ - } - } - - goto Cleanup; + } + } + + goto Cleanup; } else { @@ -550,126 +550,126 @@ OldFileSize.QuadPart = 0; #endif - /* Sanity check */ - ASSERT(!KeIsExecutingDpc()); + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); /* Nagar P.544. * Check if we need to acquire the resource exclusive. */ - if ( (FileOffsetAppend == FALSE) && + if ((FileOffsetAppend == FALSE) && (FileOffset->QuadPart + Length <= FcbHeader->ValidDataLength.QuadPart)) - { - /* Acquire the resource shared */ + { + /* Acquire the resource shared */ if (!ExAcquireResourceSharedLite(FcbHeader->Resource, Wait)) { - goto LeaveCriticalAndFail; - } - ResourceAquiredShared =TRUE; + goto LeaveCriticalAndFail; + } + ResourceAquiredShared = TRUE; } else { - /* Acquire the resource exclusive */ + /* Acquire the resource exclusive */ if (!ExAcquireResourceExclusiveLite(FcbHeader->Resource, Wait)) { - goto LeaveCriticalAndFail; - } - } - - /* Check if we are appending */ + goto LeaveCriticalAndFail; + } + } + + /* Check if we are appending */ if (FileOffsetAppend == TRUE) { - Offset.QuadPart = FcbHeader->FileSize.QuadPart; - NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; } else { - Offset.QuadPart = FileOffset->QuadPart; - NewSize.QuadPart += FileOffset->QuadPart + Length; - } + Offset.QuadPart = FileOffset->QuadPart; + NewSize.QuadPart += FileOffset->QuadPart + Length; + } /* Nagar p.544/545. * Make sure that caching is initated. * That fast are allowed for this file stream. * That we are not extending past the allocated size. * That we are not creating a hole bigger than 8k. - */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + */ + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && (FcbHeader->ValidDataLength.QuadPart + 0x2000 > Offset.QuadPart) && (Length <= MAXLONGLONG - Offset.QuadPart) && (FcbHeader->AllocationSize.QuadPart >= NewSize.QuadPart)) - { - /* Check if we can keep the lock shared */ + { + /* Check if we can keep the lock shared */ if (ResourceAquiredShared && (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart)) { - ExReleaseResourceLite(FcbHeader->Resource); - if(!ExAcquireResourceExclusiveLite(FcbHeader->Resource,Wait)) - { - goto LeaveCriticalAndFail; - } + ExReleaseResourceLite(FcbHeader->Resource); + if (!ExAcquireResourceExclusiveLite(FcbHeader->Resource, Wait)) + { + goto LeaveCriticalAndFail; + } /* Compute the offset and the new filesize */ if (FileOffsetAppend) { - Offset.QuadPart = FcbHeader->FileSize.QuadPart; - NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; - } - - /* Recheck the above points since we released and reacquire the lock */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + } + + /* Recheck the above points since we released and reacquire the lock */ + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && (FcbHeader->AllocationSize.QuadPart > NewSize.QuadPart)) - { - /* Do nothing */ + { + /* Do nothing */ } else { - goto FailAndCleanup; - } - } - - /* Check if we need to find out if fast I/O is available */ - if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) - { - IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; - - /* Sanity check */ - ASSERT(!KeIsExecutingDpc()); - - /* Get the Fast I/O table */ - Device = IoGetRelatedDeviceObject(FileObject); - FastIoDispatch = Device->DriverObject->FastIoDispatch; - - /* Sanity check */ - ASSERT(FastIoDispatch != NULL); - ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); - - /* Ask the driver if we can do it */ - if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + goto FailAndCleanup; + } + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; + + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); + + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, FileOffsetAppend ? &FcbHeader->FileSize : FileOffset, - Length, - TRUE, - LockKey, - FALSE, - &FastIoCheckIfPossibleStatus, - Device)) - { - /* It's not, fail */ - goto FailAndCleanup; - } - } + Length, + TRUE, + LockKey, + FALSE, + &FastIoCheckIfPossibleStatus, + Device)) + { + /* It's not, fail */ + goto FailAndCleanup; + } + } /* If we are going to modify the filesize, * save the old fs in case the operation fails. */ if (NewSize.QuadPart > FcbHeader->FileSize.QuadPart) { - FileSizeModified = TRUE; - OldFileSize.QuadPart = FcbHeader->FileSize.QuadPart; - OldValidDataLength.QuadPart = FcbHeader->ValidDataLength.QuadPart; + FileSizeModified = TRUE; + OldFileSize.QuadPart = FcbHeader->FileSize.QuadPart; + OldValidDataLength.QuadPart = FcbHeader->ValidDataLength.QuadPart; /* If the high part of the filesize is going * to change, grab the Paging IoResouce. @@ -677,28 +677,28 @@ if (NewSize.HighPart != FcbHeader->FileSize.HighPart && FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->FileSize.QuadPart = NewSize.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->FileSize.QuadPart = NewSize.QuadPart; - } - } + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + } + } /* Nagar p.544. * Set ourselves as top component. */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; - - _SEH2_TRY - { - BOOLEAN CallCc = TRUE; + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + _SEH2_TRY + { + BOOLEAN CallCc = TRUE; /* Check if there is a gap between the end of the file * and the offset. If yes, then we have to zero the data. - */ + */ if (Offset.QuadPart > FcbHeader->ValidDataLength.QuadPart) { if (!(Result = CcZeroData(FileObject, @@ -708,92 +708,92 @@ { /* If this operation fails, then we have to exit. We can jump * outside the SEH, so I a using a variable to exit normally. - */ - CallCc = FALSE; - } - } + */ + CallCc = FALSE; + } + } /* Unless the CcZeroData failed, call the cache manager */ if (CallCc) { - Result = CcCopyWrite(FileObject,&Offset,Length, Wait, Buffer); - } + Result = CcCopyWrite(FileObject, &Offset, Length, Wait, Buffer); + } } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; /* Reset the top component */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; /* Did the operation suceeded */ if (Result) { - /* Check if we need to update the filesize */ + /* Check if we need to update the filesize */ if (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart) { if (NewSize.HighPart != FcbHeader->ValidDataLength.HighPart && FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; - } - } + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + } + } /* Flag the file as modified */ - FileObject->Flags |= FO_FILE_MODIFIED; - - /* Check if the filesize has changed */ + FileObject->Flags |= FO_FILE_MODIFIED; + + /* Check if the filesize has changed */ if (FileSizeModified) { - /* Update the file sizes */ + /* Update the file sizes */ SharedCacheMap = (PSHARED_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; SharedCacheMap->FileSize.QuadPart = NewSize.QuadPart; - FileObject->Flags |= FO_FILE_SIZE_CHANGED; - } - - /* Update the current FO byte offset */ - FileObject->CurrentByteOffset.QuadPart = NewSize.QuadPart; - } - else - { + FileObject->Flags |= FO_FILE_SIZE_CHANGED; + } + + /* Update the current FO byte offset */ + FileObject->CurrentByteOffset.QuadPart = NewSize.QuadPart; + } + else + { /* The operation did not succeed. * Reset the file size to what it should be. - */ + */ if (FileSizeModified) { if (FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; - FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; - FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; - } - } - } - - goto Cleanup; + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + } + } + } + + goto Cleanup; } else { - goto FailAndCleanup; - } - } + goto FailAndCleanup; + } + } LeaveCriticalAndFail: @@ -818,7 +818,7 @@ */ NTSTATUS NTAPI -FsRtlGetFileSize(IN PFILE_OBJECT FileObject, +FsRtlGetFileSize(IN PFILE_OBJECT FileObject, IN OUT PLARGE_INTEGER FileSize) { FILE_STANDARD_INFORMATION Info; @@ -840,8 +840,8 @@ /* Check if we support Fast Calls, and check FastIoQueryStandardInfo. * Call the function and see if it succeeds. */ - if ( !FastDispatch || - !FastDispatch->FastIoQueryStandardInfo || + if (!FastDispatch || + !FastDispatch->FastIoQueryStandardInfo || !FastDispatch->FastIoQueryStandardInfo(FileObject, TRUE, &Info, @@ -851,10 +851,10 @@ /* If any of the above failed, then we are going to send an * IRP to the device object. Initialize the event for the IO. */ - KeInitializeEvent(&Event,NotificationEvent,FALSE); + KeInitializeEvent(&Event, NotificationEvent, FALSE); /* Allocate the IRP */ - Irp = IoAllocateIrp(DeviceObject->StackSize,FALSE); + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); if (Irp == NULL) { @@ -885,12 +885,12 @@ FileStandardInformation; /* Send the IRP to the related device object */ - Status = IoCallDriver(DeviceObject,Irp); + Status = IoCallDriver(DeviceObject, Irp); /* Standard DDK IRP result processing */ if (Status == STATUS_PENDING) { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } /* If there was a synchronous error, signal it */ @@ -905,7 +905,7 @@ /* Check the sync/async IO result */ if (NT_SUCCESS(IoStatus.Status)) { - /* Was the request for a directory ? */ + /* Was the request for a directory? */ if (Info.Directory) { IoStatus.Status = STATUS_FILE_IS_A_DIRECTORY; @@ -1012,8 +1012,8 @@ /* * @implemented */ - BOOLEAN - NTAPI +BOOLEAN +NTAPI FsRtlMdlReadCompleteDev(IN PFILE_OBJECT FileObject, IN PMDL MemoryDescriptorList, IN PDEVICE_OBJECT DeviceObject) @@ -1133,8 +1133,8 @@ _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; @@ -1208,11 +1208,11 @@ { if (FileObject->Flags & FO_WRITE_THROUGH) { - return FALSE; + return FALSE; } /* Call the Cache Manager */ - CcMdlWriteComplete2(FileObject,FileOffset,MdlChain); + CcMdlWriteComplete2(FileObject, FileOffset, MdlChain); return TRUE; } @@ -1315,9 +1315,9 @@ * Check with Cc if we can write. */ if (!CcCanIWrite(FileObject, Length, TRUE, FALSE) || - (FileObject->Flags & FO_WRITE_THROUGH)) - { - return FALSE; + (FileObject->Flags & FO_WRITE_THROUGH)) + { + return FALSE; } IoStatus->Status = STATUS_SUCCESS; @@ -1332,213 +1332,213 @@ FsRtlEnterFileSystem(); /* Check we are going to extend the file */ - if ( (FileOffsetAppend == FALSE) && + if ((FileOffsetAppend == FALSE) && (FileOffset->QuadPart + Length <= FcbHeader->ValidDataLength.QuadPart)) - { - /* Acquire the resource shared */ - ExAcquireResourceSharedLite(FcbHeader->Resource,TRUE); - ResourceAquiredShared =TRUE; + { + /* Acquire the resource shared */ + ExAcquireResourceSharedLite(FcbHeader->Resource, TRUE); + ResourceAquiredShared = TRUE; } else - { - /* Acquire the resource exclusive */ - ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); - } - - /* Check if we are appending */ + { + /* Acquire the resource exclusive */ + ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); + } + + /* Check if we are appending */ if (FileOffsetAppend == TRUE) { - Offset.QuadPart = FcbHeader->FileSize.QuadPart; - NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; } else - { - Offset.QuadPart = FileOffset->QuadPart; - NewSize.QuadPart = FileOffset->QuadPart + Length; - } - - if ( (FileObject->PrivateCacheMap) && - (FcbHeader->IsFastIoPossible) && + { + Offset.QuadPart = FileOffset->QuadPart; + NewSize.QuadPart = FileOffset->QuadPart + Length; + } + + if ((FileObject->PrivateCacheMap) && + (FcbHeader->IsFastIoPossible) && (Length <= MAXLONGLONG - FileOffset->QuadPart) && - (NewSize.QuadPart <= FcbHeader->AllocationSize.QuadPart) ) + (NewSize.QuadPart <= FcbHeader->AllocationSize.QuadPart)) { /* Check if we can keep the lock shared */ if (ResourceAquiredShared && (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart)) { - ExReleaseResourceLite(FcbHeader->Resource); - ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); + ExReleaseResourceLite(FcbHeader->Resource); + ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); /* Compute the offset and the new filesize */ if (FileOffsetAppend) { - Offset.QuadPart = FcbHeader->FileSize.QuadPart; - NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; - } - - /* Recheck the above points since we released and reacquire the lock */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + } + + /* Recheck the above points since we released and reacquire the lock */ + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && (FcbHeader->AllocationSize.QuadPart > NewSize.QuadPart)) - { - /* Do nothing */ + { + /* Do nothing */ } else { - goto FailAndCleanup; - } - } - - /* Check if we need to find out if fast I/O is available */ - if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) - { - /* Sanity check */ - /* ASSERT(!KeIsExecutingDpc()); */ - - /* Get the Fast I/O table */ - Device = IoGetRelatedDeviceObject(FileObject); - FastIoDispatch = Device->DriverObject->FastIoDispatch; - - /* Sanity check */ - ASSERT(FastIoDispatch != NULL); - ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); - - /* Ask the driver if we can do it */ - if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, - FileOffset, - Length, - TRUE, - LockKey, - FALSE, - IoStatus, - Device)) - { - /* It's not, fail */ - goto FailAndCleanup; - } - } + goto FailAndCleanup; + } + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + /* Sanity check */ + /* ASSERT(!KeIsExecutingDpc()); */ + + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + FileOffset, + Length, + TRUE, + LockKey, + FALSE, + IoStatus, + Device)) + { + /* It's not, fail */ + goto FailAndCleanup; + } + } /* If we are going to modify the filesize, * save the old fs in case the operation fails. */ - if (NewSize.QuadPart > FcbHeader->FileSize.QuadPart) - { - FileSizeModified = TRUE; - OldFileSize.QuadPart = FcbHeader->FileSize.QuadPart; - OldValidDataLength.QuadPart = FcbHeader->ValidDataLength.QuadPart; + if (NewSize.QuadPart > FcbHeader->FileSize.QuadPart) + { + FileSizeModified = TRUE; + OldFileSize.QuadPart = FcbHeader->FileSize.QuadPart; + OldValidDataLength.QuadPart = FcbHeader->ValidDataLength.QuadPart; /* If the high part of the filesize is going * to change, grab the Paging IoResouce. */ if (NewSize.HighPart != FcbHeader->FileSize.HighPart && FcbHeader->PagingIoResource) - { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->FileSize.QuadPart = NewSize.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + { + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->FileSize.QuadPart = NewSize.QuadPart; - } - } + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + } + } /* Nagar p.544. * Set ourselves as top component. */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; - _SEH2_TRY - { + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + _SEH2_TRY + { /* Check if there is a gap between the end of the file and the offset. * If yes, then we have to zero the data. - */ + */ if (Offset.QuadPart > FcbHeader->ValidDataLength.QuadPart) { Result = CcZeroData(FileObject, &FcbHeader->ValidDataLength, &Offset, TRUE); - if (Result) - { + if (Result) + { CcPrepareMdlWrite(FileObject, &Offset, Length, MdlChain, IoStatus); - } + } } else { - CcPrepareMdlWrite(FileObject,&Offset,Length,MdlChain,IoStatus); - } + CcPrepareMdlWrite(FileObject, &Offset, Length, MdlChain, IoStatus); + } } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; /* Reset the top component */ - PsGetCurrentThread()->TopLevelIrp = 0; + PsGetCurrentThread()->TopLevelIrp = 0; /* Did the operation suceeded */ if (Result) { - /* Check if we need to update the filesize */ + /* Check if we need to update the filesize */ if (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart) { if (NewSize.HighPart != FcbHeader->ValidDataLength.HighPart && FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; - } - } + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + } + } /* Flag the file as modified */ - FileObject->Flags |= FO_FILE_MODIFIED; - - /* Check if the filesize has changed */ + FileObject->Flags |= FO_FILE_MODIFIED; + + /* Check if the filesize has changed */ if (FileSizeModified) { SharedCacheMap = (PSHARED_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; SharedCacheMap->FileSize.QuadPart = NewSize.QuadPart; - FileObject->Flags |= FO_FILE_SIZE_CHANGED; - } - } - else - { + FileObject->Flags |= FO_FILE_SIZE_CHANGED; + } + } + else + { /* The operation did not succeed. * Reset the file size to what it should be. - */ + */ if (FileSizeModified) { if (FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; - FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; - FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; - } - } - } - - goto Cleanup; + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + } + } + } + + goto Cleanup; } else {

14 years, 8 months

[tkreuzer] 45055: Add a dummy PSEH2 for amd64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jan 13 00:15:23 2010 New Revision: 45055 URL: http://svn.reactos.org/svn/reactos?rev=45055&view=rev Log: Add a dummy PSEH2 for amd64 Added: trunk/reactos/include/reactos/libs/pseh/pseh2_64.h (with props) Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Wed Jan 13 00:15:23 2010 @@ -19,6 +19,9 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef _M_AMD64 +#include "pseh2_64.h" +#else #ifndef KJK_PSEH2_H_ #define KJK_PSEH2_H_ @@ -401,5 +404,6 @@ #endif #endif +#endif /* EOF */ Added: trunk/reactos/include/reactos/libs/pseh/pseh2_64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2_64.h (added) +++ trunk/reactos/include/reactos/libs/pseh/pseh2_64.h [iso-8859-1] Wed Jan 13 00:15:23 2010 @@ -1,0 +1,37 @@ +#ifndef KJK_PSEH2_H_ +#define KJK_PSEH2_H_ + + +#define _SEH2_TRY if(1) { +#define _SEH2_EXCEPT(...) } if(0) { +#define _SEH2_END } +#define _SEH2_YIELD(STMT_) STMT_ +#define _SEH2_LEAVE +#define _SEH2_FINALLY } if(1) { +#define _SEH2_GetExceptionInformation() (GetExceptionInformation()) +#define _SEH2_GetExceptionCode() (0) +#define _SEH2_AbnormalTermination() (0) + +struct _EXCEPTION_RECORD; +struct _EXCEPTION_POINTERS; +struct _CONTEXT; + +typedef int (__cdecl * _SEH2FrameHandler_t) +( + struct _EXCEPTION_RECORD *, + void *, + struct _CONTEXT *, + void * +); + +typedef struct __SEH2Registration +{ + struct __SEH2Registration * SER_Prev; + _SEH2FrameHandler_t SER_Handler; +} +_SEH2Registration_t; + + +#endif + +/* EOF */ Propchange: trunk/reactos/include/reactos/libs/pseh/pseh2_64.h ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 8 months

[tkreuzer] 45054: Enable a few definitions for amd64, too

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 12 21:30:43 2010 New Revision: 45054 URL: http://svn.reactos.org/svn/reactos?rev=45054&view=rev Log: Enable a few definitions for amd64, too Modified: trunk/reactos/include/crt/stdlib.h Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Tue Jan 12 21:30:43 2010 @@ -152,7 +152,7 @@ _CRTIMP extern char *_sys_errlist[]; _CRTIMP extern int _sys_nerr; -#if !defined(__x86_64) +//#if !defined(__x86_64) _CRTIMP int *__cdecl __p___argc(void); _CRTIMP char ***__cdecl __p___argv(void); _CRTIMP wchar_t ***__cdecl __p___wargv(void); @@ -160,7 +160,7 @@ _CRTIMP wchar_t ***__cdecl __p__wenviron(void); _CRTIMP char **__cdecl __p__pgmptr(void); _CRTIMP wchar_t **__cdecl __p__wpgmptr(void); -#endif +//#endif #ifndef __argc #ifdef _MSVCRT_ extern int __argc; @@ -292,7 +292,8 @@ #define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0])) #else extern "C++" { - template <typename _CountofType,size_t _SizeOfArray> char (*__countof_helper(UNALIGNED _CountofType (&_Array)[_SizeOfArray]))[_SizeOfArray]; + template <typename _CountofType,size_t _SizeOfArray> + char (*__countof_helper(/*UNALIGNED*/ _CountofType (&_Array)[_SizeOfArray]))[_SizeOfArray]; #define _countof(_Array) sizeof(*__countof_helper(_Array)) } #endif

14 years, 8 months

[tkreuzer] 45053: [CRT] __wine_push_frame and __wine_pop_frame are only used in x86 specific code in cppexcept.c. Move them there instead of trying to implement them for other architectures.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 12 21:09:38 2010 New Revision: 45053 URL: http://svn.reactos.org/svn/reactos?rev=45053&view=rev Log: [CRT] __wine_push_frame and __wine_pop_frame are only used in x86 specific code in cppexcept.c. Move them there instead of trying to implement them for other architectures. Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/cppexcept.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Tue Jan 12 21:09:38 2010 @@ -38,6 +38,19 @@ PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ); + +static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) +{ + frame->Next = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); + __writefsdword(0, (unsigned long)frame); + return frame->Next; +} + +static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) +{ + __writefsdword(0, (unsigned long)frame->Next); + return frame->Next; +} /* call a function with a given ebp */ static inline void *call_ebp_func( void *func, void *ebp ) Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Tue Jan 12 21:09:38 2010 @@ -59,32 +59,6 @@ #pragma warning(disable:4733) #endif -static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) -{ -#if defined(__i386__) - frame->Next = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); - __writefsdword(0, (unsigned long)frame); - return frame->Next; -#else - NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - frame->Next = teb->ExceptionList; - teb->ExceptionList = frame; - return frame->Next; -#endif -} - -static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) -{ -#if defined(__i386__) - __writefsdword(0, (unsigned long)frame->Next); - return frame->Next; -#else - NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - teb->ExceptionList = frame->Next; - return frame->Next; -#endif -} - #ifdef _MSC_VER #pragma warning(pop) #endif

14 years, 8 months

[sir_richard] 45052: Patch that fixes VMWare boot (and should fix QEMu/KVM boot on the testbot): [NTOS]: A trap can get us into a state where DS/ES are invalid, making any pointer dereference (on DS/ES segmented memory, not SS, the stack) crash (and probably double-fault). Therefore, we have to be careful to switch to a good DS/ES before touching the TrapFrame pointer, which we don't have in ESP like the ASM code, but in a DS/ES-segmented register. For V8086 traps we can switch to the good DS/ES

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 12 06:50:45 2010 New Revision: 45052 URL: http://svn.reactos.org/svn/reactos?rev=45052&view=rev Log: Patch that fixes VMWare boot (and should fix QEMu/KVM boot on the testbot): [NTOS]: A trap can get us into a state where DS/ES are invalid, making any pointer dereference (on DS/ES segmented memory, not SS, the stack) crash (and probably double-fault). Therefore, we have to be careful to switch to a good DS/ES before touching the TrapFrame pointer, which we don't have in ESP like the ASM code, but in a DS/ES-segmented register. For V8086 traps we can switch to the good DS/ES immediately, but for other kinds of traps, we actually need to save the current (bad) segments first. So we save them on the stack now, then switch to the good ones, then store the stack values into the trap frame. This is what happens on a non-optimized (-O0) build. On an optimized build, the segments will end up in registers instead, which is fine too (they'll be direct values). The order of instructions is guaranteed since the segment macros are volatile. [NTOS]: The GPF and Invalid Opcode handlers are performance critical when talking about V8086 traps, because they control the main flow of execution during that mode (GPFs will be issued for any privileged instruction we need to emulate, and invalid opcode might be generated for BOPs). Because of this, we employ a fast entry/exit macro into V8086 mode since we can make certain assumptions. We detect, and use, such scenarios when the V8086 flag is enabled in EFLAGS. However, because we can land in a GPF handler with an invalid DS/ES, as some V8086 code could trample this during BIOS calls for example, we must make sure that we are on a valid DS/ES before dereferencing any pointer. We fixup DS/ES either in KiEnterTrap (for normal entry/exit) or, for V86, in KiEnterV86Trap. Notice the problem: we need to detect which of these to use early on but we can't touch the EFLAGS in the frame because DS/ES could be invalid. Thankfully SS is always guaranteed valid, so stack dereferences are game! We therefore read the EFLAGS here, in assembly, where we can touch ESP as we please. We save this in EDX, which will be used as the second argument for the FASTCALL C trap entry. When we make the fast V86 check, we use the parameter instead of the trap frame, leading us to using the correct trap entry function, which fixes up DS/ES and lets us go on our merry way... [NTOS]: Make appropriate changes to GENERATE_TRAP_HANDLERS macro. [NTOS]: Switch to using well-known NT trap handler names (hex-based, double-zeroed) instead of decimal-based trap handler names which are confusing. [NTOS]: Clean up some debug spew. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Tue Jan 12 06:50:45 2010 @@ -229,16 +229,61 @@ // // @remark None. // -.macro GENERATE_TRAP_HANDLER Name, ErrorCode +.macro GENERATE_TRAP_HANDLER Name, ErrorCode=1, FastV86=0 .func Name _&Name: + /* Some traps generate an error code, some don't (thanks, Intel!) */ .if \ErrorCode push 0 .endif + + /* Save all register state before we touch it */ pushad + + /* + * The GPF and Invalid Opcode handlers are performance critical when talking + * about V8086 traps, because they control the main flow of execution during + * that mode (GPFs will be issued for any privileged instruction we need to + * emulate, and invalid opcode might be generated for BOPs). + * + * Because of this, we employ a fast entry/exit macro into V8086 mode since + * we can make certain assumptions. We detect, and use, such scenarios when + * the V8086 flag is enabled in EFLAGS. + * + * However, because we can land in a GPF handler with an invalid DS/ES, as + * some V8086 code could trample this during BIOS calls for example, we must + * make sure that we are on a valid DS/ES before dereferencing any pointer. + * + * We fixup DS/ES either in KiEnterTrap (for normal entry/exit) or, for V86, + * in KiEnterV86Trap. Notice the problem: we need to detect which of these + * to use early on but we can't touch the EFLAGS in the frame because DS/ES + * could be invalid. + * + * Thankfully SS is always guaranteed valid, so stack dereferences are game! + * + * We therefore read the EFLAGS here, in assembly, where we can touch ESP as + * we please. We save this in EDX, which will be used as the second argument + * for the FASTCALL C trap entry. + * + * When we make the fast V86 check, we use the parameter instead of the trap + * frame, leading us to using the correct trap entry function, which fixes + * up DS/ES and lets us go on our merry way... + */ + .if \FastV86 + /* ESP+12 is EFLAGS on interrupt frame, add 8*4 for the PUSHAD frame */ + mov edx, [esp+12+8*4] + .endif + + /* Now make space for the trap frame and store the pointer as first arg */ sub esp, KTRAP_FRAME_LENGTH - KTRAP_FRAME_PREVIOUS_MODE mov ecx, esp - jmp @&Name&Handler@4 + + /* Normally we just have one parameter, but fast V86 handlers need two */ + .if \FastV86 + jmp @&Name&Handler@8 + .else + jmp @&Name&Handler@4 + .endif .endfunc .endm Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Tue Jan 12 06:50:45 2010 @@ -440,9 +440,9 @@ extern ULONG KeI386CpuStep; extern UCHAR KiDebugRegisterTrapOffsets[9]; extern UCHAR KiDebugRegisterContextOffsets[9]; -extern VOID __cdecl KiTrap2(VOID); -extern VOID __cdecl KiTrap8(VOID); -extern VOID __cdecl KiTrap19(VOID); +extern VOID __cdecl KiTrap02(VOID); +extern VOID __cdecl KiTrap08(VOID); +extern VOID __cdecl KiTrap13(VOID); extern VOID __cdecl KiFastCallEntry(VOID); extern VOID NTAPI ExpInterlockedPopEntrySListFault(VOID); extern VOID __cdecl CopyParams(VOID); Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Tue Jan 12 06:50:45 2010 @@ -651,7 +651,7 @@ Tss->CR3 = __readcr3(); Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); Tss->Esp = PtrToUlong(KiDoubleFaultStack); - Tss->Eip = PtrToUlong(KiTrap8); + Tss->Eip = PtrToUlong(KiTrap08); Tss->Cs = KGDT_R0_CODE; Tss->Fs = KGDT_R0_PCR; Tss->Ss = Ke386GetSs(); @@ -681,7 +681,7 @@ Tss->CR3 = __readcr3(); Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); Tss->Esp = PtrToUlong(KiDoubleFaultStack); - Tss->Eip = PtrToUlong(KiTrap2); + Tss->Eip = PtrToUlong(KiTrap02); Tss->Cs = KGDT_R0_CODE; Tss->Fs = KGDT_R0_PCR; Tss->Ss = Ke386GetSs(); @@ -837,13 +837,13 @@ { PKIDTENTRY IdtEntry; - /* Get the IDT Entry for Interrupt 19 */ - IdtEntry = &((PKIPCR)KeGetPcr())->IDT[19]; + /* Get the IDT Entry for Interrupt 0x13 */ + IdtEntry = &((PKIPCR)KeGetPcr())->IDT[0x13]; /* Set it up */ IdtEntry->Selector = KGDT_R0_CODE; - IdtEntry->Offset = ((ULONG_PTR)KiTrap19 & 0xFFFF); - IdtEntry->ExtendedOffset = ((ULONG_PTR)KiTrap19 >> 16) & 0xFFFF; + IdtEntry->Offset = ((ULONG_PTR)KiTrap13 & 0xFFFF); + IdtEntry->ExtendedOffset = ((ULONG_PTR)KiTrap13 >> 16) & 0xFFFF; ((PKIDT_ACCESS)&IdtEntry->Access)->Dpl = 0; ((PKIDT_ACCESS)&IdtEntry->Access)->Present = 1; ((PKIDT_ACCESS)&IdtEntry->Access)->SegmentType = I386_INTERRUPT_GATE; Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Tue Jan 12 06:50:45 2010 @@ -22,24 +22,24 @@ .globl _KiIdt _KiIdt: /* This is the Software Interrupt Table that we handle in this file: */ -idt _KiTrap0, INT_32_DPL0 /* INT 00: Divide Error (#DE) */ -idt _KiTrap1, INT_32_DPL0 /* INT 01: Debug Exception (#DB) */ -idt _KiTrap2, INT_32_DPL0 /* INT 02: NMI Interrupt */ -idt _KiTrap3, INT_32_DPL3 /* INT 03: Breakpoint Exception (#BP) */ -idt _KiTrap4, INT_32_DPL3 /* INT 04: Overflow Exception (#OF) */ -idt _KiTrap5, INT_32_DPL0 /* INT 05: BOUND Range Exceeded (#BR) */ -idt _KiTrap6, INT_32_DPL0 /* INT 06: Invalid Opcode Code (#UD) */ -idt _KiTrap7, INT_32_DPL0 /* INT 07: Device Not Available (#NM) */ -idt _KiTrap8, INT_32_DPL0 /* INT 08: Double Fault Exception (#DF) */ -idt _KiTrap9, INT_32_DPL0 /* INT 09: RESERVED */ -idt _KiTrap10, INT_32_DPL0 /* INT 0A: Invalid TSS Exception (#TS) */ -idt _KiTrap11, INT_32_DPL0 /* INT 0B: Segment Not Present (#NP) */ -idt _KiTrap12, INT_32_DPL0 /* INT 0C: Stack Fault Exception (#SS) */ -idt _KiTrap13, INT_32_DPL0 /* INT 0D: General Protection (#GP) */ -idt _KiTrap14, INT_32_DPL0 /* INT 0E: Page-Fault Exception (#PF) */ +idt _KiTrap00, INT_32_DPL0 /* INT 00: Divide Error (#DE) */ +idt _KiTrap01, INT_32_DPL0 /* INT 01: Debug Exception (#DB) */ +idt _KiTrap02, INT_32_DPL0 /* INT 02: NMI Interrupt */ +idt _KiTrap03, INT_32_DPL3 /* INT 03: Breakpoint Exception (#BP) */ +idt _KiTrap04, INT_32_DPL3 /* INT 04: Overflow Exception (#OF) */ +idt _KiTrap05, INT_32_DPL0 /* INT 05: BOUND Range Exceeded (#BR) */ +idt _KiTrap06, INT_32_DPL0 /* INT 06: Invalid Opcode Code (#UD) */ +idt _KiTrap07, INT_32_DPL0 /* INT 07: Device Not Available (#NM) */ +idt _KiTrap08, INT_32_DPL0 /* INT 08: Double Fault Exception (#DF) */ +idt _KiTrap09, INT_32_DPL0 /* INT 09: RESERVED */ +idt _KiTrap0A, INT_32_DPL0 /* INT 0A: Invalid TSS Exception (#TS) */ +idt _KiTrap0B, INT_32_DPL0 /* INT 0B: Segment Not Present (#NP) */ +idt _KiTrap0C, INT_32_DPL0 /* INT 0C: Stack Fault Exception (#SS) */ +idt _KiTrap0D, INT_32_DPL0 /* INT 0D: General Protection (#GP) */ +idt _KiTrap0E, INT_32_DPL0 /* INT 0E: Page-Fault Exception (#PF) */ idt _KiTrap0F, INT_32_DPL0 /* INT 0F: RESERVED */ -idt _KiTrap16, INT_32_DPL0 /* INT 10: x87 FPU Error (#MF) */ -idt _KiTrap17, INT_32_DPL0 /* INT 11: Align Check Exception (#AC) */ +idt _KiTrap10, INT_32_DPL0 /* INT 10: x87 FPU Error (#MF) */ +idt _KiTrap11, INT_32_DPL0 /* INT 11: Align Check Exception (#AC) */ idt _KiTrap0F, INT_32_DPL0 /* INT 12: Machine Check Exception (#MC)*/ idt _KiTrap0F, INT_32_DPL0 /* INT 13: SIMD FPU Exception (#XF) */ .rept 22 @@ -54,8 +54,8 @@ GENERATE_IDT_STUBS /* INT 30-FF: UNEXPECTED INTERRUPTS */ /* Trap handlers referenced from C code */ -.globl _KiTrap8 -.globl _KiTrap19 +.globl _KiTrap08 +.globl _KiTrap13 /* System call code referenced from C code */ .globl _CopyParams @@ -383,7 +383,7 @@ push 0x20202 push KGDT_R3_CODE + RPL_MASK push 0 - jmp _KiTrap6 + jmp _KiTrap06 #if DBG InvalidIrql: @@ -573,127 +573,24 @@ /* HARDWARE TRAP HANDLERS ****************************************************/ -GENERATE_TRAP_HANDLER KiTrap0, 1 -GENERATE_TRAP_HANDLER KiTrap1, 1 -GENERATE_TRAP_HANDLER KiTrap3, 1 -GENERATE_TRAP_HANDLER KiTrap4, 1 -GENERATE_TRAP_HANDLER KiTrap5, 1 -GENERATE_TRAP_HANDLER KiTrap6, 1 -GENERATE_TRAP_HANDLER KiTrap7, 1 -GENERATE_TRAP_HANDLER KiTrap8, 0 -GENERATE_TRAP_HANDLER KiTrap9, 1 -GENERATE_TRAP_HANDLER KiTrap10, 0 -GENERATE_TRAP_HANDLER KiTrap11, 0 -GENERATE_TRAP_HANDLER KiTrap12, 0 - -//GENERATE_TRAP_HANDLER KiTrap13, 0 - -.func KiTrap13 -TRAP_FIXUPS kitd_a, kitd_t, DoFixupV86, DoNotFixupAbios -_KiTrap13: - - /* It this a V86 GPF? */ - test dword ptr [esp+12], EFLAGS_V86_MASK - jz NotV86 - - /* Enter V86 Trap */ - V86_TRAP_PROLOG kitd_a, kitd_v - - /* Make sure that this is a V86 process */ - mov ecx, PCR[KPCR_CURRENT_THREAD] - mov ecx, [ecx+KTHREAD_APCSTATE_PROCESS] - cmp dword ptr [ecx+EPROCESS_VDM_OBJECTS], 0 - jz ShouldNotGetHere - -RaiseIrql: - - /* Go to APC level */ - mov ecx, APC_LEVEL - call @KfRaiseIrql@4 - - /* Save old IRQL and enable interrupts */ - push eax - sti - - /* Handle the opcode */ - mov ecx, ebp - call @Ki386HandleOpcodeV86@4 - - /* Check if this was VDM */ - test al, 0xFF - jz ShouldNotGetHere - -NoReflect: - - /* Lower IRQL and disable interrupts */ - pop ecx - call @KfLowerIrql@4 - cli - - /* Check if this was a V86 trap */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jz NotV86Trap - - /* Exit the V86 Trap */ - V86_TRAP_EPILOG - -NotV86Trap: - - /* Either this wasn't V86, or it was, but an APC interrupted us */ - jmp _Kei386EoiHelper@0 - -NotV86: - /* Enter trap */ - TRAP_PROLOG kitd_a, kitd_t - - /* Check if this was from kernel-mode */ - test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jnz ShouldNotGetHere - - /* Get the opcode and trap frame */ -KmodeGpf: - mov eax, [ebp+KTRAP_FRAME_EIP] - mov eax, [eax] - mov edx, [ebp+KTRAP_FRAME_EBP] - - /* Was it IRETD? */ - cmp al, 0xCF - jne ShouldNotGetHere - - /* Get error code */ - lea edx, [ebp+KTRAP_FRAME_ESP] - mov ax, [ebp+KTRAP_FRAME_ERROR_CODE] - and ax, ~RPL_MASK - - /* Get CS */ - mov cx, word ptr [edx+4] - and cx, ~RPL_MASK - cmp cx, ax - jnz ShouldNotGetHere - - /* This should be a Ki386CallBios return */ - mov eax, offset @Ki386BiosCallReturnAddress@4 - cmp eax, [edx] - jne ShouldNotGetHere - mov eax, [edx+4] - cmp ax, KGDT_R0_CODE + RPL_MASK - jne ShouldNotGetHere - - /* Jump to return address */ - mov ecx, ebp - jmp @Ki386BiosCallReturnAddress@4 - -_Ki16BitStackException: -ShouldNotGetHere: - /* FIXME */ - UNHANDLED_PATH "Other GPF stuff" -.endfunc - -GENERATE_TRAP_HANDLER KiTrap14, 0 -GENERATE_TRAP_HANDLER KiTrap0F, 1 -GENERATE_TRAP_HANDLER KiTrap16, 1 -GENERATE_TRAP_HANDLER KiTrap17, 1 -GENERATE_TRAP_HANDLER KiTrap19, 1 +GENERATE_TRAP_HANDLER KiTrap00 +GENERATE_TRAP_HANDLER KiTrap01 +GENERATE_TRAP_HANDLER KiTrap03 +GENERATE_TRAP_HANDLER KiTrap04 +GENERATE_TRAP_HANDLER KiTrap05 +GENERATE_TRAP_HANDLER KiTrap06 +GENERATE_TRAP_HANDLER KiTrap07 +GENERATE_TRAP_HANDLER KiTrap08, 0 +GENERATE_TRAP_HANDLER KiTrap09 +GENERATE_TRAP_HANDLER KiTrap0A, 0 +GENERATE_TRAP_HANDLER KiTrap0B, 0 +GENERATE_TRAP_HANDLER KiTrap0C, 0 +GENERATE_TRAP_HANDLER KiTrap0D, 0, 1 +GENERATE_TRAP_HANDLER KiTrap0E, 0 +GENERATE_TRAP_HANDLER KiTrap0F +GENERATE_TRAP_HANDLER KiTrap10 +GENERATE_TRAP_HANDLER KiTrap11 +GENERATE_TRAP_HANDLER KiTrap13 /* UNEXPECTED INTERRUPT HANDLERS **********************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Jan 12 06:50:45 2010 @@ -203,13 +203,13 @@ FASTCALL KiEnterV86Trap(IN PKTRAP_FRAME TrapFrame) { - /* Save registers */ - KiTrapFrameFromPushaStack(TrapFrame); - /* Load correct registers */ Ke386SetFs(KGDT_R0_PCR); Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); + + /* Save registers */ + KiTrapFrameFromPushaStack(TrapFrame); /* Save exception list and bogus previous mode */ TrapFrame->PreviousPreviousMode = -1; @@ -283,17 +283,32 @@ FASTCALL KiEnterTrap(IN PKTRAP_FRAME TrapFrame) { + ULONG Ds, Es; + + /* + * We really have to get a good DS/ES first before touching any data. + * + * These two reads will either go in a register (with optimizations ON) or + * a stack variable (which is on SS:ESP, guaranteed to be good/valid). + * + * Because the assembly is marked volatile, the order of instructions is + * as-is, otherwise the optimizer could simply get rid of our DS/ES. + * + */ + Ds = Ke386GetDs(); + Es = Ke386GetEs(); + Ke386SetDs(KGDT_R3_DATA | RPL_MASK); + Ke386SetEs(KGDT_R3_DATA | RPL_MASK); + TrapFrame->SegDs = Ds; + TrapFrame->SegEs = Es; + + /* Now we can save the other segments and then switch to the correct FS */ + TrapFrame->SegFs = Ke386GetFs(); + TrapFrame->SegGs = Ke386GetGs(); + Ke386SetFs(KGDT_R0_PCR); + /* Save registers */ KiTrapFrameFromPushaStack(TrapFrame); - - /* Save segments and then switch to correct ones */ - TrapFrame->SegFs = Ke386GetFs(); - TrapFrame->SegGs = Ke386GetGs(); - TrapFrame->SegDs = Ke386GetDs(); - TrapFrame->SegEs = Ke386GetEs(); - Ke386SetFs(KGDT_R0_PCR); - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); /* Save exception list and bogus previous mode */ TrapFrame->PreviousPreviousMode = -1; @@ -568,7 +583,7 @@ VOID FASTCALL -KiTrap0Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap00Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -587,7 +602,7 @@ VOID FASTCALL -KiTrap1Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap01Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -606,7 +621,7 @@ } VOID -KiTrap2(VOID) +KiTrap02(VOID) { PKTSS Tss, NmiTss; PKTHREAD Thread; @@ -752,7 +767,7 @@ VOID FASTCALL -KiTrap3Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap03Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -763,7 +778,7 @@ VOID FASTCALL -KiTrap4Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap04Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -782,7 +797,7 @@ VOID FASTCALL -KiTrap5Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap05Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -804,7 +819,7 @@ VOID FASTCALL -KiTrap6Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap06Handler(IN PKTRAP_FRAME TrapFrame) { PUCHAR Instruction; ULONG i; @@ -849,7 +864,7 @@ VOID FASTCALL -KiTrap7Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap07Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread, NpxThread; PFX_SAVE_AREA SaveArea, NpxSaveArea; @@ -958,7 +973,7 @@ VOID FASTCALL -KiTrap8Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap08Handler(IN PKTRAP_FRAME TrapFrame) { /* FIXME: Not handled */ KiSystemFatalException(EXCEPTION_DOUBLE_FAULT, TrapFrame); @@ -966,7 +981,7 @@ VOID FASTCALL -KiTrap9Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap09Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -978,7 +993,7 @@ VOID FASTCALL -KiTrap10Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap0AHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -992,7 +1007,7 @@ VOID FASTCALL -KiTrap11Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap0BHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -1004,7 +1019,7 @@ VOID FASTCALL -KiTrap12Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap0CHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -1016,7 +1031,8 @@ VOID FASTCALL -KiTrap13Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame, + IN ULONG EFlags) { ULONG i, j, Iopl; BOOLEAN Privileged = FALSE; @@ -1025,7 +1041,7 @@ KIRQL OldIrql; /* Check for V86 GPF */ - if (TrapFrame->EFlags & EFLAGS_V86_MASK) + if (EFlags & EFLAGS_V86_MASK) { /* Enter V86 trap */ KiEnterV86Trap(TrapFrame); @@ -1064,16 +1080,13 @@ /* Exit trap the slow way */ KiEoiHelper(TrapFrame); } - + /* Save trap frame */ KiEnterTrap(TrapFrame); /* Check for user-mode GPF */ if (KiUserTrap(TrapFrame)) - { - /* Must be user-mode! */ - if (!KiUserTrap(TrapFrame)) KiSystemFatalException(EXCEPTION_GP_FAULT, TrapFrame); - + { /* Should not be VDM */ ASSERT(KiVdmTrap(TrapFrame) == FALSE); @@ -1204,8 +1217,8 @@ * with an invalid CS, which will generate another GPF instead. * */ - if (((PVOID)TrapFrame->Eip >= (PVOID)KiTrap13Handler) && - ((PVOID)TrapFrame->Eip < (PVOID)KiTrap13Handler)) + if (((PVOID)TrapFrame->Eip >= (PVOID)KiTrap0DHandler) && + ((PVOID)TrapFrame->Eip < (PVOID)KiTrap0DHandler)) { /* Not implemented */ UNIMPLEMENTED; @@ -1298,7 +1311,7 @@ VOID FASTCALL -KiTrap14Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; ULONG_PTR Cr2; @@ -1432,7 +1445,7 @@ VOID FASTCALL -KiTrap16Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap10Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; PFX_SAVE_AREA SaveArea; @@ -1459,7 +1472,7 @@ VOID FASTCALL -KiTrap17Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap11Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -1471,7 +1484,7 @@ VOID FASTCALL -KiTrap19Handler(IN PKTRAP_FRAME TrapFrame) +KiTrap13Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; PFX_SAVE_AREA SaveArea; Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Tue Jan 12 06:50:45 2010 @@ -623,9 +623,7 @@ Tss->IoMapBase = (USHORT)IOPM_OFFSET; /* Switch stacks and work the magic */ - DPRINT1("Entering V86 mode\n"); Ki386SetupAndExitToV86Mode(VdmTeb); - DPRINT1("Left V86 mode\n"); /* Restore IOPM */ RtlCopyMemory(&Tss->IoMaps[0].IoMap, Ki386IopmSaveArea, PAGE_SIZE * 2);

14 years, 8 months

[jimtabor] 45051: [Win32k] - More movement to WND with updates to related files. Removed unused code rewritten others. Review patch.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jan 12 06:25:22 2010 New Revision: 45051 URL: http://svn.reactos.org/svn/reactos?rev=45051&view=rev Log: [Win32k] - More movement to WND with updates to related files. Removed unused code rewritten others. Review patch. Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/include/engobjects.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -16,26 +16,25 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI WNDOBJ Functions - * FILE: subsys/win32k/eng/window.c + * FILE: subsystems/win32/win32k/eng/engwindow.c * PROGRAMER: Gregor Anich * REVISION HISTORY: * 16/11/2004: Created */ /* TODO: Check how the WNDOBJ implementation should behave with a driver on windows. - - Simple! Use Prop's! */ #include <w32k.h> #define NDEBUG #include <debug.h> + +INT gcountPWO = 0; /* * Calls the WNDOBJCHANGEPROC of the given WNDOBJ @@ -153,44 +152,41 @@ PWINDOW_OBJECT Window, FLONG flChanged) { - PLIST_ENTRY CurrentEntry; WNDGDI *Current; + HWND hWnd; ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); - CurrentEntry = Window->WndObjListHead.Flink; - while (CurrentEntry != &Window->WndObjListHead) - { - Current = CONTAINING_RECORD(CurrentEntry, WNDGDI, ListEntry); - - if (Current->WndObj.pvConsumer != NULL) - { - /* Update the WNDOBJ */ - switch (flChanged) - { - case WOC_RGN_CLIENT: - /* Update the clipobj and client rect of the WNDOBJ */ - IntEngWndUpdateClipObj(Current, Window); - break; - - case WOC_DELETE: - /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ - break; - } - - /* Call the change proc */ - IntEngWndCallChangeProc(&Current->WndObj, flChanged); - - /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ - if (flChanged == WOC_RGN_CLIENT) - { - IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); - } - - CurrentEntry = CurrentEntry->Flink; - } - } - + hWnd = Window->hSelf; // pWnd->head.h; + Current = (WNDGDI *)IntGetProp(Window, AtomWndObj); + + if ( gcountPWO && + Current && + Current->Hwnd == hWnd && + Current->WndObj.pvConsumer != NULL ) + { + /* Update the WNDOBJ */ + switch (flChanged) + { + case WOC_RGN_CLIENT: + /* Update the clipobj and client rect of the WNDOBJ */ + IntEngWndUpdateClipObj(Current, Window); + break; + + case WOC_DELETE: + /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ + break; + } + + /* Call the change proc */ + IntEngWndCallChangeProc(&Current->WndObj, flChanged); + + /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ + if (flChanged == WOC_RGN_CLIENT) + { + IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); + } + } } /* @@ -254,7 +250,8 @@ WndObjInt->PixelFormat = iPixelFormat; /* associate object with window */ - InsertTailList(&Window->WndObjListHead, &WndObjInt->ListEntry); + IntSetProp(Window, AtomWndObj, WndObjInt); + ++gcountPWO; DPRINT("EngCreateWnd: SUCCESS!\n"); @@ -292,15 +289,15 @@ /* Get window object */ Window = UserGetWindowObject(WndObjInt->Hwnd); if (Window == NULL) - { - DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); - RemoveEntryList(&WndObjInt->ListEntry); - } + { + DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); + } else - { - /* Remove object from window */ - RemoveEntryList(&WndObjInt->ListEntry); - } + { + /* Remove object from window */ + IntRemoveProp(Window, AtomWndObj); + --gcountPWO; + } if (!calledFromUser){ UserLeave(); Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -28,11 +28,16 @@ LIST_ENTRY List; HDC hDC; HWND hwndCurrent; - HWND hwndDC; - HRGN hClipRgn; + PWND pwndOrg; + PWND pwndClip; + PWND pwndRedirect; + HRGN hrgnClip; + HRGN hrgnClipPublic; + HRGN hrgnSavedVis; DWORD DCXFlags; - PEPROCESS pProcess; - HANDLE Self; + PTHREADINFO ptiOwner; + PPROCESSINFO ppiOwner; + struct _MONITOR* pMonitor; } DCE; /* PDCE already declared at top of file */ /* internal DCX flags, see psdk/winuser.h for the rest */ @@ -52,7 +57,6 @@ BOOL FASTCALL DCE_InvalidateDCE(HWND, const PRECTL); HWND FASTCALL IntWindowFromDC(HDC hDc); PDCE FASTCALL DceFreeDCE(PDCE dce, BOOLEAN Force); -void FASTCALL DceFreeWindowDCE(PWINDOW_OBJECT Window); void FASTCALL DceEmptyCache(void); VOID FASTCALL DceResetActiveDCEs(PWINDOW_OBJECT Window); void FASTCALL DceFreeClassDCE(HDC); Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -89,7 +89,6 @@ typedef struct _WNDGDI { WNDOBJ WndObj; - LIST_ENTRY ListEntry; HWND Hwnd; CLIPOBJ *ClientClipObj; WNDOBJCHANGEPROC ChangeProc; Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -14,6 +14,7 @@ #include <include/scroll.h> extern ATOM AtomMessage; +extern ATOM AtomWndObj; /* WNDOBJ list */ BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam); @@ -29,8 +30,6 @@ PTHREADINFO pti; // Use Wnd->head.pti /* system menu handle. */ HMENU SystemMenu; - /* Entry in the thread's list of windows. */ - LIST_ENTRY ListEntry; /* Handle for the window. */ HWND hSelf; // Use Wnd->head.h /* Window flags. */ @@ -42,19 +41,16 @@ struct _WINDOW_OBJECT* spwndChild; struct _WINDOW_OBJECT* spwndNext; struct _WINDOW_OBJECT* spwndPrev; - /* Entry in the list of thread windows. */ - LIST_ENTRY ThreadListEntry; /* Handle to the parent window. */ struct _WINDOW_OBJECT* spwndParent; /* Handle to the owner window. */ HWND hOwner; // Use spwndOwner - /* DC Entries (DCE) */ - PDCE Dce; + + /* Scrollbar info */ PSBINFOEX pSBInfo; // convert to PSBINFO - PETHREAD OwnerThread; // Use Wnd->head.pti->pEThread - /* WNDOBJ list */ - LIST_ENTRY WndObjListHead; // Use Props + /* Entry in the list of thread windows. */ + LIST_ENTRY ThreadListEntry; } WINDOW_OBJECT; /* PWINDOW_OBJECT already declared at top of file */ /* Window flags. */ @@ -86,16 +82,16 @@ #define IntWndBelongsToThread(WndObj, W32Thread) \ - (((WndObj->OwnerThread && WndObj->OwnerThread->Tcb.Win32Thread)) && \ - (WndObj->OwnerThread->Tcb.Win32Thread == W32Thread)) + (((WndObj->pti->pEThread && WndObj->pti->pEThread->Tcb.Win32Thread)) && \ + (WndObj->pti->pEThread->Tcb.Win32Thread == W32Thread)) // ((WndObj->head.pti) && (WndObj->head.pti == W32Thread)) #define IntGetWndThreadId(WndObj) \ - WndObj->OwnerThread->Cid.UniqueThread + WndObj->pti->pEThread->Cid.UniqueThread // WndObj->head.pti->pEThread->Cid.UniqueThread #define IntGetWndProcessId(WndObj) \ - WndObj->OwnerThread->ThreadsProcess->UniqueProcessId + WndObj->pti->pEThread->ThreadsProcess->UniqueProcessId // WndObj->head.pti->pEThread->ThreadsProcess->UniqueProcessId BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -245,7 +245,7 @@ if (Window) ASSERT_REFS_CO(Window); - if(Window && Window->OwnerThread != PsGetCurrentThread()) + if(Window && Window->pti->pEThread != PsGetCurrentThread()) { SetLastWin32Error(ERROR_ACCESS_DENIED); return FALSE; @@ -280,7 +280,7 @@ if (Window) ASSERT_REFS_CO(Window); - if(Window && Window->OwnerThread != PsGetCurrentThread()) + if(Window && Window->pti->pEThread != PsGetCurrentThread()) { SetLastWin32Error(ERROR_ACCESS_DENIED); return FALSE; @@ -332,7 +332,7 @@ RETURN(FALSE); } - if(Window->OwnerThread != PsGetCurrentThread()) + if(Window->pti->pEThread != PsGetCurrentThread()) { SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN(FALSE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -217,7 +217,7 @@ } if (0 == (Wnd->style & WS_VISIBLE) && - Window->OwnerThread->ThreadsProcess != CsrProcess) + Window->pti->pEThread->ThreadsProcess != CsrProcess) { DPRINT("Failed - Invisible\n"); return FALSE; @@ -339,7 +339,7 @@ { Wnd = Window->Wnd; if ((!(Wnd->style & WS_VISIBLE) && - Window->OwnerThread->ThreadsProcess != CsrProcess) || + Window->pti->pEThread->ThreadsProcess != CsrProcess) || (Wnd->style & (WS_POPUP | WS_CHILD)) == WS_CHILD) { return ThreadQueue ? 0 : ThreadQueue->ActiveWindow; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: HotKey support @@ -182,7 +181,7 @@ { RETURN( FALSE); } - HotKeyThread = Window->OwnerThread; + HotKeyThread = Window->pti->pEThread; } /* Check for existing hotkey */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -191,6 +191,14 @@ Monitor->rcWork = Monitor->rcMonitor; Monitor->cWndStack = 0; + Monitor->hrgnMonitor= NtGdiCreateRectRgn( Monitor->rcMonitor.left, + Monitor->rcMonitor.top, + Monitor->rcMonitor.right, + Monitor->rcMonitor.bottom ); + + // Replace with IntGdiSetRegeionOwner(Monitor->hrgnMonitor, GDI_OBJ_HMGR_PUBLIC); + GDIOBJ_SetOwnership(Monitor->hrgnMonitor, NULL); + if (gMonitorList == NULL) { DPRINT("Primary monitor is beeing attached\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -20,6 +20,7 @@ ERESOURCE UserLock; ATOM AtomMessage; // Window Message atom. +ATOM AtomWndObj; // Window Object atom. BOOL gbInitialized; HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; @@ -44,6 +45,8 @@ /* System Context Help Id Atom */ gpsi->atomContextHelpIdProp = IntAddGlobalAtom(L"SysCH", TRUE); + + AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE); return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -199,7 +199,7 @@ if (!pTmr) return 0; if (Window && (Type & TMRF_TIFROMWND)) - pTmr->pti = Window->OwnerThread->Tcb.Win32Thread; + pTmr->pti = Window->pti->pEThread->Tcb.Win32Thread; else { if (Type & TMRF_RIT) @@ -253,7 +253,7 @@ UINT uElapse, TIMERPROC lpTimerFunc) { - if (Window && Window->OwnerThread->ThreadsProcess != PsGetCurrentProcess()) + if (Window && Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { SetLastWin32Error(ERROR_ACCESS_DENIED); return 0; @@ -419,7 +419,7 @@ return 0; } - if (Window->OwnerThread->ThreadsProcess != PsGetCurrentProcess()) + if (Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { DPRINT1("Trying to set timer for window in another process (shatter attack?)\n"); SetLastWin32Error(ERROR_ACCESS_DENIED); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -89,8 +89,13 @@ } pDce->hwndCurrent = (Window ? Window->hSelf : NULL); - pDce->hClipRgn = NULL; - pDce->pProcess = NULL; + pDce->pwndOrg = Wnd; + pDce->pwndClip = Wnd; + pDce->hrgnClip = NULL; + pDce->hrgnClipPublic = NULL; + pDce->hrgnSavedVis = NULL; + pDce->ptiOwner = NULL; + pDce->ppiOwner = NULL; KeEnterCriticalRegion(); if (FirstDce == NULL) @@ -105,8 +110,9 @@ DCU_SetDcUndeletable(pDce->hDC); if (Type == DCE_WINDOW_DC || Type == DCE_CLASS_DC) //Window DCE have ownership. - { // Process should already own it. - pDce->pProcess = PsGetCurrentProcess(); + { + pDce->ptiOwner = GetW32ThreadInfo(); + pDce->ppiOwner = pDce->ptiOwner->ppi; } else { @@ -174,12 +180,12 @@ { Dce->DCXFlags &= ~DCX_KEEPCLIPRGN; } - else if (Dce->hClipRgn != NULL) - { - GreDeleteObject(Dce->hClipRgn); - } - - Dce->hClipRgn = NULL; + else if (Dce->hrgnClip != NULL) + { + GreDeleteObject(Dce->hrgnClip); + } + + Dce->hrgnClip = NULL; /* make it dirty so that the vis rgn gets recomputed next time */ Dce->DCXFlags |= DCX_DCEDIRTY; @@ -225,7 +231,8 @@ DPRINT("Exit!!!!! DCX_CACHE!!!!!! hDC-> %x \n", dce->hDC); if (!IntGdiSetDCOwnerEx( dce->hDC, GDI_OBJ_HMGR_NONE, FALSE)) return 0; - dce->pProcess = NULL; // Reset ownership. + dce->ptiOwner = NULL; // Reset ownership. + dce->ppiOwner = NULL; } return 1; // Released! } @@ -282,9 +289,9 @@ noparent: if (Flags & DCX_INTERSECTRGN) { - if(Dce->hClipRgn != NULL) - { - NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hClipRgn, RGN_AND); + if(Dce->hrgnClip != NULL) + { + NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hrgnClip, RGN_AND); } else { @@ -296,9 +303,9 @@ } } - if (Flags & DCX_EXCLUDERGN && Dce->hClipRgn != NULL) - { - NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hClipRgn, RGN_DIFF); + if (Flags & DCX_EXCLUDERGN && Dce->hrgnClip != NULL) + { + NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hrgnClip, RGN_DIFF); } Dce->DCXFlags &= ~DCX_DCEDIRTY; @@ -495,7 +502,7 @@ DPRINT("Owned/Class DCE\n"); /* we should free dce->clip_rgn here, but Windows apparently doesn't */ Dce->DCXFlags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN); - Dce->hClipRgn = NULL; + Dce->hrgnClip = NULL; } #if 1 /* FIXME */ @@ -524,7 +531,7 @@ } #if 0 - if (NULL != Dce->hClipRgn) + if (NULL != Dce->hrgnClip) { DceDeleteClipRgn(Dce); } @@ -543,17 +550,17 @@ { if (!(Flags & DCX_WINDOW)) { - Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->rcClient); + Dce->hrgnClip = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->rcClient); } else { - Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->rcWindow); + Dce->hrgnClip = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->rcWindow); } Dce->DCXFlags &= ~DCX_KEEPCLIPRGN; } else if (ClipRegion != NULL) { - Dce->hClipRgn = ClipRegion; + Dce->hrgnClip = ClipRegion; } DceSetDrawable(Window, Dce->hDC, Flags, UpdateClipOrigin); @@ -568,7 +575,8 @@ DPRINT("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %x\n", Dce->hDC); // Need to set ownership so Sync dcattr will work. IntGdiSetDCOwnerEx( Dce->hDC, GDI_OBJ_HMGR_POWNED, FALSE); - Dce->pProcess = PsGetCurrentProcess(); // Set the temp owning process + Dce->ptiOwner = GetW32ThreadInfo(); // Set the temp owning + Dce->ppiOwner = Dce->ptiOwner->ppi; } return(Dce->hDC); } @@ -607,9 +615,9 @@ if (!Hit) IntGdiDeleteDC(pdce->hDC, TRUE); - if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) - { - GreDeleteObject(pdce->hClipRgn); + if (pdce->hrgnClip && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) + { + GreDeleteObject(pdce->hrgnClip); } RemoveEntryList(&pdce->List); @@ -624,73 +632,6 @@ ExFreePoolWithTag(pdce, TAG_PDCE); return ret; -} - - -/*********************************************************************** - * DceFreeWindowDCE - * - * Remove owned DCE and reset unreleased cache DCEs. - */ -void FASTCALL -DceFreeWindowDCE(PWINDOW_OBJECT Window) -{ - PDCE pDCE; - - pDCE = FirstDce; - KeEnterCriticalRegion(); - do - { - if (!pDCE) break; - if (pDCE->hwndCurrent == Window->hSelf) - { - if (!(pDCE->DCXFlags & DCX_CACHE)) /* owned or Class DCE*/ - { - if (Window->Wnd->pcls->style & CS_CLASSDC || - Window->Wnd->style & CS_CLASSDC) /* Test Class first */ - { - if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ - DceDeleteClipRgn(pDCE); - // Update and reset Vis Rgn and clear the dirty bit. - // Should release VisRgn than reset it to default. - DceUpdateVisRgn(pDCE, Window, pDCE->DCXFlags); - pDCE->DCXFlags = DCX_DCEEMPTY; - pDCE->hwndCurrent = 0; - } - else if (Window->Wnd->pcls->style & CS_OWNDC || - Window->Wnd->style & CS_OWNDC) /* owned DCE*/ - { - pDCE = DceFreeDCE(pDCE, FALSE); - if (!pDCE) break; - Window->Dce = NULL; - continue; - } - else - { - ASSERT(FALSE); - } - } - else - { - if (pDCE->DCXFlags & DCX_DCEBUSY) /* shared cache DCE */ - { - /* FIXME: AFAICS we are doing the right thing here so - * this should be a DPRINT. But this is best left as an ERR - * because the 'application error' is likely to come from - * another part of Wine (i.e. it's our fault after all). - * We should change this to DPRINT when ReactOS is more stable - * (for 1.0?). - */ - DPRINT1("[%p] GetDC() without ReleaseDC()!\n", Window->hSelf); - DceReleaseDC(pDCE, FALSE); - } - pDCE->DCXFlags |= DCX_DCEEMPTY; - pDCE->hwndCurrent = 0; - } - } - pDCE = (PDCE) pDCE->List.Flink; - } while (pDCE != FirstDce); - KeLeaveCriticalRegion(); } void FASTCALL @@ -789,9 +730,9 @@ NtGdiOffsetRgn(dc->rosdc.hClipRgn, DeltaX, DeltaY); CLIPPING_UpdateGCRegion(dc); } - if (NULL != pDCE->hClipRgn) + if (NULL != pDCE->hrgnClip) { - NtGdiOffsetRgn(pDCE->hClipRgn, DeltaX, DeltaY); + NtGdiOffsetRgn(pDCE->hrgnClip, DeltaX, DeltaY); } } DC_UnlockDc(dc); @@ -869,29 +810,20 @@ HWND FASTCALL UserGethWnd( HDC hdc, PWNDOBJ *pwndo) { - PWNDGDI pWndgdi = NULL; - PWINDOW_OBJECT Wnd = NULL; + PWNDGDI pWndgdi; + PWINDOW_OBJECT Wnd; HWND hWnd; - BOOL Hit = FALSE; - PLIST_ENTRY Entry; + hWnd = IntWindowFromDC(hdc); if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) { - KeEnterCriticalRegion(); - Entry = Wnd->WndObjListHead.Flink; - while (Entry != &Wnd->WndObjListHead) + pWndgdi = (WNDGDI *)IntGetProp(Wnd, AtomWndObj); + + if ( pWndgdi && pWndgdi->Hwnd == hWnd ) { - pWndgdi = (PWNDGDI)Entry; - if (pWndgdi->Hwnd == hWnd) - { - Hit = TRUE; - break; - } - Entry = Entry->Flink; + if (pwndo) *pwndo = (PWNDOBJ)pWndgdi; } - if (pwndo && Hit) *pwndo = (PWNDOBJ)pWndgdi; - KeLeaveCriticalRegion(); } return hWnd; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -478,7 +478,6 @@ Window->SystemMenu = (HMENU)0; } - DceFreeWindowDCE(Window); /* Always do this to catch orphaned DCs */ #if 0 /* FIXME */ WINPROC_FreeProc(Window->winproc, WIN_PROC_WINDOW); @@ -1150,7 +1149,7 @@ // return NULL; /* Window must belong to current process */ - if (Wnd->OwnerThread->ThreadsProcess != PsGetCurrentProcess()) + if (Wnd->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) return NULL; WndOldParent = Wnd->spwndParent; @@ -1948,7 +1947,6 @@ } } - Window->OwnerThread = PsGetCurrentThread(); Window->spwndChild = NULL; Window->spwndPrev = NULL; Window->spwndNext = NULL; @@ -1960,7 +1958,6 @@ Wnd->cbwndExtra = Wnd->pcls->cbwndExtra; InitializeListHead(&Wnd->PropListHead); - InitializeListHead(&Window->WndObjListHead); if ( NULL != WindowName->Buffer && WindowName->Length > 0 ) { @@ -2052,11 +2049,16 @@ InsertTailList (&pti->WindowListHead, &Window->ThreadListEntry); /* Handle "CS_CLASSDC", it is tested first. */ - if ((Wnd->pcls->style & CS_CLASSDC) && !(Wnd->pcls->pdce)) // One DCE per class to have CLASS. - Wnd->pcls->pdce = DceAllocDCE(Window, DCE_CLASS_DC); - /* Allocate a DCE for this window. */ + if ( (Wnd->pcls->style & CS_CLASSDC) && !(Wnd->pcls->pdce) ) + { /* One DCE per class to have CLASS. */ + Wnd->pcls->pdce = DceAllocDCE( Window, DCE_CLASS_DC ); + } else if ( Wnd->pcls->style & CS_OWNDC) - Window->Dce = DceAllocDCE(Window, DCE_WINDOW_DC); + { /* Allocate a DCE for this window. */ + PDCE pDce = DceAllocDCE(Window, DCE_WINDOW_DC); + if (!Wnd->pcls->pdce) + Wnd->pcls->pdce = pDce; + } Pos.x = x; Pos.y = y; @@ -2107,7 +2109,7 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParams; BOOL CalculatedDefPosSize = FALSE; - IntGetDesktopWorkArea(((PTHREADINFO)Window->OwnerThread->Tcb.Win32Thread)->Desktop, &WorkArea); + IntGetDesktopWorkArea(((PTHREADINFO)Window->pti->pEThread->Tcb.Win32Thread)->Desktop, &WorkArea); rc = WorkArea; ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters; @@ -2624,7 +2626,7 @@ DPRINT("co_UserDestroyWindow \n"); /* Check for owner thread */ - if ( (Window->OwnerThread != PsGetCurrentThread()) || + if ( (Window->pti->pEThread != PsGetCurrentThread()) || Wnd->head.pti != PsGetCurrentThreadWin32Thread() ) { SetLastWin32Error(ERROR_ACCESS_DENIED); @@ -3765,7 +3767,7 @@ * WndProc is only available to the owner process */ if (GWL_WNDPROC == Index - && Window->OwnerThread->ThreadsProcess != PsGetCurrentProcess()) + && Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { SetLastWin32Error(ERROR_ACCESS_DENIED); return 0; @@ -3886,7 +3888,7 @@ /* * Remove extended window style bit WS_EX_TOPMOST for shell windows. */ - WindowStation = ((PTHREADINFO)Window->OwnerThread->Tcb.Win32Thread)->Desktop->WindowStation; + WindowStation = Window->pti->Desktop->WindowStation; if(WindowStation) { if (hWnd == WindowStation->ShellWindow || hWnd == WindowStation->ShellListView) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Tue Jan 12 06:25:22 2010 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Windows @@ -120,7 +119,7 @@ if (!Wnd->Wnd) return FALSE; style = Wnd->Wnd->style; if (!(style & WS_VISIBLE) && - Wnd->OwnerThread->ThreadsProcess != CsrProcess) return FALSE; + Wnd->pti->pEThread->ThreadsProcess != CsrProcess) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; return !(style & WS_DISABLED); } @@ -905,7 +904,7 @@ * Only allow CSRSS to mess with the desktop window */ if (Window->hSelf == IntGetDesktopWindow() && - Window->OwnerThread->ThreadsProcess != PsGetCurrentProcess()) + Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { return FALSE; }

14 years, 8 months

[dreimer] 45050: Ok, last time I delete my built main tree while playing with clean in a branch! Now clean cleans the branch you are in!

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jan 11 22:22:52 2010 New Revision: 45050 URL: http://svn.reactos.org/svn/reactos?rev=45050&view=rev Log: Ok, last time I delete my built main tree while playing with clean in a branch! Now clean cleans the branch you are in! Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Mon Jan 11 22:22:52 2010 @@ -25,21 +25,21 @@ # Apply modified obj and out paths for deletion. if ("$_ROSBE_OBJPATH" -eq "") { - $OBJCLEANPATH = "$_ROSBE_ROSSOURCEDIR\obj-$ENV:ROS_ARCH" + $OBJCLEANPATH = "obj-$ENV:ROS_ARCH" } else { $OBJCLEANPATH = "$_ROSBE_OBJPATH" } if ("$_ROSBE_OUTPATH" -eq "") { - $OUTCLEANPATH = "$_ROSBE_ROSSOURCEDIR\output-$ENV:ROS_ARCH" + $OUTCLEANPATH = "output-$ENV:ROS_ARCH" } else { $OUTCLEANPATH = "$_ROSBE_OUTPATH" } if ("$ENV:ROS_ARCH" -eq "i386") { - $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto" + $MAKEFILE = "makefile.auto" } else { - $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto" + $MAKEFILE = "makefile-$ENV:ROS_ARCH.auto" } if (Test-Path "$MAKEFILE") { @@ -59,8 +59,8 @@ "ERROR: There is no $ENV:ROS_ARCH compiler output to clean." } - if (Test-Path "$_ROSBE_ROSSOURCEDIR\reactos") { - $null = (Remove-Item "$_ROSBE_ROSSOURCEDIR\reactos" -recurse -force) + if (Test-Path "reactos") { + $null = (Remove-Item "reactos" -recurse -force) } } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Mon Jan 11 22:22:52 2010 @@ -56,21 +56,21 @@ :: Apply modified obj and out paths for deletion. if "%_ROSBE_OBJPATH%" == "" ( - set OBJCLEANPATH=%_ROSBE_ROSSOURCEDIR%\obj-%ROS_ARCH% + set OBJCLEANPATH=obj-%ROS_ARCH% ) else ( set OBJCLEANPATH=%_ROSBE_OBJPATH% ) if "%_ROSBE_OUTPATH%" == "" ( - set OUTCLEANPATH=%_ROSBE_ROSSOURCEDIR%\output-%ROS_ARCH% + set OUTCLEANPATH=output-%ROS_ARCH% ) else ( set OUTCLEANPATH=%_ROSBE_OUTPATH% ) if /i "%ROS_ARCH%" == "i386" ( - set MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile.auto + set MAKEFILE=makefile.auto ) else ( - set MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto + set MAKEFILE=makefile-%ROS_ARCH%.auto ) if exist "%MAKEFILE%" ( @@ -93,8 +93,8 @@ echo ERROR: There is no %ROS_ARCH% compiler output to clean. ) -if exist "%_ROSBE_ROSSOURCEDIR%\reactos\." ( - rd /s /q "%_ROSBE_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL +if exist "reactos\." ( + rd /s /q "reactos" 1> NUL 2> NUL ) goto :EOF

14 years, 8 months

[fireball] 45049: - Merge Wine-1.1.36 release changes. Besides all usual improvements, all 16 bit stuff has been finally separated and moved to other modules.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jan 11 21:49:34 2010 New Revision: 45049 URL: http://svn.reactos.org/svn/reactos?rev=45049&view=rev Log: - Merge Wine-1.1.36 release changes. Besides all usual improvements, all 16 bit stuff has been finally separated and moved to other modules. Removed: branches/arwinss/reactos/dll/win32/gdi32/gdi_main.c branches/arwinss/reactos/dll/win32/gdi32/metafile16.c branches/arwinss/reactos/dll/win32/user32/dialog16.c branches/arwinss/reactos/dll/win32/user32/msg16.c Modified: branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c branches/arwinss/reactos/dll/win32/gdi32/mapping.c branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/Makefile.in branches/arwinss/reactos/dll/win32/user32/button.c branches/arwinss/reactos/dll/win32/user32/class.c branches/arwinss/reactos/dll/win32/user32/clipboard.c branches/arwinss/reactos/dll/win32/user32/combo.c branches/arwinss/reactos/dll/win32/user32/controls.h branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/dde_misc.c branches/arwinss/reactos/dll/win32/user32/defdlg.c branches/arwinss/reactos/dll/win32/user32/defwnd.c branches/arwinss/reactos/dll/win32/user32/desktop.c branches/arwinss/reactos/dll/win32/user32/dialog.c branches/arwinss/reactos/dll/win32/user32/driver.c branches/arwinss/reactos/dll/win32/user32/edit.c branches/arwinss/reactos/dll/win32/user32/exticon.c branches/arwinss/reactos/dll/win32/user32/hook.c branches/arwinss/reactos/dll/win32/user32/listbox.c branches/arwinss/reactos/dll/win32/user32/mdi.c branches/arwinss/reactos/dll/win32/user32/menu.c branches/arwinss/reactos/dll/win32/user32/message.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/nonclient.c branches/arwinss/reactos/dll/win32/user32/painting.c branches/arwinss/reactos/dll/win32/user32/spy.c branches/arwinss/reactos/dll/win32/user32/static.c branches/arwinss/reactos/dll/win32/user32/sysparams.c branches/arwinss/reactos/dll/win32/user32/uitools.c branches/arwinss/reactos/dll/win32/user32/user32.spec branches/arwinss/reactos/dll/win32/user32/user_main.c branches/arwinss/reactos/dll/win32/user32/user_private.h branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/user32/win.h branches/arwinss/reactos/dll/win32/user32/winpos.c branches/arwinss/reactos/dll/win32/user32/winproc.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/opengl.c branches/arwinss/reactos/dll/win32/winex11.drv/palette.c branches/arwinss/reactos/dll/win32/winex11.drv/systray.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/winex11.drv.spec branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c branches/arwinss/reactos/include/reactos/wine/server_protocol.h branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/object.h branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (contents, props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/gdi_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/metafile16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/user32/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/button.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/class.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/controls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/dde_misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/defdlg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Removed: branches/arwinss/reactos/dll/win32/user32/dialog16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/edit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/mdi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Removed: branches/arwinss/reactos/dll/win32/user32/msg16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/painting.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/spy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/static.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/uitools.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/win.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/opengl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/palette.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/systray.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.drv.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/include/reactos/wine/server_protocol.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

14 years, 8 months

[sir_richard] 45048: [NTOS]: Bring back a simplified GPF handler just for V8086 opcode detection and V8086 exit, to see if this resolves testbot booting.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Jan 11 20:41:50 2010 New Revision: 45048 URL: http://svn.reactos.org/svn/reactos?rev=45048&view=rev Log: [NTOS]: Bring back a simplified GPF handler just for V8086 opcode detection and V8086 exit, to see if this resolves testbot booting. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Mon Jan 11 20:41:50 2010 @@ -885,5 +885,5 @@ mov esp, eax add esp, (12 + KTRAP_FRAME_LENGTH + NPX_FRAME_LENGTH) popad - ret - + ret 4 + Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Mon Jan 11 20:41:50 2010 @@ -585,7 +585,110 @@ GENERATE_TRAP_HANDLER KiTrap10, 0 GENERATE_TRAP_HANDLER KiTrap11, 0 GENERATE_TRAP_HANDLER KiTrap12, 0 -GENERATE_TRAP_HANDLER KiTrap13, 0 + +//GENERATE_TRAP_HANDLER KiTrap13, 0 + +.func KiTrap13 +TRAP_FIXUPS kitd_a, kitd_t, DoFixupV86, DoNotFixupAbios +_KiTrap13: + + /* It this a V86 GPF? */ + test dword ptr [esp+12], EFLAGS_V86_MASK + jz NotV86 + + /* Enter V86 Trap */ + V86_TRAP_PROLOG kitd_a, kitd_v + + /* Make sure that this is a V86 process */ + mov ecx, PCR[KPCR_CURRENT_THREAD] + mov ecx, [ecx+KTHREAD_APCSTATE_PROCESS] + cmp dword ptr [ecx+EPROCESS_VDM_OBJECTS], 0 + jz ShouldNotGetHere + +RaiseIrql: + + /* Go to APC level */ + mov ecx, APC_LEVEL + call @KfRaiseIrql@4 + + /* Save old IRQL and enable interrupts */ + push eax + sti + + /* Handle the opcode */ + mov ecx, ebp + call @Ki386HandleOpcodeV86@4 + + /* Check if this was VDM */ + test al, 0xFF + jz ShouldNotGetHere + +NoReflect: + + /* Lower IRQL and disable interrupts */ + pop ecx + call @KfLowerIrql@4 + cli + + /* Check if this was a V86 trap */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jz NotV86Trap + + /* Exit the V86 Trap */ + V86_TRAP_EPILOG + +NotV86Trap: + + /* Either this wasn't V86, or it was, but an APC interrupted us */ + jmp _Kei386EoiHelper@0 + +NotV86: + /* Enter trap */ + TRAP_PROLOG kitd_a, kitd_t + + /* Check if this was from kernel-mode */ + test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jnz ShouldNotGetHere + + /* Get the opcode and trap frame */ +KmodeGpf: + mov eax, [ebp+KTRAP_FRAME_EIP] + mov eax, [eax] + mov edx, [ebp+KTRAP_FRAME_EBP] + + /* Was it IRETD? */ + cmp al, 0xCF + jne ShouldNotGetHere + + /* Get error code */ + lea edx, [ebp+KTRAP_FRAME_ESP] + mov ax, [ebp+KTRAP_FRAME_ERROR_CODE] + and ax, ~RPL_MASK + + /* Get CS */ + mov cx, word ptr [edx+4] + and cx, ~RPL_MASK + cmp cx, ax + jnz ShouldNotGetHere + + /* This should be a Ki386CallBios return */ + mov eax, offset @Ki386BiosCallReturnAddress@4 + cmp eax, [edx] + jne ShouldNotGetHere + mov eax, [edx+4] + cmp ax, KGDT_R0_CODE + RPL_MASK + jne ShouldNotGetHere + + /* Jump to return address */ + mov ecx, ebp + jmp @Ki386BiosCallReturnAddress@4 + +_Ki16BitStackException: +ShouldNotGetHere: + /* FIXME */ + UNHANDLED_PATH "Other GPF stuff" +.endfunc + GENERATE_TRAP_HANDLER KiTrap14, 0 GENERATE_TRAP_HANDLER KiTrap0F, 1 GENERATE_TRAP_HANDLER KiTrap16, 1 Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Mon Jan 11 20:41:50 2010 @@ -623,7 +623,9 @@ Tss->IoMapBase = (USHORT)IOPM_OFFSET; /* Switch stacks and work the magic */ + DPRINT1("Entering V86 mode\n"); Ki386SetupAndExitToV86Mode(VdmTeb); + DPRINT1("Left V86 mode\n"); /* Restore IOPM */ RtlCopyMemory(&Tss->IoMaps[0].IoMap, Ki386IopmSaveArea, PAGE_SIZE * 2);

14 years, 8 months

[tkreuzer] 45047: [HAL] - Move x86 emulator definitions into their own header - Fix handling of the real mode IDT in x86BiosCall - Implement HalpBiosDisplayReset - Fix a copy paste error

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 11 20:29:16 2010 New Revision: 45047 URL: http://svn.reactos.org/svn/reactos?rev=45047&view=rev Log: [HAL] - Move x86 emulator definitions into their own header - Fix handling of the real mode IDT in x86BiosCall - Implement HalpBiosDisplayReset - Fix a copy paste error Added: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86emu.h (with props) Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c [iso-8859-1] Mon Jan 11 20:29:16 2010 @@ -12,6 +12,8 @@ //#define NDEBUG #include <debug.h> +#include "x86emu.h" + /* This page serves as fallback for pages used by Mm */ #define DEFAULT_PAGE 0x21 @@ -20,6 +22,24 @@ BOOLEAN x86BiosIsInitialized; LONG x86BiosBufferIsAllocated = 0; PUCHAR x86BiosMemoryMapping; + + +VOID +NTAPI +DbgDumpPage(PUCHAR MemBuffer, USHORT Segment) +{ + ULONG x, y, Offset; + + for (y = 0; y < 0x100; y++) + { + for (x = 0; x < 0x10; x++) + { + Offset = Segment * 16 + y * 16 + x; + DbgPrint("%02x ", MemBuffer[Offset]); + } + DbgPrint("\n"); + } +} VOID NTAPI @@ -62,7 +82,7 @@ { /* Check if the memory type is firmware */ if (Descriptor->MemoryType != LoaderFirmwarePermanent && - Descriptor->MemoryType != LoaderFirmwarePermanent) + Descriptor->MemoryType != LoaderSpecialMemory) { /* It's something else, so don't use it! */ Last = min(Descriptor->BasePage + Descriptor->PageCount, 0x100); @@ -82,13 +102,16 @@ ASSERT(x86BiosMemoryMapping); DPRINT1("memory: %p, %p\n", *(PVOID*)x86BiosMemoryMapping, *(PVOID*)(x86BiosMemoryMapping + 8)); + //DbgDumpPage(x86BiosMemoryMapping, 0xc351); x86BiosIsInitialized = TRUE; -} - -NTSTATUS -NTAPI -x86BiosAllocateBuffer ( + + HalpBiosDisplayReset(); +} + +NTSTATUS +NTAPI +x86BiosAllocateBuffer( ULONG *Size, USHORT *Segment, USHORT *Offset) @@ -117,7 +140,7 @@ NTSTATUS NTAPI -x86BiosFreeBuffer ( +x86BiosFreeBuffer( USHORT Segment, USHORT Offset) { @@ -141,7 +164,7 @@ NTSTATUS NTAPI -x86BiosReadMemory ( +x86BiosReadMemory( USHORT Segment, USHORT Offset, PVOID Buffer, @@ -168,7 +191,7 @@ NTSTATUS NTAPI -x86BiosWriteMemory ( +x86BiosWriteMemory( USHORT Segment, USHORT Offset, PVOID Buffer, @@ -193,97 +216,18 @@ return STATUS_SUCCESS; } -typedef struct -{ - union - { - ULONG Eax; - USHORT Ax; - struct - { - UCHAR Al; - UCHAR Ah; - }; - }; - union - { - ULONG Ecx; - USHORT Cx; - struct - { - UCHAR Cl; - UCHAR Ch; - }; - }; - union - { - ULONG Edx; - USHORT Dx; - struct - { - UCHAR Dl; - UCHAR Dh; - }; - }; - union - { - ULONG Ebx; - USHORT Bx; - struct - { - UCHAR Bl; - UCHAR Bh; - }; - }; - ULONG Ebp; - ULONG Esi; - ULONG Edi; - USHORT SegDs; - USHORT SegEs; - - /* Extended */ - union - { - ULONG Eip; - USHORT Ip; - }; - - union - { - ULONG Esp; - USHORT Sp; - }; - -} X86_REGISTERS, *PX86_REGISTERS; - -enum -{ - X86_VMFLAGS_RETURN_ON_IRET = 1, -}; - -typedef struct -{ - union - { - X86_BIOS_REGISTERS BiosRegisters; - X86_REGISTERS Registers; - }; - - struct - { - ULONG ReturnOnIret:1; - } Flags; - - PVOID MemBuffer; -} X86_VM_STATE, *PX86_VM_STATE; - BOOLEAN NTAPI -x86BiosCall ( +x86BiosCall( ULONG InterruptNumber, X86_BIOS_REGISTERS *Registers) { X86_VM_STATE VmState; + struct + { + USHORT Ip; + USHORT SegCs; + } *InterrupTable; /* Zero the VmState */ RtlZeroMemory(&VmState, sizeof(VmState)); @@ -294,9 +238,18 @@ /* Set the physical memory buffer */ VmState.MemBuffer = x86BiosMemoryMapping; + /* Set Eflags */ + VmState.Registers.Eflags.Long = 0; // FIXME + + /* Setup stack */ + VmState.Registers.SegSs = 0; // FIXME + VmState.Registers.Sp = 0x2000 - 2; // FIXME + /* Initialize IP from the interrupt vector table */ - VmState.Registers.Ip = ((PUSHORT)x86BiosMemoryMapping)[InterruptNumber]; - + InterrupTable = (PVOID)x86BiosMemoryMapping; + VmState.Registers.SegCs = InterrupTable[InterruptNumber].SegCs; + VmState.Registers.Eip = InterrupTable[InterruptNumber].Ip; + /* Make the function return on IRET */ VmState.Flags.ReturnOnIret = 1; @@ -313,7 +266,24 @@ NTAPI HalpBiosDisplayReset(VOID) { - UNIMPLEMENTED; + X86_BIOS_REGISTERS Registers; + ULONG OldEflags; + + /* Save flags and disable interrupts */ + OldEflags = __readeflags(); + _disable(); + + /* Set AH = 0 (Set video mode), AL = 0x12 (640x480x16 vga) */ + Registers.Eax = 0x12; + + /* Call INT 0x10 */ + x86BiosCall(0x10, &Registers); + + // FIXME: check result + + /* Restore previous flags */ + __writeeflags(OldEflags); + return TRUE; } Added: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86emu.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86emu.h (added) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86emu.h [iso-8859-1] Mon Jan 11 20:29:16 2010 @@ -1,0 +1,221 @@ + +typedef union +{ + USHORT Short; + ULONG Long; + struct + { + ULONG Cf:1; + ULONG Pf:1; + ULONG Af:1; + ULONG Zf:1; + ULONG Sf:1; + ULONG Tf:1; + ULONG If:1; + ULONG Df:1; + ULONG Of:1; + ULONG Iopl:3; + ULONG Nt:1; + ULONG Rf:1; + ULONG Vm:1; + ULONG Ac:1; + ULONG Vif:1; + ULONG Vip:1; + ULONG Id:1; + }; +} EFLAGS; + +typedef union +{ + ULONG Dword; + USHORT Word; + UCHAR Byte; + struct + { + UCHAR Low; + UCHAR High; + }; +} REGU; + +typedef union +{ + struct + { + UCHAR mod:2; + UCHAR reg:3; + UCHAR rm:3; + }; + UCHAR Byte; +} MODRM; + +typedef struct +{ + union + { + ULONG Eax; + USHORT Ax; + struct + { + UCHAR Al; + UCHAR Ah; + }; + }; + union + { + ULONG Ecx; + USHORT Cx; + struct + { + UCHAR Cl; + UCHAR Ch; + }; + }; + union + { + ULONG Edx; + USHORT Dx; + struct + { + UCHAR Dl; + UCHAR Dh; + }; + }; + union + { + ULONG Ebx; + USHORT Bx; + struct + { + UCHAR Bl; + UCHAR Bh; + }; + }; + union + { + ULONG Ebp; + USHORT Bp; + }; + union + { + ULONG Esi; + USHORT Si; + }; + union + { + ULONG Edi; + USHORT Di; + }; + union + { + struct + { + ULONG ReservedDsMBZ:4; + ULONG SegDs:16; + }; + ULONG ShiftedDs; + }; + union + { + struct + { + ULONG ReservedEsMBZ:4; + ULONG SegEs:16; + }; + ULONG ShiftedEs; + }; + + /* Extended */ + union + { + struct + { + ULONG ReservedCsMBZ:4; + ULONG SegCs:16; + }; + ULONG ShiftedCs; + }; + union + { + struct + { + ULONG ReservedSsMBZ:4; + ULONG SegSs:16; + }; + ULONG ShiftedSs; + }; + + union + { + struct + { + ULONG ReservedMsMBZ:4; + ULONG SegMs:16; + }; + ULONG ShiftedMs; + }; + + union + { + ULONG Eip; + USHORT Ip; + }; + + union + { + ULONG Esp; + USHORT Sp; + }; + + EFLAGS Eflags; + +} X86_REGISTERS, *PX86_REGISTERS; + +enum +{ + X86_VMFLAGS_RETURN_ON_IRET = 1, +}; + +typedef struct +{ + union + { + X86_BIOS_REGISTERS BiosRegisters; + X86_REGISTERS Registers; + REGU IndexedRegisters[8]; + }; + + struct + { + ULONG ReturnOnIret:1; + } Flags; + + PVOID MemBuffer; + +#if 1 + PCHAR Mnemonic; + PCHAR DstReg; + PCHAR SrcReg; + ULONG SrcEncodung; + ULONG DstEncoding; + ULONG Length; +#endif +} X86_VM_STATE, *PX86_VM_STATE; + +enum +{ + PREFIX_SIZE_OVERRIDE = 0x010001, + PREFIX_ADDRESS_OVERRIDE = 0x020002, + PREFIX_SEGMENT_CS = 0x040004, + PREFIX_SEGMENT_DS = 0x040008, + PREFIX_SEGMENT_ES = 0x040010, + PREFIX_SEGMNET_FS = 0x040020, + PREFIX_SEGMENT_GS = 0x040040, + PREFIX_SEGMENT_SS = 0x040080, + PREFIX_LOCK = 0x080100, + PREFIX_REP = 0x100200, +} PREFIX_STATE; + + +VOID +NTAPI +x86Emulator(PX86_VM_STATE VmState); Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86emu.h ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 8 months

← Newer
1
...
29
30
31
32
33
34
35
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010