Alexandre Julliard : cryptnet/tests: Don't import shlwapi.
Alexandre Julliard
julliard at winehq.org
Thu Nov 25 11:18:56 CST 2010
Module: wine
Branch: master
Commit: 0a28308b9076b7a53c45dd2fb570915d9b5f2a15
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a28308b9076b7a53c45dd2fb570915d9b5f2a15
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Nov 25 12:01:43 2010 +0100
cryptnet/tests: Don't import shlwapi.
---
dlls/cryptnet/tests/Makefile.in | 2 +-
dlls/cryptnet/tests/cryptnet.c | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/cryptnet/tests/Makefile.in b/dlls/cryptnet/tests/Makefile.in
index 2cef5b6..7fe1e32 100644
--- a/dlls/cryptnet/tests/Makefile.in
+++ b/dlls/cryptnet/tests/Makefile.in
@@ -1,5 +1,5 @@
TESTDLL = cryptnet.dll
-IMPORTS = cryptnet crypt32 shlwapi
+IMPORTS = cryptnet crypt32
C_SRCS = \
cryptnet.c
diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c
index aab3724..64491e7 100644
--- a/dlls/cryptnet/tests/cryptnet.c
+++ b/dlls/cryptnet/tests/cryptnet.c
@@ -24,7 +24,6 @@
#include <winbase.h>
#include <winerror.h>
#include <wincrypt.h>
-#include <shlwapi.h>
#include "wine/test.h"
static const BYTE bigCert[] = {
@@ -324,7 +323,6 @@ static void test_retrieveObjectByUrl(void)
HCERTSTORE store;
CRYPT_RETRIEVE_AUX_INFO aux = { 0 };
FILETIME ft = { 0 };
- DWORD urllen;
SetLastError(0xdeadbeef);
ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL);
@@ -334,8 +332,7 @@ static void test_retrieveObjectByUrl(void)
GetLastError(), GetLastError());
make_tmp_file(tmpfile);
- urllen = sizeof(url);
- UrlCanonicalizeA(tmpfile, url, &urllen, URL_WININET_COMPATIBILITY);
+ snprintf(url, sizeof(url), "file://%s", tmpfile);
pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef;
ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray,
More information about the wine-cvs
mailing list