Skip to content

Commit debfd3b

Browse files
author
Dmitry Chapyshev
committed
[NTOS]
- Add missed _SEH2_YIELD's svn path=/trunk/; revision=72609
1 parent a039776 commit debfd3b

File tree

11 files changed

+31
-31
lines changed

11 files changed

+31
-31
lines changed

reactos/ntoskrnl/config/cmapi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,16 +1545,16 @@ CmpQueryNameInformation(
15451545
{
15461546
*ResultLength = FIELD_OFFSET(KEY_NAME_INFORMATION, Name) + NeededLength;
15471547
if (Length < RTL_SIZEOF_THROUGH_FIELD(KEY_NAME_INFORMATION, NameLength))
1548-
return STATUS_BUFFER_TOO_SMALL;
1548+
_SEH2_YIELD(return STATUS_BUFFER_TOO_SMALL);
15491549
if (Length < *ResultLength)
15501550
{
15511551
KeyNameInfo->NameLength = NeededLength;
1552-
return STATUS_BUFFER_OVERFLOW;
1552+
_SEH2_YIELD(return STATUS_BUFFER_OVERFLOW);
15531553
}
15541554
}
15551555
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
15561556
{
1557-
return _SEH2_GetExceptionCode();
1557+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
15581558
}
15591559
_SEH2_END;
15601560

@@ -1597,7 +1597,7 @@ CmpQueryNameInformation(
15971597
}
15981598
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
15991599
{
1600-
return _SEH2_GetExceptionCode();
1600+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
16011601
}
16021602
_SEH2_END;
16031603

reactos/ntoskrnl/config/ntapi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ NtLockProductActivationKeys(IN PULONG pPrivateVer,
10581058
}
10591059
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
10601060
{
1061-
return _SEH2_GetExceptionCode();
1061+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
10621062
}
10631063
_SEH2_END;
10641064

reactos/ntoskrnl/ex/locale.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ NtQueryDefaultUILanguage(OUT LANGID* LanguageId)
432432
_SEH2_EXCEPT(ExSystemExceptionFilter())
433433
{
434434
/* Return exception code */
435-
return _SEH2_GetExceptionCode();
435+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
436436
}
437437
_SEH2_END;
438438

reactos/ntoskrnl/lpc/port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ NtImpersonateClientOfPort(IN HANDLE PortHandle,
152152
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
153153
{
154154
DPRINT1("Got exception!\n");
155-
return _SEH2_GetExceptionCode();
155+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
156156
}
157157
_SEH2_END;
158158
}

reactos/ntoskrnl/lpc/reply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ LpcpCopyRequestData(
785785
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
786786
{
787787
DPRINT1("Got exception!\n");
788-
return _SEH2_GetExceptionCode();
788+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
789789
}
790790
_SEH2_END;
791791
}

reactos/ntoskrnl/mm/section.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4321,7 +4321,7 @@ NtQuerySection(
43214321
}
43224322
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
43234323
{
4324-
return _SEH2_GetExceptionCode();
4324+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
43254325
}
43264326
_SEH2_END;
43274327
}

reactos/ntoskrnl/ps/quota.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ PspSetQuotaLimits(
335335
(CapturedQuotaLimits.Flags & QUOTA_LIMITS_HARDWS_MAX_DISABLE)))
336336
{
337337
DPRINT1("Invalid quota flags: 0x%lx\n", CapturedQuotaLimits.Flags);
338-
return STATUS_INVALID_PARAMETER;
338+
_SEH2_YIELD(return STATUS_INVALID_PARAMETER);
339339
}
340340

341341
/* Verify that the caller didn't pass reserved values */
@@ -351,19 +351,19 @@ PspSetQuotaLimits(
351351
CapturedQuotaLimits.Reserved3,
352352
CapturedQuotaLimits.Reserved4,
353353
CapturedQuotaLimits.CpuRateLimit.RateData);
354-
return STATUS_INVALID_PARAMETER;
354+
_SEH2_YIELD(return STATUS_INVALID_PARAMETER);
355355
}
356356
}
357357
else
358358
{
359359
DPRINT1("Invalid quota size: 0x%lx\n", QuotaLimitsLength);
360-
return STATUS_INFO_LENGTH_MISMATCH;
360+
_SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH);
361361
}
362362
}
363363
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
364364
{
365365
DPRINT1("Exception while copying data\n");
366-
return _SEH2_GetExceptionCode();
366+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
367367
}
368368
_SEH2_END;
369369

reactos/ntoskrnl/se/audit.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ SeCaptureObjectTypeList(
306306
{
307307
ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA);
308308
*CapturedObjectTypeList = NULL;
309-
return _SEH2_GetExceptionCode();
309+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
310310
}
311311
_SEH2_END;
312312

