Changeset 21916 for trunk/src/secur32

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/secur32/Makefile.kmk (copied) (copied from branches/gcc-kmk/src/secur32/Makefile.kmk )
• src/secur32/initsecur32.cpp (deleted)
• src/secur32/initterm.cpp (copied) (copied from branches/gcc-kmk/src/secur32/initterm.cpp )
• src/secur32/makefile (deleted)
• src/secur32/secur32.c (modified) (2 diffs)
• src/secur32/secur32.def (modified) (3 diffs)
• src/secur32/secur32_priv.h (modified) (1 diff)
• src/secur32/thunks.c (modified) (1 diff)
• src/secur32/util.c (modified) (1 diff)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/secur32/secur32.c

@@ -17 +17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #include <assert.h>
 #include <stdarg.h>
+#include <memory.h>
 
 #include "ntstatus.h"
@@ -61 +63 @@
  *  Prototypes
  */
+
+ULONG WIN32API LsaNtStatusToWinError(NTSTATUS Status);
 
 /* Tries to load moduleName as a provider.  If successful, enumerates what

trunk/src/secur32/secur32.def

@@ -5 +5 @@
 EXPORTS
 
-AcceptSecurityContext = _AcceptSecurityContext@36 @1
-AcquireCredentialsHandleA = _AcquireCredentialsHandleA@36 @2
-AcquireCredentialsHandleW = _AcquireCredentialsHandleW@36 @3
-AddCredentialsA = _AddCredentialsA@32 @4
-AddCredentialsW = _AddCredentialsW@32 @5
+AcceptSecurityContext = "_AcceptSecurityContext@36" @1
+AcquireCredentialsHandleA = "_AcquireCredentialsHandleA@36" @2
+AcquireCredentialsHandleW = "_AcquireCredentialsHandleW@36" @3
+AddCredentialsA = "_AddCredentialsA@32" @4
+AddCredentialsW = "_AddCredentialsW@32" @5
 ;AddCredentialsW = _AddSecurityPackageA @6
 ;AddCredentialsW = _AddSecurityPackageW @7
-ApplyControlToken = _ApplyControlToken@8 @8
-CompleteAuthToken = _CompleteAuthToken@8 @9
-DecryptMessage = _DecryptMessage@16 @10
-DeleteSecurityContext = _DeleteSecurityContext@4 @11
+ApplyControlToken = "_ApplyControlToken@8" @8
+CompleteAuthToken = "_CompleteAuthToken@8" @9
+DecryptMessage = "_DecryptMessage@16" @10
+DeleteSecurityContext = "_DeleteSecurityContext@4" @11
 ;DeleteSecurityContext = _DeleteSecurityPackageA @12
 ;DeleteSecurityContext = _DeleteSecurityPackageW @13
-EncryptMessage = _EncryptMessage@16 @14
-EnumerateSecurityPackagesA = _EnumerateSecurityPackagesA@8 @15
-EnumerateSecurityPackagesW = _EnumerateSecurityPackagesW@8 @16
-ExportSecurityContext = _ExportSecurityContext@16 @17
-FreeContextBuffer = _FreeContextBuffer@4 @18
-FreeCredentialsHandle = _FreeCredentialsHandle@4 @19
-GetComputerObjectNameA = _GetComputerObjectNameA@12 @20
-GetComputerObjectNameW = _GetComputerObjectNameW@12 @21
+EncryptMessage = "_EncryptMessage@16" @14
+EnumerateSecurityPackagesA = "_EnumerateSecurityPackagesA@8" @15
+EnumerateSecurityPackagesW = "_EnumerateSecurityPackagesW@8" @16
+ExportSecurityContext = "_ExportSecurityContext@16" @17
+FreeContextBuffer = "_FreeContextBuffer@4" @18
+FreeCredentialsHandle = "_FreeCredentialsHandle@4" @19
+GetComputerObjectNameA = "_GetComputerObjectNameA@12" @20
+GetComputerObjectNameW = "_GetComputerObjectNameW@12" @21
 ;GetComputerObjectNameW = _GetSecurityUserInfo @22
-GetUserNameExA = _GetUserNameExA@12 @23
-GetUserNameExW = _GetUserNameExW@12 @24
-ImpersonateSecurityContext = _ImpersonateSecurityContext@4 @25
-ImportSecurityContextA = _ImportSecurityContextA@16 @26
-ImportSecurityContextW = _ImportSecurityContextW@16 @27
-InitSecurityInterfaceA = _InitSecurityInterfaceA@0 @28
-InitSecurityInterfaceW = _InitSecurityInterfaceW@0 @29
-InitializeSecurityContextA = _InitializeSecurityContextA@48 @30
-InitializeSecurityContextW = _InitializeSecurityContextW@48 @31
-LsaCallAuthenticationPackage = _LsaCallAuthenticationPackage@28 @32
-LsaConnectUntrusted = _LsaConnectUntrusted@4 @33
-LsaDeregisterLogonProcess = _LsaDeregisterLogonProcess@4 @34
-LsaEnumerateLogonSessions = _LsaEnumerateLogonSessions@8 @35
-LsaFreeReturnBuffer = _LsaFreeReturnBuffer@4 @36
-LsaGetLogonSessionData = _LsaGetLogonSessionData@8 @37
-LsaLogonUser = _LsaLogonUser@56 @38
-LsaLookupAuthenticationPackage = _LsaLookupAuthenticationPackage@12 @39
-LsaRegisterLogonProcess = _LsaRegisterLogonProcess@12 @40
+GetUserNameExA = "_GetUserNameExA@12" @23
+GetUserNameExW = "_GetUserNameExW@12" @24
+ImpersonateSecurityContext = "_ImpersonateSecurityContext@4" @25
+ImportSecurityContextA = "_ImportSecurityContextA@16" @26
+ImportSecurityContextW = "_ImportSecurityContextW@16" @27
+InitSecurityInterfaceA = "_InitSecurityInterfaceA@0" @28
+InitSecurityInterfaceW = "_InitSecurityInterfaceW@0" @29
+InitializeSecurityContextA = "_InitializeSecurityContextA@48" @30
+InitializeSecurityContextW = "_InitializeSecurityContextW@48" @31
+LsaCallAuthenticationPackage = "_LsaCallAuthenticationPackage@28" @32
+LsaConnectUntrusted = "_LsaConnectUntrusted@4" @33
+LsaDeregisterLogonProcess = "_LsaDeregisterLogonProcess@4" @34
+LsaEnumerateLogonSessions = "_LsaEnumerateLogonSessions@8" @35
+LsaFreeReturnBuffer = "_LsaFreeReturnBuffer@4" @36
+LsaGetLogonSessionData = "_LsaGetLogonSessionData@8" @37
+LsaLogonUser = "_LsaLogonUser@56" @38
+LsaLookupAuthenticationPackage = "_LsaLookupAuthenticationPackage@12" @39
+LsaRegisterLogonProcess = "_LsaRegisterLogonProcess@12" @40
 ;LsaRegisterLogonProcess = _LsaRegisterPolicyChangeNotification @41
 ;LsaRegisterLogonProcess = _LsaUnregisterPolicyChangeNotification @42
-MakeSignature = _MakeSignature@16 @43
-QueryContextAttributesA = _QueryContextAttributesA@12 @44
-QueryContextAttributesW = _QueryContextAttributesW@12 @45
-QueryCredentialsAttributesA = _QueryCredentialsAttributesA@12 @46
-QueryCredentialsAttributesW = _QueryCredentialsAttributesW@12 @47
-QuerySecurityContextToken = _QuerySecurityContextToken@8 @48
-QuerySecurityPackageInfoA = _QuerySecurityPackageInfoA@8 @49
-QuerySecurityPackageInfoW = _QuerySecurityPackageInfoW@8 @50
-RevertSecurityContext = _RevertSecurityContext@4 @51
+MakeSignature = "_MakeSignature@16" @43
+QueryContextAttributesA = "_QueryContextAttributesA@12" @44
+QueryContextAttributesW = "_QueryContextAttributesW@12" @45
+QueryCredentialsAttributesA = "_QueryCredentialsAttributesA@12" @46
+QueryCredentialsAttributesW = "_QueryCredentialsAttributesW@12" @47
+QuerySecurityContextToken = "_QuerySecurityContextToken@8" @48
+QuerySecurityPackageInfoA = "_QuerySecurityPackageInfoA@8" @49
+QuerySecurityPackageInfoW = "_QuerySecurityPackageInfoW@8" @50
+RevertSecurityContext = "_RevertSecurityContext@4" @51
 ;RevertSecurityContext = _SaslAcceptSecurityContext @52
 ;RevertSecurityContext = _SaslEnumerateProfilesA @53
@@ -65 +65 @@
 ;RevertSecurityContext = _SaslInitializeSecurityContextA @59
 ;RevertSecurityContext = _SaslInitializeSecurityContextW @60
-SealMessage = _EncryptMessage@16 @61
+SealMessage = "_EncryptMessage@16" @61
 ;SealMessage = _SecCacheSspiPackages @62
 ;SealMessage = _SecGetLocaleSpecificEncryptionRules @63
@@ -71 +71 @@
 ;SealMessage = _SecpTranslateName @65
 ;SealMessage = _SecpTranslateNameEx @66
-TranslateNameA = _TranslateNameA@20 @67
-TranslateNameW = _TranslateNameW@20 @68
-UnsealMessage = _DecryptMessage@16 @69
-VerifySignature = _VerifySignature@16 @70
+TranslateNameA = "_TranslateNameA@20" @67
+TranslateNameW = "_TranslateNameW@20" @68
+UnsealMessage = "_DecryptMessage@16" @69
+VerifySignature = "_VerifySignature@16" @70
 
 IMPORTS
 
 CredFree = ADVAPI32.509
-_CredReadW@16 = ADVAPI32.510
-LsaNtStatusToWinError = ADVAPI32.223
-_NetWkstaUserGetInfo@12 = NETAPI32.202
+"_CredReadW@16" = ADVAPI32.510
+"_NetWkstaUserGetInfo@12" = NETAPI32.202
 

trunk/src/secur32/secur32_priv.h

@@ -25 +25 @@
 #include "wine/list.h"
 
+#ifndef __EMX__
 typedef ULONG pid_t;
+#endif
 
 typedef struct _SecureProvider

trunk/src/secur32/thunks.c

@@ -18 +18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #include <stdarg.h>
+#include <memory.h>
+
 #include "windef.h"
 #include "winbase.h"

trunk/src/secur32/util.c

@@ -18 +18 @@
  * This file contains various helper functions needed for NTLM and maybe others
  */
+
 #include <stdarg.h>
 #include <stdio.h>
+#include <memory.h>
+
 #include "windef.h"
 #include "winbase.h"

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk