From: Bernhard Übelacker bernhardu@mailbox.org
--- dlls/setupapi/tests/devinst.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c5c0114b2b7..3b900eeed31 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -4464,7 +4464,7 @@ static void test_driver_store(struct testsign_context *ctx) memset(dest, 0xcc, sizeof(dest)); ret = pDriverStoreFindDriverPackageA("winetest.inf", 0, 0, system_info.wProcessorArchitecture, 0, dest, &size); ok(ret == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got %#x.\n", ret); - ok(!dest[0], "Got %s.\n", debugstr_a(dest)); + ok(!dest[0], "Got %s.\n", debugstr_an(dest, ARRAY_SIZE(dest))); todo_wine ok(!size, "Got size %lu.\n", size);
/* Windows 7 allows relative paths. Windows 8+ do not. @@ -4479,8 +4479,8 @@ static void test_driver_store(struct testsign_context *ctx) ok(!ret, "Got %#x.\n", ret); ok(size > ARRAY_SIZE(repository_dir), "Got size %lu.\n", size); ok(size == strlen(dest) + 1, "Expected size %Iu, got %lu.\n", strlen(dest) + 1, size); - ok(!memicmp(dest, repository_dir, strlen(repository_dir)), "Got path %s.\n", debugstr_a(dest)); - ok(!strcmp(dest + strlen(dest) - 13, "\winetest.inf"), "Got path %s.\n", debugstr_a(dest)); + ok(!memicmp(dest, repository_dir, strlen(repository_dir)), "Got path %s.\n", debugstr_an(dest, ARRAY_SIZE(dest))); + ok(!strcmp(dest + strlen(dest) - 13, "\winetest.inf"), "Got path %s.\n", debugstr_an(dest, ARRAY_SIZE(dest)));
strcpy(orig_dest, dest);
@@ -4489,14 +4489,14 @@ static void test_driver_store(struct testsign_context *ctx) memset(dest, 0xcc, sizeof(dest)); ret = pDriverStoreAddDriverPackageA(inf_path, 0, 0, system_info.wProcessorArchitecture, dest, &size); ok(!ret, "Got %#x.\n", ret); - ok(!strcmp(dest, orig_dest), "Expected %s, got %s.\n", debugstr_a(orig_dest), debugstr_a(dest)); + ok(!strcmp(dest, orig_dest), "Expected %s, got %s.\n", debugstr_a(orig_dest), debugstr_an(dest, ARRAY_SIZE(dest))); ok(size == strlen(dest) + 1, "Expected size %Iu, got %lu.\n", strlen(dest) + 1, size);
size = ARRAY_SIZE(dest); memset(dest, 0xcc, sizeof(dest)); ret = pDriverStoreFindDriverPackageA("winetest.inf", 0, 0, system_info.wProcessorArchitecture, 0, dest, &size); ok(!ret, "Got %#x.\n", ret); - ok(!strcmp(dest, orig_dest), "Expected %s, got %s.\n", debugstr_a(orig_dest), debugstr_a(dest)); + ok(!strcmp(dest, orig_dest), "Expected %s, got %s.\n", debugstr_a(orig_dest), debugstr_an(dest, ARRAY_SIZE(dest))); ok(size == strlen(dest) + 1, "Expected size %Iu, got %lu.\n", strlen(dest) + 1, size);
/* Test the length parameter. @@ -4507,7 +4507,7 @@ static void test_driver_store(struct testsign_context *ctx) memset(dest, 0xcc, sizeof(dest)); ret = pDriverStoreFindDriverPackageA("winetest.inf", 0, 0, system_info.wProcessorArchitecture, 0, dest, &size); ok(ret == E_INVALIDARG, "Got %#x.\n", ret); - ok(dest[0] == (char)0xcc, "Got %s.\n", debugstr_a(dest)); + ok(dest[0] == (char)0xcc, "Got %s.\n", debugstr_an(dest, ARRAY_SIZE(dest))); ok(size == MAX_PATH - 1, "Expected size %Iu, got %lu.\n", strlen(orig_dest) + 1, size);
size = 0; @@ -4582,7 +4582,7 @@ static void test_driver_store(struct testsign_context *ctx) ok(!ret || ret == HRESULT_FROM_WIN32(ERROR_NOT_FOUND) /* Win < 8 */, "Got %#x.\n", ret); if (!ret) { - ok(!strcmp(dest, orig_dest), "Expected %s, got %s.\n", debugstr_a(orig_dest), debugstr_a(dest)); + ok(!strcmp(dest, orig_dest), "Expected %s, got %s.\n", debugstr_a(orig_dest), debugstr_an(dest, ARRAY_SIZE(dest))); ok(size == strlen(dest) + 1, "Expected size %Iu, got %lu.\n", strlen(dest) + 1, size); }
@@ -4594,7 +4594,7 @@ static void test_driver_store(struct testsign_context *ctx) memset(dest, 0xcc, sizeof(dest)); ret = pDriverStoreFindDriverPackageA("not_winetest.inf", 0, 0, system_info.wProcessorArchitecture, 0, dest, &size); ok(ret == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got %#x.\n", ret); - ok(!dest[0], "Got %s.\n", debugstr_a(dest)); + ok(!dest[0], "Got %s.\n", debugstr_an(dest, ARRAY_SIZE(dest))); todo_wine ok(!size, "Got size %lu.\n", size);
ret = SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES, set, &device);