- Covert to spec.

- Fix 64bit build.
- Could benefit from a WINE sync. ;)

svn path=/branches/ros-amd64-bringup/; revision=36935

diff --git a/reactos/dll/win32/secur32/lsa.c b/reactos/dll/win32/secur32/lsa.c
index b8ff260..187508c 100644 (file)
--- a/reactos/dll/win32/secur32/lsa.c
+++ b/reactos/dll/win32/secur32/lsa.c
@@ -256,8 +256,8 @@ LsaLogonUser(HANDLE LsaHandle,
                                    0,
                                  Reply->d.LogonUserReply.ProfileBufferLength);
    memcpy(*ProfileBuffer,
-         (PVOID)((ULONG)Reply->d.LogonUserReply.Data +
-                 (ULONG)Reply->d.LogonUserReply.ProfileBuffer),
+         (PVOID)((ULONG_PTR)Reply->d.LogonUserReply.Data +
+                 (ULONG_PTR)Reply->d.LogonUserReply.ProfileBuffer),
          Reply->d.LogonUserReply.ProfileBufferLength);
    *LogonId = Reply->d.LogonUserReply.LogonId;
    *Token = Reply->d.LogonUserReply.Token;

diff --git a/reactos/dll/win32/secur32/secur32.def b/reactos/dll/win32/secur32/secur32.def
deleted file mode 100644 (file)
index 38ae5e3..0000000
--- a/reactos/dll/win32/secur32/secur32.def
+++ /dev/null
@@ -1,79 +0,0 @@
-LIBRARY SECUR32.DLL
-EXPORTS
-LsaRegisterLogonProcess@12
-LsaLogonUser@56
-LsaDeregisterLogonProcess@4
-LsaConnectUntrusted@4
-LsaLookupAuthenticationPackage@12
-LsaFreeReturnBuffer@4
-LsaCallAuthenticationPackage@28
-;AcceptSecurityContext@36
-AcquireCredentialsHandleA@36
-AcquireCredentialsHandleW@36
-;@AddCredentialsA
-;@AddCredentialsW
-;@AddSecurityPackageA
-;@AddSecurityPackageW
-;ApplyControlTokenA@8
-ApplyControlToken@8=ApplyControlTokenW@8
-CompleteAuthToken@8
-;@CredMarshalTargetInfo
-;@CredUnmarshalTargetInfo
-DecryptMessage@16
-DeleteSecurityContext@4
-;@DeleteSecurityPackageA
-;@DeleteSecurityPackageW
-EncryptMessage@16
-EnumerateSecurityPackagesA@8
-EnumerateSecurityPackagesW@8
-;@ExportSecurityContext
-FreeContextBuffer@4
-FreeCredentialsHandle@4
-GetComputerObjectNameA@12
-GetComputerObjectNameW@12
-;GetSecurityUserInfo
-GetUserNameExA@12
-GetUserNameExW@12
-;ImpersonateSecurityContext@4
-;@ImportSecurityContextA
-;@ImportSecurityContextW
-;@InitSecurityInterfaceA
-InitSecurityInterfaceW@0
-InitializeSecurityContextA@48
-InitializeSecurityContextW@48
-LsaEnumerateLogonSessions@8
-LsaGetLogonSessionData@8
-LsaRegisterPolicyChangeNotification@8
-LsaUnregisterPolicyChangeNotification@8
-MakeSignature@16
-QueryContextAttributesA@12
-QueryContextAttributesW@12
-;QueryCredentialsAttributesA@12
-;QueryCredentialsAttributesW@12
-;@QuerySecurityContextToken
-QuerySecurityPackageInfoA@8
-QuerySecurityPackageInfoW@8
-;RevertSecurityContext@4
-;@SaslAcceptSecurityContext
-;@SaslEnumerateProfilesA
-;@SaslEnumerateProfilesW
-;@SaslGetProfilePackageA
-;@SaslGetProfilePackageW
-;@SaslIdentifyPackageA
-;@SaslIdentifyPackageW
-;@SaslInitializeSecurityContextA
-;@SaslInitializeSecurityContextW
-;SealMessage
-;SecCacheSspiPackages
-;SecDeleteUserModeContext
-;SecGetLocaleSpecificEncryptionRules
-;SecInitUserModeContext
-;SecpFreeMemory
-;SecpTranslateName
-;SecpTranslateNameEx
-;@SetContextAttributesA
-;@SetContextAttributesW
-;TranslateNameA@20
-;TranslateNameW@20
-;UnsealMessage
-VerifySignature@16

diff --git a/reactos/dll/win32/secur32/secur32.rbuild b/reactos/dll/win32/secur32/secur32.rbuild
index a1f0d82..9ba0169 100644 (file)
--- a/reactos/dll/win32/secur32/secur32.rbuild
+++ b/reactos/dll/win32/secur32/secur32.rbuild
@@ -1,5 +1,5 @@
 <module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}" installbase="system32" installname="secur32.dll">
