From 1dc0c15eeff819c8bab1bb593ae38e07f33d614f Mon Sep 17 00:00:00 2001 From: Reece Dunn Date: Thu, 24 Jul 2008 19:52:19 +0100 Subject: [PATCH] crypt32/tests: fix the protectdata tests on Vista. --- dlls/crypt32/tests/protectdata.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index b77b81b..ae667c1 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -82,10 +82,7 @@ static void test_cryptprotectdata(void) SetLastError(0xDEADBEEF); protected = pCryptProtectData(&plain,desc,&entropy,NULL,NULL,0,&cipher_entropy); ok(protected, "Encrypting with entropy.\n"); - r = GetLastError(); - ok(r == ERROR_SUCCESS || - r == ERROR_IO_PENDING, /* win2k */ - "Expected ERROR_SUCCESS or ERROR_IO_PENDING, got %d\n",r); + /* Vista does not set last error on success, but earlier versions do, so we can't test this. */ cipher_no_desc.pbData=NULL; cipher_no_desc.cbData=0; @@ -95,16 +92,12 @@ static void test_cryptprotectdata(void) plain.cbData=strlen(secret2)+1; SetLastError(0xDEADBEEF); protected = pCryptProtectData(&plain,NULL,&entropy,NULL,NULL,0,&cipher_no_desc); - r = GetLastError(); - if (protected) - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } - else + /* Vista does not set last error on success, but earlier versions do, so we can't test this. */ + if (!protected) { /* fails in win2k */ - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } } @@ -158,8 +151,7 @@ static void test_cryptunprotectdata(void) SetLastError(0xDEADBEEF); okay = pCryptUnprotectData(&cipher,&data_desc,NULL,NULL,NULL,0,&plain); ok(okay,"Decrypting without entropy\n"); - r = GetLastError(); - ok(r == ERROR_SUCCESS, "Wrong (%u) GetLastError seen\n",r); + /* Vista does not set last error on success, but earlier versions do, so we can't test this. */ ok(plain.pbData!=NULL,"Plain DATA_BLOB missing data\n"); ok(plain.cbData==strlen(secret)+1,"Plain DATA_BLOB wrong length\n"); @@ -185,8 +177,7 @@ static void test_cryptunprotectdata(void) SetLastError(0xDEADBEEF); okay = pCryptUnprotectData(&cipher_entropy,&data_desc,&entropy,NULL,NULL,0,&plain); ok(okay,"Decrypting with entropy\n"); - r = GetLastError(); - ok(r == ERROR_SUCCESS, "Wrong (%u) GetLastError seen\n",r); + /* Vista does not set last error on success, but earlier versions do, so we can't test this. */ ok(plain.pbData!=NULL,"Plain DATA_BLOB missing data\n"); ok(plain.cbData==strlen(secret)+1,"Plain DATA_BLOB wrong length\n"); @@ -205,8 +196,7 @@ static void test_cryptunprotectdata(void) SetLastError(0xDEADBEEF); okay = pCryptUnprotectData(&cipher_no_desc,&data_desc,&entropy,NULL,NULL,0,&plain); ok(okay,"Decrypting with entropy and no description\n"); - r = GetLastError(); - ok(r == ERROR_SUCCESS, "Wrong (%u) GetLastError seen\n",r); + /* Vista does not set last error on success, but earlier versions do, so we can't test this. */ ok(plain.pbData!=NULL,"Plain DATA_BLOB missing data\n"); ok(plain.cbData==strlen(secret2)+1,"Plain DATA_BLOB wrong length\n"); -- 1.5.6.1.1071.g76fb