ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Do not write the "ret_size" parameter of NtQueryDirectoryObject on failure. 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2022-04-10 23:29:50 -05:00 committed by Alexandre Julliard
parent 07d93d9f68
commit ccf706b456
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ntdll/tests/om.c
View File

@ -2574,7 +2574,7 @@ static void test_query_directory(void)
status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size );
ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status ); ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status );
ok( context == 0xdeadbeef, "got context %#lx\n", context ); ok( context == 0xdeadbeef, "got context %#lx\n", context );
todo_wine ok( size == 0xdeadbeef || broken(!size) /* WoW64 */, "got size %lu\n", size); ok( size == 0xdeadbeef || broken(!size) /* WoW64 */, "got size %lu\n", size);
size = 0xdeadbeef; size = 0xdeadbeef;
status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size );

5
dlls/ntdll/unix/sync.c
View File

@ -1125,11 +1125,12 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI
buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0; buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0;
buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0; buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0;
*context = index + 1; *context = index + 1;
if (ret_size)
*ret_size = buffer->ObjectName.MaximumLength + buffer->ObjectTypeName.MaximumLength + sizeof(*buffer);
} }
} }
SERVER_END_REQ; SERVER_END_REQ;
if (ret_size)
*ret_size = buffer->ObjectName.MaximumLength + buffer->ObjectTypeName.MaximumLength + sizeof(*buffer);
} }
else else
{ {