[NTOS]

- Add missed _SEH2_YIELD's

svn path=/trunk/; revision=72609

diff --git a/reactos/ntoskrnl/config/cmapi.c b/reactos/ntoskrnl/config/cmapi.c
index 64679de..62f153e 100644 (file)
--- a/reactos/ntoskrnl/config/cmapi.c
+++ b/reactos/ntoskrnl/config/cmapi.c
@@ -1545,16 +1545,16 @@ CmpQueryNameInformation(
     {
         *ResultLength = FIELD_OFFSET(KEY_NAME_INFORMATION, Name) + NeededLength;
         if (Length < RTL_SIZEOF_THROUGH_FIELD(KEY_NAME_INFORMATION, NameLength))
-            return STATUS_BUFFER_TOO_SMALL;
+            _SEH2_YIELD(return STATUS_BUFFER_TOO_SMALL);
         if (Length < *ResultLength)
         {
             KeyNameInfo->NameLength = NeededLength;
-            return STATUS_BUFFER_OVERFLOW;
+            _SEH2_YIELD(return STATUS_BUFFER_OVERFLOW);
         }
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
-        return _SEH2_GetExceptionCode();
+        _SEH2_YIELD(return _SEH2_GetExceptionCode());
     }
     _SEH2_END;
 
@@ -1597,7 +1597,7 @@ CmpQueryNameInformation(
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
-        return _SEH2_GetExceptionCode();
+        _SEH2_YIELD(return _SEH2_GetExceptionCode());
     }
     _SEH2_END;
 

diff --git a/reactos/ntoskrnl/config/ntapi.c b/reactos/ntoskrnl/config/ntapi.c
index 993b2bb..7a10d14 100644 (file)
--- a/reactos/ntoskrnl/config/ntapi.c
+++ b/reactos/ntoskrnl/config/ntapi.c
@@ -1058,7 +1058,7 @@ NtLockProductActivationKeys(IN PULONG pPrivateVer,
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
-        return _SEH2_GetExceptionCode();
+        _SEH2_YIELD(return _SEH2_GetExceptionCode());
     }
     _SEH2_END;
 

diff --git a/reactos/ntoskrnl/ex/locale.c b/reactos/ntoskrnl/ex/locale.c
index 78e94cf..0df761c 100644 (file)
--- a/reactos/ntoskrnl/ex/locale.c
+++ b/reactos/ntoskrnl/ex/locale.c
@@ -432,7 +432,7 @@ NtQueryDefaultUILanguage(OUT LANGID* LanguageId)
     _SEH2_EXCEPT(ExSystemExceptionFilter())
     {
         /* Return exception code */
-        return _SEH2_GetExceptionCode();
+        _SEH2_YIELD(return _SEH2_GetExceptionCode());
     }
     _SEH2_END;
 

diff --git a/reactos/ntoskrnl/lpc/port.c b/reactos/ntoskrnl/lpc/port.c
index c2669c3..6414d02 100644 (file)
--- a/reactos/ntoskrnl/lpc/port.c
+++ b/reactos/ntoskrnl/lpc/port.c
@@ -152,7 +152,7 @@ NtImpersonateClientOfPort(IN HANDLE PortHandle,
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
             DPRINT1("Got exception!\n");
-            return _SEH2_GetExceptionCode();
+            _SEH2_YIELD(return _SEH2_GetExceptionCode());
         }
         _SEH2_END;
     }

diff --git a/reactos/ntoskrnl/lpc/reply.c b/reactos/ntoskrnl/lpc/reply.c
index e2b31f0..b2fce63 100644 (file)
--- a/reactos/ntoskrnl/lpc/reply.c
+++ b/reactos/ntoskrnl/lpc/reply.c
@@ -785,7 +785,7 @@ LpcpCopyRequestData(
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
             DPRINT1("Got exception!\n");
-            return _SEH2_GetExceptionCode();
+            _SEH2_YIELD(return _SEH2_GetExceptionCode());
         }
         _SEH2_END;
     }

diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index d799f88..9a21599 100644 (file)
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -4321,7 +4321,7 @@ NtQuerySection(
         }
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
-            return _SEH2_GetExceptionCode();
+            _SEH2_YIELD(return _SEH2_GetExceptionCode());
         }
         _SEH2_END;
     }

diff --git a/reactos/ntoskrnl/ps/quota.c b/reactos/ntoskrnl/ps/quota.c
index 09701ba..de05a92 100644 (file)
--- a/reactos/ntoskrnl/ps/quota.c
+++ b/reactos/ntoskrnl/ps/quota.c
@@ -335,7 +335,7 @@ PspSetQuotaLimits(
                  (CapturedQuotaLimits.Flags & QUOTA_LIMITS_HARDWS_MAX_DISABLE)))
             {
                 DPRINT1("Invalid quota flags: 0x%lx\n", CapturedQuotaLimits.Flags);
-                return STATUS_INVALID_PARAMETER;
+                _SEH2_YIELD(return STATUS_INVALID_PARAMETER);
             }
 
             /* Verify that the caller didn't pass reserved values */
@@ -351,19 +351,19 @@ PspSetQuotaLimits(
                         CapturedQuotaLimits.Reserved3,
                         CapturedQuotaLimits.Reserved4,
                         CapturedQuotaLimits.CpuRateLimit.RateData);
-                return STATUS_INVALID_PARAMETER;
+                _SEH2_YIELD(return STATUS_INVALID_PARAMETER);
             }
         }
         else
         {
             DPRINT1("Invalid quota size: 0x%lx\n", QuotaLimitsLength);
-            return STATUS_INFO_LENGTH_MISMATCH;
+            _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH);
         }
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
         DPRINT1("Exception while copying data\n");
-        return _SEH2_GetExceptionCode();
+        _SEH2_YIELD(return _SEH2_GetExceptionCode());
     }
     _SEH2_END;
 

diff --git a/reactos/ntoskrnl/se/audit.c b/reactos/ntoskrnl/se/audit.c
index b1e480f..ea9f7b7 100644 (file)
--- a/reactos/ntoskrnl/se/audit.c
+++ b/reactos/ntoskrnl/se/audit.c
@@ -306,7 +306,7 @@ SeCaptureObjectTypeList(
     {
         ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA);
         *CapturedObjectTypeList = NULL;
-        return _SEH2_GetExceptionCode();
+        _SEH2_YIELD(return _SEH2_GetExceptionCode());
     }
     _SEH2_END;
 
@@ -501,7 +501,7 @@ SepAccessCheckAndAuditAlarm(
     {
         Status = _SEH2_GetExceptionCode();
         DPRINT1("Exception while probing parameters: 0x%lx\n", Status);
-        goto Cleanup;
+        _SEH2_YIELD(goto Cleanup);
     }
     _SEH2_END;
 
@@ -1137,7 +1137,7 @@ NtOpenObjectAuditAlarm(
     {
         Status = _SEH2_GetExceptionCode();
         DPRINT1("Exception while probing parameters: 0x%lx\n", Status);
-        goto Cleanup;
+        _SEH2_YIELD(goto Cleanup);
     }
     _SEH2_END;
 
@@ -1351,7 +1351,7 @@ NtPrivilegedServiceAuditAlarm(
     {
         Status = _SEH2_GetExceptionCode();
         DPRINT1("Got exception 0x%lx\n", Status);
-        goto Cleanup;
+        _SEH2_YIELD(goto Cleanup);
     }
     _SEH2_END;
 

diff --git a/reactos/ntoskrnl/se/sid.c b/reactos/ntoskrnl/se/sid.c
index f08fc76..007f6a9 100644 (file)
--- a/reactos/ntoskrnl/se/sid.c
+++ b/reactos/ntoskrnl/se/sid.c
@@ -414,7 +414,7 @@ SeCaptureSidAndAttributesArray(
                 if (((Sid->Revision & 0xF) != SID_REVISION) ||
                     (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES))
                 {
-                    return STATUS_INVALID_SID;
+                    _SEH2_YIELD(return STATUS_INVALID_SID);
                 }
 
                 /* Calculate the SID length and probe the full SID */
@@ -427,7 +427,7 @@ SeCaptureSidAndAttributesArray(
         }
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
-            return _SEH2_GetExceptionCode();
+            _SEH2_YIELD(return _SEH2_GetExceptionCode());
         }
         _SEH2_END;
     }

diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c
index 852cd0b..cfdf0ae 100644 (file)
--- a/reactos/ntoskrnl/se/token.c
+++ b/reactos/ntoskrnl/se/token.c
@@ -1832,7 +1832,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
                     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
                     {
                         Status = _SEH2_GetExceptionCode();
-                        goto Cleanup;
+                        _SEH2_YIELD(goto Cleanup);
                     }
                     _SEH2_END;
 
@@ -1872,7 +1872,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
                     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
                     {
                         Status = _SEH2_GetExceptionCode();
-                        goto Cleanup;
+                        _SEH2_YIELD(goto Cleanup);
                     }
                     _SEH2_END;
 
@@ -1912,7 +1912,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
                     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
                     {
                         Status = _SEH2_GetExceptionCode();
-                        goto Cleanup;
+                        _SEH2_YIELD(goto Cleanup);
                     }
                     _SEH2_END;
 
@@ -1979,7 +1979,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
                 _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
                 {
                     Status = _SEH2_GetExceptionCode();
-                    goto Cleanup;
+                    _SEH2_YIELD(goto Cleanup);
                 }
                 _SEH2_END;
 
@@ -2006,7 +2006,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
                 _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
                 {
                     Status = _SEH2_GetExceptionCode();
-                    goto Cleanup;
+                    _SEH2_YIELD(goto Cleanup);
                 }
                 _SEH2_END;
 
@@ -2090,7 +2090,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
                 _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
                 {
                     Status = _SEH2_GetExceptionCode();
-                    goto Cleanup;
+                    _SEH2_YIELD(goto Cleanup);
                 }
                 _SEH2_END;
 
@@ -2125,7 +2125,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
                 _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
                 {
                     Status = _SEH2_GetExceptionCode();
-                    goto Cleanup;
+                    _SEH2_YIELD(goto Cleanup);
                 }
                 _SEH2_END;
 
@@ -2593,7 +2593,7 @@ NtAdjustPrivilegesToken(
         {
             /* Do cleanup and return the exception code */
             Status = _SEH2_GetExceptionCode();
-            goto Cleanup;
+            _SEH2_YIELD(goto Cleanup);
         }
         _SEH2_END;
 
@@ -2621,7 +2621,7 @@ NtAdjustPrivilegesToken(
     {
         /* Do cleanup and return the exception code */
         Status = _SEH2_GetExceptionCode();
-        goto Cleanup;
+        _SEH2_YIELD(goto Cleanup);
     }
     _SEH2_END;
 
@@ -2751,7 +2751,7 @@ NtCreateToken(
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
         {
             /* Return the exception code */
-            return _SEH2_GetExceptionCode();
+            _SEH2_YIELD(return _SEH2_GetExceptionCode());
         }
         _SEH2_END;
     }

diff --git a/reactos/ntoskrnl/wmi/wmidrv.c b/reactos/ntoskrnl/wmi/wmidrv.c
index a87226b..9b6328b 100644 (file)
--- a/reactos/ntoskrnl/wmi/wmidrv.c
+++ b/reactos/ntoskrnl/wmi/wmidrv.c
@@ -144,7 +144,7 @@ WmipCaptureGuidObjectAttributes(
         /* Check if the object name has the expected length */
         if (CapturedObjectName->Length != 45 * sizeof(WCHAR))
         {
-            return STATUS_INVALID_PARAMETER;
+            _SEH2_YIELD(return STATUS_INVALID_PARAMETER);
         }
 
         /* Probe and copy the object name buffer */
@@ -162,7 +162,7 @@ WmipCaptureGuidObjectAttributes(
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
         DPRINT1("Got exception!\n");
-        return _SEH2_GetExceptionCode();
+        _SEH2_YIELD(return _SEH2_GetExceptionCode());
     }
     _SEH2_END;