Skip to content

Commit 98b26cc

Browse files
committed
[NTDLL_APITEST] Fix NtCreateProfile tests for x64
1 parent 0679260 commit 98b26cc

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

modules/rostests/apitests/ntdll/NtCreateProfile.c

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ TestParameterValidation(void)
154154
0x80000000,
155155
ProfileTime,
156156
1);
157-
ok_hex(Status, STATUS_ACCESS_VIOLATION);
157+
ok_hex(Status, (sizeof(PVOID) == 8) ? STATUS_BUFFER_TOO_SMALL : STATUS_ACCESS_VIOLATION);
158158

159159
Status = NtCreateProfile(NULL,
160160
NULL,
@@ -165,7 +165,7 @@ TestParameterValidation(void)
165165
0x80000000,
166166
ProfileTime,
167167
1);
168-
ok_hex(Status, STATUS_ACCESS_VIOLATION);
168+
ok_hex(Status, (sizeof(PVOID) == 8) ? STATUS_BUFFER_TOO_SMALL : STATUS_ACCESS_VIOLATION);
169169

170170
Status = NtCreateProfile(NULL,
171171
NULL,
@@ -176,7 +176,9 @@ TestParameterValidation(void)
176176
0x80000000,
177177
ProfileTime,
178178
1);
179-
ok_hex(Status, IsWow64 ? STATUS_ACCESS_VIOLATION : STATUS_BUFFER_OVERFLOW);
179+
ok_hex(Status, (sizeof(PVOID) == 8) ? STATUS_BUFFER_TOO_SMALL :
180+
IsWow64 ? STATUS_ACCESS_VIOLATION :
181+
STATUS_BUFFER_OVERFLOW);
180182

181183
Status = NtCreateProfile(NULL,
182184
NULL,
@@ -187,7 +189,9 @@ TestParameterValidation(void)
187189
0x80000000,
188190
ProfileTime,
189191
1);
190-
ok_hex(Status, IsWow64 ? STATUS_ACCESS_VIOLATION : STATUS_BUFFER_OVERFLOW);
192+
ok_hex(Status, (sizeof(PVOID) == 8) ? STATUS_BUFFER_TOO_SMALL :
193+
IsWow64 ? STATUS_ACCESS_VIOLATION :
194+
STATUS_BUFFER_OVERFLOW);
191195
}
192196

193197
/* Handle is probed first and requires no alignment, buffer requires ULONG alignment */
@@ -281,34 +285,34 @@ TestBufferSizeValidation(void)
281285
{ __LINE__, 8, 3, sizeof(ULONG), STATUS_ACCESS_VIOLATION },
282286
{ __LINE__, 9, 3, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
283287
{ __LINE__, 10, 3, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL },
284-
288+
285289
{ __LINE__, 16, 4, sizeof(ULONG), STATUS_ACCESS_VIOLATION },
286290
{ __LINE__, 17, 4, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
287291
{ __LINE__, 18, 4, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
288292
{ __LINE__, 19, 4, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
289293
{ __LINE__, 20, 4, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL },
290-
294+
291295
{ __LINE__, 32, 5, sizeof(ULONG), STATUS_ACCESS_VIOLATION },
292296
{ __LINE__, 33, 5, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
293297
{ __LINE__, 39, 5, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
294298
{ __LINE__, 40, 5, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL },
295-
299+
296300
{ __LINE__, 256, 8, sizeof(ULONG), STATUS_ACCESS_VIOLATION },
297301
{ __LINE__, 257, 8, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
298302
{ __LINE__, 319, 8, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
299303
{ __LINE__, 320, 8, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL },
300-
304+
301305
{ __LINE__, 256, 8, sizeof(ULONG), STATUS_ACCESS_VIOLATION },
302306
{ __LINE__, 257, 8, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
303307
{ __LINE__, 319, 8, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
304308
{ __LINE__, 320, 8, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL },
305-
309+
306310
{ __LINE__, 0x80000000, 31, sizeof(ULONG), STATUS_ACCESS_VIOLATION },
307311
{ __LINE__, 0x80000001, 31, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
308312
{ __LINE__, 0xBFFFFFFF, 31, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL, STATUS_ACCESS_VIOLATION },
309313
{ __LINE__, 0xA0000000, 31, sizeof(ULONG), STATUS_BUFFER_TOO_SMALL },
310-
311-
/* Nothing checks against the max MDL size */
314+
315+
/* Nothing checks against the max MDL size */
312316
{ __LINE__, 3, 2, MAX_MDL_BUFFER_SIZE, STATUS_ACCESS_VIOLATION },
313317
{ __LINE__, 3, 2, MAX_MDL_BUFFER_SIZE + 1, STATUS_ACCESS_VIOLATION },
314318
{ __LINE__, 3, 2, (MAX_MDL_BUFFER_SIZE + 1) * 2, STATUS_ACCESS_VIOLATION },

0 commit comments

Comments
 (0)