@@ -501,7 +501,7 @@ SepAccessCheckAndAuditAlarm(
501501
{
502502
Status = _SEH2_GetExceptionCode();
503503
DPRINT1("Exception while probing parameters: 0x%lx\n", Status);
504-
goto Cleanup;
504+
_SEH2_YIELD(goto Cleanup);
505505
}
506506
_SEH2_END;
507507

@@ -1137,7 +1137,7 @@ NtOpenObjectAuditAlarm(
11371137
{
11381138
Status = _SEH2_GetExceptionCode();
11391139
DPRINT1("Exception while probing parameters: 0x%lx\n", Status);
1140-
goto Cleanup;
1140+
_SEH2_YIELD(goto Cleanup);
11411141
}
11421142
_SEH2_END;
11431143

@@ -1351,7 +1351,7 @@ NtPrivilegedServiceAuditAlarm(
13511351
{
13521352
Status = _SEH2_GetExceptionCode();
13531353
DPRINT1("Got exception 0x%lx\n", Status);
1354-
goto Cleanup;
1354+
_SEH2_YIELD(goto Cleanup);
13551355
}
13561356
_SEH2_END;
13571357

reactos/ntoskrnl/se/sid.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ SeCaptureSidAndAttributesArray(
414414
if (((Sid->Revision & 0xF) != SID_REVISION) ||
415415
(Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES))
416416
{
417-
return STATUS_INVALID_SID;
417+
_SEH2_YIELD(return STATUS_INVALID_SID);
418418
}
419419

420420
/* Calculate the SID length and probe the full SID */
@@ -427,7 +427,7 @@ SeCaptureSidAndAttributesArray(
427427
}
428428
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
429429
{
430-
return _SEH2_GetExceptionCode();
430+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
431431
}
432432
_SEH2_END;
433433
}

reactos/ntoskrnl/se/token.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,7 +1832,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
18321832
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
18331833
{
18341834
Status = _SEH2_GetExceptionCode();
1835-
goto Cleanup;
1835+
_SEH2_YIELD(goto Cleanup);
18361836
}
18371837
_SEH2_END;
18381838

@@ -1872,7 +1872,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
18721872
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
18731873
{
18741874
Status = _SEH2_GetExceptionCode();
1875-
goto Cleanup;
1875+
_SEH2_YIELD(goto Cleanup);
18761876
}
18771877
_SEH2_END;
18781878

@@ -1912,7 +1912,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
19121912
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
19131913
{
19141914
Status = _SEH2_GetExceptionCode();
1915-
goto Cleanup;
1915+
_SEH2_YIELD(goto Cleanup);
19161916
}
19171917
_SEH2_END;
19181918

@@ -1979,7 +1979,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
19791979
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
19801980
{
19811981
Status = _SEH2_GetExceptionCode();
1982-
goto Cleanup;
1982+
_SEH2_YIELD(goto Cleanup);
19831983
}
19841984
_SEH2_END;
19851985

@@ -2006,7 +2006,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
20062006
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
20072007
{
20082008
Status = _SEH2_GetExceptionCode();
2009-
goto Cleanup;
2009+
_SEH2_YIELD(goto Cleanup);
20102010
}
20112011
_SEH2_END;
20122012

@@ -2090,7 +2090,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
20902090
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
20912091
{
20922092
Status = _SEH2_GetExceptionCode();
2093-
goto Cleanup;
2093+
_SEH2_YIELD(goto Cleanup);
20942094
}
20952095
_SEH2_END;
20962096

@@ -2125,7 +2125,7 @@ NtSetInformationToken(IN HANDLE TokenHandle,
21252125
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
21262126
{
21272127
Status = _SEH2_GetExceptionCode();
2128-
goto Cleanup;
2128+
_SEH2_YIELD(goto Cleanup);
21292129
}
21302130
_SEH2_END;
21312131

@@ -2593,7 +2593,7 @@ NtAdjustPrivilegesToken(
25932593
{
25942594
/* Do cleanup and return the exception code */
25952595
Status = _SEH2_GetExceptionCode();
2596-
goto Cleanup;
2596+
_SEH2_YIELD(goto Cleanup);
25972597
}
25982598
_SEH2_END;
25992599

@@ -2621,7 +2621,7 @@ NtAdjustPrivilegesToken(
26212621
{
26222622
/* Do cleanup and return the exception code */
26232623
Status = _SEH2_GetExceptionCode();
2624-
goto Cleanup;
2624+
_SEH2_YIELD(goto Cleanup);
26252625
}
26262626
_SEH2_END;
26272627

@@ -2751,7 +2751,7 @@ NtCreateToken(
27512751
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
27522752
{
27532753
/* Return the exception code */
2754-
return _SEH2_GetExceptionCode();
2754+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
27552755
}
27562756
_SEH2_END;
27572757
}

reactos/ntoskrnl/wmi/wmidrv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ WmipCaptureGuidObjectAttributes(
144144
/* Check if the object name has the expected length */
145145
if (CapturedObjectName->Length != 45 * sizeof(WCHAR))
146146
{
147-
return STATUS_INVALID_PARAMETER;
147+
_SEH2_YIELD(return STATUS_INVALID_PARAMETER);
148148
}
149149

150150
/* Probe and copy the object name buffer */
@@ -162,7 +162,7 @@ WmipCaptureGuidObjectAttributes(
162162
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
163163
{
164164
DPRINT1("Got exception!\n");
165-
return _SEH2_GetExceptionCode();
165+
_SEH2_YIELD(return _SEH2_GetExceptionCode());
166166
}
167167
_SEH2_END;
168168

0 commit comments

Comments
 (0)