wintrust/tests: Fix test for pfnAddSgnr2Chain.

Sebastian Lackner sebastian at fds-team.de
Thu Sep 1 08:53:52 CDT 2016


Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---

The interpretation of the test result is wrong here - the data is copied, but
the index is ignored. Spotted because of the swapped memmove() arguments in
the implementation. I'm not fixing it in the same patch because internal code
might rely on this bug, so it needs further investigations.

Crashes and test failures on various Windows version already exist before. ;)

 dlls/wintrust/tests/softpub.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c
index 436de47..624371d 100644
--- a/dlls/wintrust/tests/softpub.c
+++ b/dlls/wintrust/tests/softpub.c
@@ -176,16 +176,15 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs)
         ok(data.csSigners == 2, "Expected 2 signers, got %d\n", data.csSigners);
         ok(!memcmp(&data.pasSigners[1], &sgnr, sizeof(sgnr)),
          "Unexpected data in signer\n");
-        /* This also adds, but the data aren't copied */
+        /* This also adds, but the index is ignored */
         sgnr.cbStruct = sizeof(DWORD);
         ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr);
         ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError());
         ok(data.csSigners == 3, "Expected 3 signers, got %d\n", data.csSigners);
-        ok(data.pasSigners[0].cbStruct == 0, "Unexpected data size %d\n",
-         data.pasSigners[0].cbStruct);
-        ok(data.pasSigners[0].sftVerifyAsOf.dwLowDateTime == 0,
-         "Unexpected verify time %d\n",
-         data.pasSigners[0].sftVerifyAsOf.dwLowDateTime);
+        sgnr.sftVerifyAsOf.dwLowDateTime = 0;
+        todo_wine
+        ok(!memcmp(&data.pasSigners[2], &sgnr, sizeof(sgnr)),
+           "Unexpected data in signer\n");
         /* But too large a thing isn't added */
         sgnr.cbStruct = sizeof(sgnr) + sizeof(DWORD);
         SetLastError(0xdeadbeef);
-- 
2.9.0



More information about the wine-patches mailing list