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

psapi/tests: Fix tests compilation with __WINESRC__ defined.

This commit is contained in:
André Hentschel 2013-10-24 00:30:04 +02:00 committed by Alexandre Julliard
parent f309e01282
commit 3df00e29ee
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/psapi/tests/Makefile.in
View File

@ -1,5 +1,4 @@
TESTDLL = psapi.dll
EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \
psapi_main.c

40
dlls/psapi/tests/psapi_main.c
View File

@ -81,7 +81,7 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi)
(void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA");
pGetProcessImageFileNameW =
(void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW");
pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtQueryVirtualMemory");
pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory");
return TRUE;
}
@ -105,7 +105,7 @@ static void test_EnumProcesses(void)
static void test_EnumProcessModules(void)
{
HMODULE hMod = GetModuleHandle(NULL);
HMODULE hMod = GetModuleHandleA(NULL);
DWORD ret, cbNeeded = 0xdeadbeef;
SetLastError(0xdeadbeef);
@ -134,8 +134,8 @@ static void test_EnumProcessModules(void)
ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded);
if(ret != 1)
return;
ok(hMod == GetModuleHandle(NULL),
"hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL));
ok(hMod == GetModuleHandleA(NULL),
"hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL));
ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded);
/* Windows sometimes has a bunch of extra dlls, presumably brought in by
* aclayers.dll.
@ -158,7 +158,7 @@ static void test_EnumProcessModules(void)
static void test_GetModuleInformation(void)
{
HMODULE hMod = GetModuleHandle(NULL);
HMODULE hMod = GetModuleHandleA(NULL);
MODULEINFO info;
DWORD ret;
@ -247,7 +247,7 @@ todo_wine
static void test_GetMappedFileName(void)
{
HMODULE hMod = GetModuleHandle(NULL);
HMODULE hMod = GetModuleHandleA(NULL);
char szMapPath[MAX_PATH], szModPath[MAX_PATH], *szMapBaseName;
DWORD ret;
char *base;
@ -288,26 +288,26 @@ todo_wine
}
}
GetTempPath(MAX_PATH, temp_path);
GetTempFileName(temp_path, "map", 0, file_name);
GetTempPathA(MAX_PATH, temp_path);
GetTempFileNameA(temp_path, "map", 0, file_name);
drive[0] = file_name[0];
drive[1] = ':';
drive[2] = 0;
SetLastError(0xdeadbeef);
ret = QueryDosDevice(drive, device_name, sizeof(device_name));
ok(ret, "QueryDosDevice error %d\n", GetLastError());
ret = QueryDosDeviceA(drive, device_name, sizeof(device_name));
ok(ret, "QueryDosDeviceA error %d\n", GetLastError());
trace("%s -> %s\n", drive, device_name);
SetLastError(0xdeadbeef);
hfile = CreateFile(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError());
hfile = CreateFileA(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
ok(hfile != INVALID_HANDLE_VALUE, "CreateFileA(%s) error %d\n", file_name, GetLastError());
SetFilePointer(hfile, 0x4000, NULL, FILE_BEGIN);
SetEndOfFile(hfile);
SetLastError(0xdeadbeef);
hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL);
ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError());
hmap = CreateFileMappingA(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL);
ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError());
SetLastError(0xdeadbeef);
base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0);
@ -382,11 +382,11 @@ todo_wine
UnmapViewOfFile(base);
CloseHandle(hmap);
CloseHandle(hfile);
DeleteFile(file_name);
DeleteFileA(file_name);
SetLastError(0xdeadbeef);
hmap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL);
ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError());
hmap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL);
ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError());
SetLastError(0xdeadbeef);
base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0);
@ -404,7 +404,7 @@ todo_wine
static void test_GetProcessImageFileName(void)
{
HMODULE hMod = GetModuleHandle(NULL);
HMODULE hMod = GetModuleHandleA(NULL);
char szImgPath[MAX_PATH], szMapPath[MAX_PATH];
WCHAR szImgPathW[MAX_PATH];
DWORD ret, ret1;
@ -482,7 +482,7 @@ static void test_GetProcessImageFileName(void)
static void test_GetModuleFileNameEx(void)
{
HMODULE hMod = GetModuleHandle(NULL);
HMODULE hMod = GetModuleHandleA(NULL);
char szModExPath[MAX_PATH+1], szModPath[MAX_PATH+1];
WCHAR buffer[MAX_PATH];
DWORD ret;
@ -541,7 +541,7 @@ static void test_GetModuleFileNameEx(void)
static void test_GetModuleBaseName(void)
{
HMODULE hMod = GetModuleHandle(NULL);
HMODULE hMod = GetModuleHandleA(NULL);
char szModPath[MAX_PATH], szModBaseName[MAX_PATH];
DWORD ret;