[ros-diffs] [sserapion] 52694: [SSPI] - Add/modify cmake files for new/edited modules. - Fix multiple definition of exports(thanks to msvc). [WININET] - Continue not using wintrnl.h

Author: sserapion
Date: Sat Jul 16 00:51:24 2011
New Revision: 52694

URL: http://svn.reactos.org/svn/reactos?rev=52694&view=rev
Log:
[SSPI]
- Add/modify cmake files for new/edited modules.
- Fix multiple definition of exports(thanks to msvc).
[WININET]
- Continue not using wintrnl.h

Added:
    branches/sspi-bringup/reactos/dll/win32/ntlmssp/CMakeLists.txt   (with props)
Modified:
    branches/sspi-bringup/reactos/dll/win32/CMakeLists.txt
    branches/sspi-bringup/reactos/dll/win32/secur32/CMakeLists.txt
    branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec
    branches/sspi-bringup/reactos/dll/win32/wininet/http.c

Modified: branches/sspi-bringup/reactos/dll/win32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/C...
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat Jul 16 00:51:24 2011
@@ -125,6 +125,7 @@
 add_subdirectory(newdev)
 add_subdirectory(ntdsapi)
 add_subdirectory(ntlanman)
+add_subdirectory(ntlmssp)
 add_subdirectory(ntmarta)
 add_subdirectory(ntprint)
 add_subdirectory(objsel)

Added: branches/sspi-bringup/reactos/dll/win32/ntlmssp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/n...
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/ntlmssp/CMakeLists.txt (added)
+++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/CMakeLists.txt [iso-8859-1] Sat Jul 16 00:51:24 2011
@@ -1,0 +1,32 @@
+
+set_unicode()
+
+spec2def(ntlmssp.dll ntlmssp.spec)
+
+list(APPEND SOURCE
+    avl.c
+	calculations.c
+	ciphers.c
+	context.c
+	credentials.c
+	crypt.c
+	debug.c
+	dllmain.c
+    messages.c
+	ntlmssp.c
+	protocol.c
+	stubs.c
+	sign.c
+	util.c
+    ${CMAKE_CURRENT_BINARY_DIR}/ntlmssp_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/ntlmssp.def)
+
+add_library(ntlmssp SHARED ${SOURCE})
+
+set_module_type(ntlmssp win32dll)
+
+target_link_libraries(ntlmssp wine)
+
+add_importlibs(ntlmssp advapi32 crypt32 kernel32 msvcrt netapi32 ntdll)
+
+add_cd_file(TARGET ntlmssp DESTINATION reactos/system32 FOR all)

Propchange: branches/sspi-bringup/reactos/dll/win32/ntlmssp/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/sspi-bringup/reactos/dll/win32/secur32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/s...
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Sat Jul 16 00:51:24 2011
@@ -7,9 +7,13 @@
 list(APPEND SOURCE
     dllmain.c
     secext.c
+	secur32.c
+    secur32.rc
+	sspap.c
     sspi.c
-    secur32.rc
     stubs.c
+	thunks.c
+	wrapper.c
     ${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/secur32.def
 )
@@ -18,7 +22,7 @@

set_module_type(secur32 win32dll)

-target_link_libraries(secur32 lsalib)
+target_link_libraries(secur32 wine lsalib)

add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll)
 add_pch(secur32 precomp.h)

Modified: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec
URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/s...
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] Sat Jul 16 00:51:24 2011
@@ -69,8 +69,8 @@
 @ stub SecpFreeMemory
 @ stub SecpTranslateName
 @ stub SecpTranslateNameEx
-@ stub SetContextAttributesA
-@ stub SetContextAttributesW
+@ stdcall SetContextAttributesA(ptr long ptr long)
+@ stdcall SetContextAttributesW(ptr long ptr long)
 @ stub SetCredentialsAttributesA
 @ stub SetCredentialsAttributesW
 @ stdcall TranslateNameA(str long long ptr ptr)

Modified: branches/sspi-bringup/reactos/dll/win32/wininet/http.c
URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/w...
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/wininet/http.c [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/wininet/http.c [iso-8859-1] Sat Jul 16 00:51:24 2011
@@ -31,6 +31,7 @@
 #include "wine/port.h"

#if defined(__MINGW32__) || defined (_MSC_VER)
+#define WIN32_NO_STATUS
 #include <ws2tcpip.h>
 #endif

@@ -57,7 +58,7 @@
 #include "winbase.h"
 #include "wininet.h"
 #include "winerror.h"
-#include "winternl.h"
+#include "ntndk.h"
 #define NO_SHLWAPI_STREAM
 #define NO_SHLWAPI_REG
 #define NO_SHLWAPI_STRFCNS