[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-cvs
Subject:    =?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: imagehlp/tests: Don' t test
From:       Alexandre Julliard <julliard () winehq ! org>
Date:       2010-12-31 17:01:03
Message-ID: E1PYiLf-0004zY-9u () wine ! codeweavers ! com
[Download RAW message or body]

Module: wine
Branch: master
Commit: 9571e4f29fb8bfffa5e77238e90062a982358964
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9571e4f29fb8bfffa5e77238e90062a982358964


Author: André Hentschel <nerv@dawncrow.de>
Date:   Thu Dec 30 19:59:42 2010 +0100

imagehlp/tests: Don't test function directly when reporting GetLastError().

---

 dlls/imagehlp/tests/integrity.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c
index 6f297dc..10af9fa 100644
--- a/dlls/imagehlp/tests/integrity.c
+++ b/dlls/imagehlp/tests/integrity.c
@@ -141,6 +141,7 @@ static void test_add_certificate(char *cert_data, int len)
     LPWIN_CERTIFICATE cert;
     DWORD cert_len;
     DWORD index;
+    BOOL ret;
 
     hFile = CreateFileA(test_dll_path, GENERIC_READ | GENERIC_WRITE, \
FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);  
@@ -165,7 +166,8 @@ static void test_add_certificate(char *cert_data, int len)
     cert->wCertificateType = WIN_CERT_TYPE_PKCS_SIGNED_DATA;
     CopyMemory(cert->bCertificate, cert_data, len);
 
-    ok(pImageAddCertificate(hFile, cert, &index), "Unable to add certificate to \
image, error %x\n", GetLastError()); +    ret = pImageAddCertificate(hFile, cert, \
&index); +    ok(ret, "Unable to add certificate to image, error %x\n", \
GetLastError());  
     HeapFree(GetProcessHeap(), 0, cert);
     CloseHandle(hFile);
@@ -211,6 +213,7 @@ static void test_remove_certificate(int index)
 {
     DWORD orig_count = 0, count = 0;
     HANDLE hFile;
+    BOOL ret;
 
     hFile = CreateFileA(test_dll_path, GENERIC_READ | GENERIC_WRITE, \
FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);  
@@ -220,9 +223,10 @@ static void test_remove_certificate(int index)
         return;
     }
 
-    ok (pImageEnumerateCertificates(hFile, CERT_SECTION_TYPE_ANY, &orig_count, NULL, \
                0), "Unable to enumerate certificates in file; err=%x\n", \
                GetLastError());
-
-    ok (pImageRemoveCertificate(hFile, index), "Unable to remove certificate from \
file; err=%x\n", GetLastError()); +    ret = pImageEnumerateCertificates(hFile, \
CERT_SECTION_TYPE_ANY, &orig_count, NULL, 0); +    ok (ret, "Unable to enumerate \
certificates in file; err=%x\n", GetLastError()); +    ret = \
pImageRemoveCertificate(hFile, index); +    ok (ret, "Unable to remove certificate \
from file; err=%x\n", GetLastError());  
     /* Test to see if the certificate has actually been removed */
     pImageEnumerateCertificates(hFile, CERT_SECTION_TYPE_ANY, &count, NULL, 0);


[prev in list] [next in list] [prev in thread] [next in thread]