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

ntdll/tests: Simplify ProcessImageFileName test. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-03-04 10:20:05 -06:00 committed by Alexandre Julliard
parent 69029d70f6
commit d96a5a0304
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/ntdll/tests/info.c
View File

@ -1416,12 +1416,11 @@ static void test_query_process_handlecount(void)
static void test_query_process_image_file_name(void) static void test_query_process_image_file_name(void)
{ {
static const WCHAR deviceW[] = {'\\','D','e','v','i','c','e','\\'};
NTSTATUS status; NTSTATUS status;
ULONG ReturnLength; ULONG ReturnLength;
UNICODE_STRING image_file_name; UNICODE_STRING image_file_name;
void *buffer; UNICODE_STRING *buffer = NULL;
char *file_nameA;
INT len;
status = pNtQueryInformationProcess(NULL, ProcessImageFileName, &image_file_name, sizeof(image_file_name), NULL); status = pNtQueryInformationProcess(NULL, ProcessImageFileName, &image_file_name, sizeof(image_file_name), NULL);
if (status == STATUS_INVALID_INFO_CLASS) if (status == STATUS_INVALID_INFO_CLASS)
@ -1437,18 +1436,14 @@ static void test_query_process_image_file_name(void)
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, sizeof(image_file_name), &ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, sizeof(image_file_name), &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
buffer = HeapAlloc(GetProcessHeap(), 0, ReturnLength); buffer = heap_alloc(ReturnLength);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength);
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
memcpy(&image_file_name, buffer, sizeof(image_file_name)); todo_wine
len = WideCharToMultiByte(CP_ACP, 0, image_file_name.Buffer, image_file_name.Length/sizeof(WCHAR), NULL, 0, NULL, NULL); ok(!memcmp(buffer->Buffer, deviceW, sizeof(deviceW)),
file_nameA = HeapAlloc(GetProcessHeap(), 0, len + 1); "Expected image name to begin with \\Device\\, got %s\n",
WideCharToMultiByte(CP_ACP, 0, image_file_name.Buffer, image_file_name.Length/sizeof(WCHAR), file_nameA, len, NULL, NULL); wine_dbgstr_wn(buffer->Buffer, buffer->Length / sizeof(WCHAR)));
file_nameA[len] = '\0'; heap_free(buffer);
HeapFree(GetProcessHeap(), 0, buffer);
trace("process image file name: %s\n", file_nameA);
todo_wine ok(strncmp(file_nameA, "\\Device\\", 8) == 0, "Process image name should be an NT path beginning with \\Device\\ (is %s)\n", file_nameA);
HeapFree(GetProcessHeap(), 0, file_nameA);
} }
static void test_query_process_debug_object_handle(int argc, char **argv) static void test_query_process_debug_object_handle(int argc, char **argv)

1
dlls/ntdll/tests/ntdll_test.h
View File

@ -33,3 +33,4 @@
#include "winternl.h" #include "winternl.h"
#include "wine/test.h" #include "wine/test.h"
#include "wine/heap.h"