-       <importlibrary definition="secur32.def" />
+       <importlibrary definition="secur32.spec" />
        <include base="secur32">.</include>
        <include base="ReactOS">include/reactos/subsys</include>
        <define name="__SECUR32__" />
@@ -12,5 +12,6 @@
        <file>secext.c</file>
        <file>sspi.c</file>
        <file>secur32.rc</file>
+       <file>secur32.spec</file>
        <pch>precomp.h</pch>
 </module>

diff --git a/reactos/dll/win32/secur32/secur32.spec b/reactos/dll/win32/secur32/secur32.spec
new file mode 100644 (file)
index 0000000..9fe6114
--- /dev/null
+++ b/reactos/dll/win32/secur32/secur32.spec
@@ -0,0 +1,73 @@
+  1 stub SecDeleteUserModeContext
+  2 stub SecInitUserModeContext
+  
+  #@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr)
+  @ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr)
+  @ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr)
+  #@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr)
+  #@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr)
+  @ stub AddSecurityPackageA
+  @ stub AddSecurityPackageW
+  #@ stdcall ApplyControlToken(ptr ptr)
+  @ stdcall CompleteAuthToken(ptr ptr)
+  @ stdcall DecryptMessage(ptr ptr long ptr)
+  @ stdcall DeleteSecurityContext(ptr)
+  @ stub DeleteSecurityPackageA
+  @ stub DeleteSecurityPackageW
+  @ stdcall EncryptMessage(ptr long ptr long)
+  @ stdcall EnumerateSecurityPackagesA(ptr ptr)
+  @ stdcall EnumerateSecurityPackagesW(ptr ptr)
+  #@ stdcall ExportSecurityContext(ptr long ptr ptr)
+  @ stdcall FreeContextBuffer(ptr)
+  @ stdcall FreeCredentialsHandle(ptr)
+  @ stdcall GetComputerObjectNameA(long ptr ptr)
+  @ stdcall GetComputerObjectNameW(long ptr ptr)
+  @ stub GetSecurityUserInfo
+  @ stdcall GetUserNameExA(long ptr ptr)
+  @ stdcall GetUserNameExW(long ptr ptr)
+  #@ stdcall ImpersonateSecurityContext(ptr)
+  #@ stdcall ImportSecurityContextA(str ptr ptr ptr)
+  #@ stdcall ImportSecurityContextW(wstr ptr ptr ptr)
+  #@ stdcall InitSecurityInterfaceA()
+  @ stdcall InitSecurityInterfaceW()
+  @ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr)
+  @ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr)
+  @ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr)
+  @ stdcall LsaConnectUntrusted(long)
+  @ stdcall LsaDeregisterLogonProcess(long)
+  @ stdcall LsaEnumerateLogonSessions(ptr ptr)
+  @ stdcall LsaFreeReturnBuffer(ptr)
+  @ stdcall LsaGetLogonSessionData(ptr ptr)
+  @ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr)
+  @ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr)
+  @ stdcall LsaRegisterLogonProcess(ptr ptr ptr)
+  @ stub LsaRegisterPolicyChangeNotification
+  @ stub LsaUnregisterPolicyChangeNotification
+  @ stdcall MakeSignature(ptr long ptr long)
+  @ stdcall QueryContextAttributesA(ptr long ptr)
+  @ stdcall QueryContextAttributesW(ptr long ptr)
+  #@ stdcall QueryCredentialsAttributesA(ptr long ptr)
+  #@ stdcall QueryCredentialsAttributesW(ptr long ptr)
+  #@ stdcall QuerySecurityContextToken(ptr ptr)
+  @ stdcall QuerySecurityPackageInfoA(str ptr)
+  @ stdcall QuerySecurityPackageInfoW(wstr ptr)
+  #@ stdcall RevertSecurityContext(ptr)
+  @ stub SaslAcceptSecurityContext
+  @ stub SaslEnumerateProfilesA
+  @ stub SaslEnumerateProfilesW
+  @ stub SaslGetProfilePackageA
+  @ stub SaslGetProfilePackageW
+  @ stub SaslIdentifyPackageA
+  @ stub SaslIdentifyPackageW
+  @ stub SaslInitializeSecurityContextA
+  @ stub SaslInitializeSecurityContextW
+  @ stdcall SealMessage(ptr long ptr long) EncryptMessage
+  @ stub SecCacheSspiPackages
+  @ stub SecGetLocaleSpecificEncryptionRules
+  @ stub SecpFreeMemory
+  @ stub SecpTranslateName
+  @ stub SecpTranslateNameEx
+  #@ stdcall TranslateNameA(str long long ptr ptr)
+  #@ stdcall TranslateNameW(wstr long long ptr ptr)
+  @ stdcall UnsealMessage(ptr ptr long ptr) DecryptMessage
+  @ stdcall VerifySignature(ptr ptr long ptr)