Paul Vriens : crypt32:
Fix the adding of pwszIsFunctionName and pwszIsFunctionNameFmt2.
Alexandre Julliard
julliard at wine.codeweavers.com
Sun Sep 10 03:28:25 CDT 2006
Module: wine
Branch: master
Commit: 869b6f7759cbdbbec884f05b1a05413621f22199
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=869b6f7759cbdbbec884f05b1a05413621f22199
Author: Paul Vriens <Paul.Vriens at xs4all.nl>
Date: Fri Sep 8 16:35:24 2006 +0200
crypt32: Fix the adding of pwszIsFunctionName and pwszIsFunctionNameFmt2.
---
dlls/crypt32/main.c | 8 +++++---
dlls/crypt32/tests/main.c | 9 +++------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c
index 405990a..40cf7c3 100644
--- a/dlls/crypt32/main.c
+++ b/dlls/crypt32/main.c
@@ -285,11 +285,12 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_
return FALSE;
}
- TRACE("%s %s %s %s\n",
+ TRACE("%s %s %s %s %s\n",
debugstr_guid( psNewProv->pgSubject ),
debugstr_w( psNewProv->pwszDLLFileName ),
debugstr_w( psNewProv->pwszMagicNumber ),
- debugstr_w( psNewProv->pwszIsFunctionName ) );
+ debugstr_w( psNewProv->pwszIsFunctionName ),
+ debugstr_w( psNewProv->pwszIsFunctionNameFmt2 ) );
#define CRYPT_SIPADDPROV( key, field ) \
r = CRYPT_SIPWriteFunction( psNewProv->pgSubject, key, \
@@ -301,7 +302,8 @@ #define CRYPT_SIPADDPROV( key, field ) \
CRYPT_SIPADDPROV( szRemoveSigned, pwszRemoveFuncName );
CRYPT_SIPADDPROV( szCreate, pwszCreateFuncName );
CRYPT_SIPADDPROV( szVerify, pwszVerifyFuncName );
- CRYPT_SIPADDPROV( szIsMyFile, pwszIsFunctionNameFmt2 );
+ CRYPT_SIPADDPROV( szIsMyFile, pwszIsFunctionName );
+ CRYPT_SIPADDPROV( szIsMyFile2, pwszIsFunctionNameFmt2 );
#undef CRYPT_SIPADDPROV
diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c
index 3e27170..76ffab7 100644
--- a/dlls/crypt32/tests/main.c
+++ b/dlls/crypt32/tests/main.c
@@ -415,12 +415,9 @@ static void test_AddRemoveProvider(void)
/* Dummy provider should be deleted */
SetLastError(0xdeadbeef);
ret = CryptSIPRemoveProvider(&actionid);
- todo_wine
- {
- ok ( ret, "CryptSIPRemoveProvider should have succeeded\n");
- ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n",
- GetLastError());
- }
+ ok ( ret, "CryptSIPRemoveProvider should have succeeded\n");
+ ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n",
+ GetLastError());
}
START_TEST(main)
More information about the wine-cvs
mailing list