Commit 640dd17a authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

wintrust/tests: Compile with -D__WINESRC__.

parent df62b94c
TESTDLL = wintrust.dll TESTDLL = wintrust.dll
IMPORTS = wintrust crypt32 advapi32 IMPORTS = wintrust crypt32 advapi32
EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ C_SRCS = \
asn.c \ asn.c \
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include "windows.h" #include "windows.h"
#include "wincrypt.h"
#include "mscat.h" #include "mscat.h"
#include "wine/test.h" #include "wine/test.h"
...@@ -251,23 +252,23 @@ static void test_context(void) ...@@ -251,23 +252,23 @@ static void test_context(void)
} }
ok(hca != NULL, "Expected a context handle, got NULL\n"); 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"); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected the CatRoot directory to exist\n");
/* Windows creates the GUID directory in capitals */ /* Windows creates the GUID directory in capitals */
lstrcpyA(dummydir, catroot); lstrcpyA(dummydir, catroot);
lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}");
attrs = GetFileAttributes(dummydir); attrs = GetFileAttributesA(dummydir);
ok(attrs != INVALID_FILE_ATTRIBUTES, ok(attrs != INVALID_FILE_ATTRIBUTES,
"Expected CatRoot\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); "Expected CatRoot\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n");
/* Only present on XP or higher. */ /* Only present on XP or higher. */
attrs = GetFileAttributes(catroot2); attrs = GetFileAttributesA(catroot2);
if (attrs != INVALID_FILE_ATTRIBUTES) if (attrs != INVALID_FILE_ATTRIBUTES)
{ {
lstrcpyA(dummydir, catroot2); lstrcpyA(dummydir, catroot2);
lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}");
attrs = GetFileAttributes(dummydir); attrs = GetFileAttributesA(dummydir);
ok(attrs != INVALID_FILE_ATTRIBUTES, ok(attrs != INVALID_FILE_ATTRIBUTES,
"Expected CatRoot2\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); "Expected CatRoot2\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n");
} }
...@@ -589,7 +590,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) ...@@ -589,7 +590,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void)
lstrcpyA(catfilepath, catroot); lstrcpyA(catfilepath, catroot);
lstrcatA(catfilepath, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}\\winetest.cat"); 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); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath);
todo_wine todo_wine
ok(attrs == FILE_ATTRIBUTE_SYSTEM || ok(attrs == FILE_ATTRIBUTE_SYSTEM ||
...@@ -617,12 +618,12 @@ static void test_CryptCATAdminAddRemoveCatalog(void) ...@@ -617,12 +618,12 @@ static void test_CryptCATAdminAddRemoveCatalog(void)
ret = pCryptCATAdminRemoveCatalog(hcatadmin, info.wszCatalogFile, 0); ret = pCryptCATAdminRemoveCatalog(hcatadmin, info.wszCatalogFile, 0);
ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError());
/* The call succeeded with the full path but the file is not removed */ /* 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); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath);
/* Given only the filename the file is removed */ /* Given only the filename the file is removed */
ret = pCryptCATAdminRemoveCatalog(hcatadmin, basenameW, 0); ret = pCryptCATAdminRemoveCatalog(hcatadmin, basenameW, 0);
ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); 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); ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath);
cleanup: cleanup:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment