[CLASSPNP]

- Make srb volatile, since it's assigned inside SEH and referenced in finally
[NTOSKRNL]
- FsRtlTeardownPerStreamContexts: make IsMutexLocked volatile (SEH)
- IoCreateFile: Make SystemEaBuffer volatile (SEH), save status and information in the caller's IoStatusBlock, cleanup and fail when IoCheckEaBufferValidity failed with PreviousMode == KernelMode, too.
- NtLockFile: Move ExAllocatePoolWithTag out of the SEH block. ExAllocatePoolWithTag does not raise an exception by default (unlike ExAllocatePoolWithQuotaTag). Get rid of this SEH block completely and check the return value instead.
- NtQueryDirectoryFile: make AuxBuffer volatile (SEH), again move ExAllocatePoolWithTag out of the SEH block and check return value instead.
IopCaptureUnicodeString: Make Name volatile (SEH)

svn path=/trunk/; revision=57437

reactos/drivers/storage/classpnp/create.c

@@ -463,7 +463,7 @@ ClasspEjectionControl(
 
     PFILE_OBJECT_EXTENSION fsContext = NULL;
     NTSTATUS status;
-    PSCSI_REQUEST_BLOCK srb = NULL;
+    volatile PSCSI_REQUEST_BLOCK srb = NULL;
     BOOLEAN countChanged = FALSE;
 
     PAGED_CODE();

reactos/ntoskrnl/fsrtl/filtrctx.c

@@ -368,7 +368,7 @@ NTAPI
 FsRtlTeardownPerStreamContexts(IN PFSRTL_ADVANCED_FCB_HEADER AdvFcbHeader)
 {
     PLIST_ENTRY NextEntry;
-    BOOLEAN IsMutexLocked = FALSE;
+    volatile BOOLEAN IsMutexLocked = FALSE;
     PFSRTL_PER_STREAM_CONTEXT PerStreamContext;
 
     _SEH2_TRY

reactos/ntoskrnl/io/iomgr/file.c

@@ -1700,8 +1700,8 @@ IoCreateFile(OUT PHANDLE FileHandle,
     KPROCESSOR_MODE AccessMode;
     HANDLE LocalHandle = 0;
     LARGE_INTEGER SafeAllocationSize;
-    PVOID SystemEaBuffer = NULL;
-    NTSTATUS Status;
+    volatile PVOID SystemEaBuffer = NULL;
+    NTSTATUS Status = STATUS_SUCCESS;
     OPEN_PACKET OpenPacket;
     ULONG EaErrorOffset;
 
@@ -1738,9 +1738,7 @@ IoCreateFile(OUT PHANDLE FileHandle,
 
             if ((EaBuffer) && (EaLength))
             {
-                ProbeForRead(EaBuffer,
-                             EaLength,
-                             sizeof(ULONG));
+                ProbeForRead(EaBuffer, EaLength, sizeof(ULONG));
 
                 /* marshal EaBuffer */
                 SystemEaBuffer = ExAllocatePoolWithTag(NonPagedPool,
@@ -1757,24 +1755,14 @@ IoCreateFile(OUT PHANDLE FileHandle,
                 Status = IoCheckEaBufferValidity(SystemEaBuffer,
                                                  EaLength,
                                                  &EaErrorOffset);
-                if (!NT_SUCCESS(Status))
-                {
-                    DPRINT1("FIXME: IoCheckEaBufferValidity() failed with "
-                        "Status: %lx\n",Status);
-
-                    /* Free EA Buffer and return the error */
-                    ExFreePoolWithTag(SystemEaBuffer, TAG_EA);
-                    _SEH2_YIELD(return Status);
-                }
+                IoStatusBlock->Status = Status;
+                IoStatusBlock->Information = EaErrorOffset;
             }
         }
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
-            /* Free SystemEaBuffer if needed */
-            if (SystemEaBuffer) ExFreePoolWithTag(SystemEaBuffer, TAG_EA);
-
             /* Return the exception code */
-            _SEH2_YIELD(return _SEH2_GetExceptionCode());
+            Status = _SEH2_GetExceptionCode();
         }
         _SEH2_END;
     }
@@ -1816,12 +1804,19 @@ IoCreateFile(OUT PHANDLE FileHandle,
             Status = IoCheckEaBufferValidity(SystemEaBuffer,
                                              EaLength,
                                              &EaErrorOffset);
+            IoStatusBlock->Status = Status;
+            IoStatusBlock->Information = EaErrorOffset;
+        }
+    }
+
     if (!NT_SUCCESS(Status))
     {
-                DPRINT1("FIXME: IoCheckEaBufferValidity() failed with "
-                        "Status: %lx\n",Status);
-            }
-        }
+        DPRINT1("FIXME: IoCheckEaBufferValidity() failed with Status: %lx\n",
+                Status);
+
+        /* Free SystemEaBuffer if needed and return the error */
+        if (SystemEaBuffer) ExFreePoolWithTag(SystemEaBuffer, TAG_EA);
+        return Status;
     }
 
     /* Setup the Open Packet */

