Module: wine Branch: master Commit: 640dd17acfe10d41aa55423ec520163e55545613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=640dd17acfe10d41aa55423ec5...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Oct 17 23:10:47 2013 +0200
wintrust/tests: Compile with -D__WINESRC__.
---
dlls/wintrust/tests/Makefile.in | 1 - dlls/wintrust/tests/crypt.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index 3a875b2..b40817c 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = wintrust.dll IMPORTS = wintrust crypt32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ asn.c \ diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 8534ce1..cb5818e 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -23,6 +23,7 @@ #include <stdio.h>
#include "windows.h" +#include "wincrypt.h" #include "mscat.h"
#include "wine/test.h" @@ -251,23 +252,23 @@ static void test_context(void) } ok(hca != NULL, "Expected a context handle, got NULL\n");
- attrs = GetFileAttributes(catroot); + attrs = GetFileAttributesA(catroot); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected the CatRoot directory to exist\n");
/* Windows creates the GUID directory in capitals */ lstrcpyA(dummydir, catroot); lstrcatA(dummydir, "\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); - attrs = GetFileAttributes(dummydir); + attrs = GetFileAttributesA(dummydir); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected CatRoot\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n");
/* Only present on XP or higher. */ - attrs = GetFileAttributes(catroot2); + attrs = GetFileAttributesA(catroot2); if (attrs != INVALID_FILE_ATTRIBUTES) { lstrcpyA(dummydir, catroot2); lstrcatA(dummydir, "\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); - attrs = GetFileAttributes(dummydir); + attrs = GetFileAttributesA(dummydir); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected CatRoot2\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); } @@ -589,7 +590,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void)
lstrcpyA(catfilepath, catroot); lstrcatA(catfilepath, "\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}\winetest.cat"); - attrs = GetFileAttributes(catfilepath); + attrs = GetFileAttributesA(catfilepath); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); todo_wine ok(attrs == FILE_ATTRIBUTE_SYSTEM || @@ -617,12 +618,12 @@ static void test_CryptCATAdminAddRemoveCatalog(void) ret = pCryptCATAdminRemoveCatalog(hcatadmin, info.wszCatalogFile, 0); ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); /* The call succeeded with the full path but the file is not removed */ - attrs = GetFileAttributes(catfilepath); + attrs = GetFileAttributesA(catfilepath); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); /* Given only the filename the file is removed */ ret = pCryptCATAdminRemoveCatalog(hcatadmin, basenameW, 0); ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); - attrs = GetFileAttributes(catfilepath); + attrs = GetFileAttributesA(catfilepath); ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath);
cleanup: