[2/3] schannel: Fix the name of the SetContextAttributes field of SECPKG_FUNCTION_TABLE.

Francois Gouget fgouget at free.fr
Sun May 27 06:36:48 CDT 2007


---
 dlls/schannel/lsamode.c    |    6 ++++--
 dlls/schannel/tests/main.c |    2 +-
 dlls/schannel/usermode.c   |    2 ++
 include/ntsecpkg.h         |    2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c
index b017eb9..e4d6503 100644
--- a/dlls/schannel/lsamode.c
+++ b/dlls/schannel/lsamode.c
@@ -26,6 +26,8 @@
 #include "winbase.h"
 #include "sspi.h"
 #include "ntsecapi.h"
+/* The A/W SetContextAttributes() macro in sspi.h interfers with ntsecpkg.h */
+#undef SetContextAttributes
 #include "ntsecpkg.h"
 #include "schannel.h"
 
@@ -107,7 +109,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] =
     NULL, /* SpQueryContextAttributes */
     NULL, /* SpAddCredentials */
     NULL, /* SetExtendedInformation */
-    NULL, /* SpSetContextAttributes */
+    NULL, /* SetContextAttributes */
     NULL, /* SetCredentialsAttributes */
   }, {
     NULL, /* InitializePackage */
@@ -137,7 +139,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] =
     NULL, /* SpQueryContextAttributes */
     NULL, /* SpAddCredentials */
     NULL, /* SetExtendedInformation */
-    NULL, /* SpSetContextAttributes */
+    NULL, /* SetContextAttributes */
     NULL, /* SetCredentialsAttributes */
   }
 };
diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c
index 88cafc7..69f4bd6 100644
--- a/dlls/schannel/tests/main.c
+++ b/dlls/schannel/tests/main.c
@@ -34,7 +34,7 @@
 
 /* Helper macros to find the size of SECPKG_FUNCTION_TABLE */
 #define SECPKG_FUNCTION_TABLE_SIZE_1 offsetof(SECPKG_FUNCTION_TABLE, \
-    SpSetContextAttributes)
+    SetContextAttributes)
 #define SECPKG_FUNCTION_TABLE_SIZE_2 offsetof(SECPKG_FUNCTION_TABLE, \
     SetCredentialsAttributes)
 #define SECPKG_FUNCTION_TABLE_SIZE_3 sizeof(SECPKG_FUNCTION_TABLE)
diff --git a/dlls/schannel/usermode.c b/dlls/schannel/usermode.c
index 0713f82..4807f1a 100644
--- a/dlls/schannel/usermode.c
+++ b/dlls/schannel/usermode.c
@@ -26,6 +26,8 @@
 #include "winbase.h"
 #include "sspi.h"
 #include "ntsecapi.h"
+/* The A/W SetContextAttributes() macro in sspi.h interfers with ntsecpkg.h */
+#undef SetContextAttributes
 #include "ntsecpkg.h"
 
 #include "wine/debug.h"
diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h
index b8ef222..3e2cea8 100644
--- a/include/ntsecpkg.h
+++ b/include/ntsecpkg.h
@@ -398,7 +398,7 @@ typedef struct SECPKG_FUNCTION_TABLE {
     SpAddCredentialsFn *SpAddCredentials;
     SpSetExtendedInformationFn *SetExtendedInformation;
     /* Packages with version SECPKG_INTERFACE_VERSION end here */
-    SpSetContextAttributesFn *SpSetContextAttributes;
+    SpSetContextAttributesFn *SetContextAttributes;
     /* Packages with version SECPKG_INTERFACE_VERSION_2 end here */
     SpSetCredentialsAttributesFn *SetCredentialsAttributes;
     /* Packages with version SECPKG_INTERFACE_VERSION_3 end here */
-- 
1.4.4.4




More information about the wine-patches mailing list