reactos/ntoskrnl/io/iomgr/iofunc.c

@@ -1330,29 +1330,21 @@ NtLockFile(IN HANDLE FileHandle,
     StackPtr->MinorFunction = IRP_MN_LOCK;
     StackPtr->FileObject = FileObject;
 
-    /* Enter SEH */
-    _SEH2_TRY
-    {
     /* Allocate local buffer */
     LocalLength = ExAllocatePoolWithTag(NonPagedPool,
                                         sizeof(LARGE_INTEGER),
                                         TAG_LOCK);
+    if (!LocalLength)
+    {
+        /* Allocating failed, clean up and return failure */
+        IopCleanupAfterException(FileObject, Irp, Event, NULL);
+        return STATUS_INSUFFICIENT_RESOURCES;
+    }
 
     /* Set the length */
     *LocalLength = CapturedLength;
     Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength;
     StackPtr->Parameters.LockControl.Length = LocalLength;
-    }
-    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-    {
-        /* Allocating failed, clean up and return the exception code */
-        IopCleanupAfterException(FileObject, Irp, Event, NULL);
-        if (LocalLength) ExFreePoolWithTag(LocalLength, TAG_LOCK);
-
-        /* Return the exception code */
-        _SEH2_YIELD(return _SEH2_GetExceptionCode());
-    }
-    _SEH2_END;
 
     /* Set Parameters */
     StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset;
@@ -1397,7 +1389,7 @@ NtQueryDirectoryFile(IN HANDLE FileHandle,
     NTSTATUS Status;
     BOOLEAN LockedForSynch = FALSE;
     PKEVENT Event = NULL;
-    PVOID AuxBuffer = NULL;
+    volatile PVOID AuxBuffer = NULL;
     PMDL Mdl;
     UNICODE_STRING CapturedFileName;
     PUNICODE_STRING SearchPattern;
@@ -1525,26 +1517,20 @@ NtQueryDirectoryFile(IN HANDLE FileHandle,
 
     /* Check if this is buffered I/O */
     if (DeviceObject->Flags & DO_BUFFERED_IO)
-    {
-        /* Enter SEH */
-        _SEH2_TRY
     {
         /* Allocate a buffer */
-            Irp->AssociatedIrp.SystemBuffer =
-                ExAllocatePoolWithTag(NonPagedPool,
+        Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool,
                                                                 Length,
                                                                 TAG_SYSB);
-        }
-        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        if (!Irp->AssociatedIrp.SystemBuffer)
         {
             /* Allocating failed, clean up and return the exception code */
             IopCleanupAfterException(FileObject, Irp, Event, NULL);
             if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB);
 
             /* Return the exception code */
-            _SEH2_YIELD(return _SEH2_GetExceptionCode());
+            return STATUS_INSUFFICIENT_RESOURCES;
         }
-        _SEH2_END;
 
         /* Set the buffer and flags */
         Irp->UserBuffer = FileInformation;

reactos/ntoskrnl/io/pnpmgr/plugplay.c

@@ -167,7 +167,7 @@ static NTSTATUS
 IopCaptureUnicodeString(PUNICODE_STRING DstName, PUNICODE_STRING SrcName)
 {
     NTSTATUS Status = STATUS_SUCCESS;
-    UNICODE_STRING Name;
+    volatile UNICODE_STRING Name;
 
     Name.Buffer = NULL;
     _SEH2_TRY