Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 16:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[APITESTS] Tested function must be called before GetLastError() log (#2433)

Browse source 
So as to get the relevant LastError value.
Fixes for apphelp_apitest, kernel32_apitest and ws2_32_apitest.
This commit is contained in:
Serge Gautherie 2020-03-13 18:15:21 +01:00 • committed by GitHub
parent dbfd511ecd
commit cb5aa7bee4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 122 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

42
modules/rostests/apitests/apphelp/layerapi.c
View file

@ -688,7 +688,8 @@ static void test_Sign_Media(void)
ok(ret, "Expected redirect_iat to succeed\n");
if(ret)
{
ok(create_file(workdir, "test.exe", 'a', 4), "create_file error: %d\n", GetLastError());
ret = create_file(workdir, "test.exe", 'a', 4);
ok(ret, "create_file error: %d\n", GetLastError());
ok(wrapSdbSetPermLayerKeys2(drive, "test.exe", "TEST", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n");
/* 4 */
@ -696,7 +697,8 @@ static void test_Sign_Media(void)
expect_LayerValue(0, "SIGN.MEDIA=4 test.exe", "TEST");
ok(wrapSdbSetPermLayerKeys2(drive, "test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n");
ok(create_file(workdir, "test.txt", 'a', 1), "create_file error: %d\n", GetLastError());
ret = create_file(workdir, "test.txt", 'a', 1);
ok(ret, "create_file error: %d\n", GetLastError());
if (!expect_files(workdir, 2, "test.exe", "test.txt"))
{
@ -711,7 +713,8 @@ static void test_Sign_Media(void)
ok(wrapSdbSetPermLayerKeys2(drive, "test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n");
}
ok(create_file(workdir, "test.zz", 'a', 0x1000), "create_file error: %d\n", GetLastError());
ret = create_file(workdir, "test.zz", 'a', 0x1000);
ok(ret, "create_file error: %d\n", GetLastError());
if (!expect_files(workdir, 3, "test.exe", "test.txt", "test.zz"))
{
@ -726,7 +729,8 @@ static void test_Sign_Media(void)
ok(wrapSdbSetPermLayerKeys2(drive, "test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n");
}
ok(create_file(subdir, "test.exe", 'a', 0x10203), "create_file error: %d\n", GetLastError());
ret = create_file(subdir, "test.exe", 'a', 0x10203);
ok(ret, "create_file error: %d\n", GetLastError());
if (!expect_files(subdir, 1, "test.exe"))
{
@ -741,7 +745,8 @@ static void test_Sign_Media(void)
ok(wrapSdbSetPermLayerKeys2(drive, "sub\\test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n");
}
ok(create_file(subdir, "test.bbb", 'a', 0), "create_file error: %d\n", GetLastError());
ret = create_file(subdir, "test.bbb", 'a', 0);
ok(ret, "create_file error: %d\n", GetLastError());
if (!expect_files(subdir, 2, "test.bbb", "test.exe"))
{
@ -756,7 +761,8 @@ static void test_Sign_Media(void)
ok(wrapSdbSetPermLayerKeys2(drive, "sub\\test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n");
}
ok(create_file(subdir, "TEST.txt", 'a', 0x30201), "create_file error: %d\n", GetLastError());
ret = create_file(subdir, "TEST.txt", 'a', 0x30201);
ok(ret, "create_file error: %d\n", GetLastError());
if (!expect_files(subdir, 3, "test.bbb", "test.exe", "TEST.txt"))
{
@ -771,7 +777,8 @@ static void test_Sign_Media(void)
ok(wrapSdbSetPermLayerKeys2(drive, "sub\\test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n");
}
ok(create_file(subdir, "TEST.aaa", 'a', 0x3a2a1), "create_file error: %d\n", GetLastError());
ret = create_file(subdir, "TEST.aaa", 'a', 0x3a2a1);
ok(ret, "create_file error: %d\n", GetLastError());
if (!expect_files(subdir, 4, "TEST.aaa", "test.bbb", "test.exe", "TEST.txt"))
{
@ -789,13 +796,20 @@ static void test_Sign_Media(void)
ret = RestoreIat(GetModuleHandleA("apphelp.dll"), "kernel32.dll", "GetDriveTypeW", (ULONG_PTR)pGetDriveTypeW);
ok(ret, "Expected restore_iat to succeed\n");
ok(delete_file(subdir, "test.bbb"), "delete_file error: %d\n", GetLastError());
ok(delete_file(subdir, "TEST.aaa"), "delete_file error: %d\n", GetLastError());
ok(delete_file(subdir, "TEST.txt"), "delete_file error: %d\n", GetLastError());
ok(delete_file(subdir, "test.exe"), "delete_file error: %d\n", GetLastError());
ok(delete_file(workdir, "test.zz"), "delete_file error: %d\n", GetLastError());
ok(delete_file(workdir, "test.txt"), "delete_file error: %d\n", GetLastError());
ok(delete_file(workdir, "test.exe"), "delete_file error: %d\n", GetLastError());
ret = delete_file(subdir, "test.bbb");
ok(ret, "delete_file error: %d\n", GetLastError());
ret = delete_file(subdir, "TEST.aaa");
ok(ret, "delete_file error: %d\n", GetLastError());
ret = delete_file(subdir, "TEST.txt");
ok(ret, "delete_file error: %d\n", GetLastError());
ret = delete_file(subdir, "test.exe");
ok(ret, "delete_file error: %d\n", GetLastError());
ret = delete_file(workdir, "test.zz");
ok(ret, "delete_file error: %d\n", GetLastError());
ret = delete_file(workdir, "test.txt");
ok(ret, "delete_file error: %d\n", GetLastError());
ret = delete_file(workdir, "test.exe");
ok(ret, "delete_file error: %d\n", GetLastError());
}
ret = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_NO_BROADCAST_SYSTEM, drive, NULL);
ok(ret, "DefineDosDeviceA error: %d\n", GetLastError());