marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rasapi32: Added some more tests for RasEnumDevicesA, fix Wine not to crash on the tests.

oldstable
Stefan Leichter 2008-07-06 15:15:37 +02:00 committed by Alexandre Julliard
parent b8c6d8e598
commit 5e15187fd0
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/rasapi32/rasapi.c
View File

@ -249,7 +249,7 @@ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD l
return ERROR_INVALID_PARAMETER;
FIXME("(%p,%p,%p),stub!\n",lpRasDevinfo,lpcb,lpcDevices);
if (*lpcb < sizeof(RASDEVINFOA)) {
if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) {
*lpcb = sizeof(RASDEVINFOA);
return ERROR_BUFFER_TOO_SMALL;
}

64
dlls/rasapi32/tests/rasapi.c
View File

@ -53,14 +53,78 @@ static void test_rasenum(void)
return;
}
/* test first parameter */
result = pRasEnumDevicesA(NULL, &cb, &cDevices);
trace("RasEnumDevicesA: buffersize %d\n", cb);
ok(result == ERROR_BUFFER_TOO_SMALL,
"Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result);
cb = sizeof(rasDevInfo);
result = pRasEnumDevicesA(NULL, &cb, &cDevices);
ok(result == ERROR_BUFFER_TOO_SMALL,
"Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result);
rasDevInfo.dwSize = 0;
result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices);
todo_wine
ok(result == ERROR_INVALID_SIZE,
"Expected ERROR_INVALID_SIZE, got %08d\n", result);
rasDevInfo.dwSize = sizeof(rasDevInfo) -1;
result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices);
todo_wine
ok(result == ERROR_INVALID_SIZE,
"Expected ERROR_INVALID_SIZE, got %08d\n", result);
rasDevInfo.dwSize = sizeof(rasDevInfo) +1;
result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices);
todo_wine
ok(result == ERROR_INVALID_SIZE,
"Expected ERROR_INVALID_SIZE, got %08d\n", result);
/* test second parameter */
rasDevInfo.dwSize = sizeof(rasDevInfo);
result = pRasEnumDevicesA(&rasDevInfo, NULL, &cDevices);
ok(result == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %08d\n", result);
cb = 0;
result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices);
ok(result == ERROR_BUFFER_TOO_SMALL,
"Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result);
cb = sizeof(rasDevInfo) -1;
result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices);
ok(result == ERROR_BUFFER_TOO_SMALL,
"Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result);
cb = sizeof(rasDevInfo) +1;
result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices);
todo_wine
ok(result == ERROR_BUFFER_TOO_SMALL,
"Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result);
/* test third parameter */
cb = sizeof(rasDevInfo);
result = pRasEnumDevicesA(&rasDevInfo, &cb, NULL);
ok(result == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %08d\n", result);
/* test combinations of invalid parameters */
result = pRasEnumDevicesA(NULL, NULL, &cDevices);
ok(result == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %08d\n", result);
result = pRasEnumDevicesA(NULL, &cb, NULL);
ok(result == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %08d\n", result);
cb = 0;
rasDevInfo.dwSize = 0;
result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices);
todo_wine
ok(result == ERROR_INVALID_SIZE,
"Expected ERROR_INVALID_SIZE, got %08d\n", result);
}
START_TEST(rasapi)