[ros-diffs] [sserapion] 51599: - define necessary constant for new headers. - remove usage of winternl.h from some rpcrt4 files. - remove all references to SECPKG_INTERFACE_VERSIONs that wine seems to have mad...

Author: sserapion
Date: Thu May  5 20:33:21 2011
New Revision: 51599

URL: http://svn.reactos.org/svn/reactos?rev=51599&view=rev
Log:
- define necessary constant for new headers.
- remove usage of winternl.h from some rpcrt4 files. 
- remove all references to SECPKG_INTERFACE_VERSIONs that wine seems to have made-up since
i cannot find them in any public headers.

Modified:
    branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h
    branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c
    branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c
    branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c
    branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h
    branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c
    branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c
    branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c
    branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild
    branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c
    branches/sspi-bringup/reactos/dll/win32/wininet/http.c
    branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild
    branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c
    branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c

Modified: branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/base/syste…
==============================================================================
--- branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Thu May  5
20:33:21 2011
@@ -32,10 +32,7 @@
 #include <windows.h>
 #include <userenv.h>
 #include <winwlx.h>
-#include <cmfuncs.h>
-#include <rtlfuncs.h>
-#include <exfuncs.h>
-#include <setypes.h>
+#include <ntndk.h>
 #include <ntsecapi.h>
 #include <accctrl.h>
 #include <aclapi.h>

Modified: branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Thu May  5
20:33:21 2011
@@ -1007,11 +1007,11 @@
 NTSTATUS
 WINAPI
 LsaSetForestTrustInformation(
-    LSA_HANDLE PolicyHandle,
-    PLSA_UNICODE_STRING TrustedDomainName,
-    PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo,
-    BOOL CheckOnly,
-    PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo)
+    IN LSA_HANDLE PolicyHandle,
+    IN PLSA_UNICODE_STRING TrustedDomainName,
+    IN PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo,
+    IN BOOLEAN CheckOnly,
+    OUT PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo)
 {
     FIXME("(%p,%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName,
ForestTrustInfo, CheckOnly, CollisionInfo);
     return STATUS_NOT_IMPLEMENTED;

Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] Thu May  5
20:33:21 2011
@@ -22,9 +22,11 @@
 #include <stdarg.h>
 #include <assert.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "rpc.h"
 #include "rpcndr.h"
-#include "winternl.h"
+#include <ndk/ntndk.h>
 
 #include "wine/unicode.h"
 #include "wine/debug.h"
@@ -56,7 +58,7 @@
     NDR_RUNDOWN rundown_routine;
     void *ctx_guard;
     UUID uuid;
-    RTL_RWLOCK rw_lock;
+    RTL_RESOURCE rw_lock;
     unsigned int refs;
 } RpcContextHandle;
 

Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] Thu May  5
20:33:21 2011
@@ -26,11 +26,11 @@
 #include <string.h>
 #include <assert.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "winerror.h"
-#include "winternl.h"
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include <windows.h>
+#include <ndk/ntndk.h>
+
 #include "wine/unicode.h"
 
 #include "rpc.h"

Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] Thu May  5
20:33:21 2011
@@ -22,6 +22,7 @@
 #define __WINE_RPC_BINDING_H
 
 #include "rpcndr.h"
+#define SECURITY_WIN32
 #include "security.h"
 #include "wine/list.h"
 

Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1]
(original)
+++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Thu May  5
20:33:21 2011
@@ -31,6 +31,11 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/types.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include <windows.h>
+#include <ndk/ntndk.h>
 
 #if defined(__MINGW32__) || defined (_MSC_VER)
 # include <ws2tcpip.h>
@@ -74,12 +79,6 @@
 # define ioctlsocket ioctl
 #endif /* defined(__MINGW32__) || defined (_MSC_VER) */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "winerror.h"
-#include "wininet.h"
-#include "winternl.h"
 #include "wine/unicode.h"
 
 #include "rpc.h"

Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] Thu May  5
20:33:21 2011
@@ -37,12 +37,9 @@
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
-#include "windef.h"
-#include "winerror.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnt.h"
-#include "winternl.h"
+#include <windows.h>
+#include <ndk/ntndk.h>
+
 #include "iptypes.h"
 #include "iphlpapi.h"
 #include "wine/unicode.h"

Modified: branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] Thu May  5
20:33:21 2011
@@ -24,6 +24,7 @@
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
+#define SECURITY_WIN32
 #include "sspi.h"
 #include "ntsecapi.h"
 #include "ntsecpkg.h"
@@ -110,11 +111,6 @@
     NULL, /* SetContextAttributes */
     NULL, /* SetCredentialsAttributes */
     NULL, /* ChangeAccountPassword */
-    NULL, /* QueryMetaData */
-    NULL, /* ExchangeMetaData */
-    NULL, /* GetCredUIContext */
-    NULL, /* UpdateCredentials */
-    NULL, /* ValidateTargetInfo */
   }, {
     NULL, /* InitializePackage */
     NULL, /* LsaLogonUser */
@@ -146,11 +142,6 @@
     NULL, /* SetContextAttributes */
     NULL, /* SetCredentialsAttributes */
     NULL, /* ChangeAccountPassword */
-    NULL, /* QueryMetaData */
-    NULL, /* ExchangeMetaData */
-    NULL, /* GetCredUIContext */
-    NULL, /* UpdateCredentials */
-    NULL, /* ValidateTargetInfo */
   }
 };
 
@@ -162,7 +153,7 @@
 {
     TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables,
pcTables);
 
-    *PackageVersion = SECPKG_INTERFACE_VERSION_6;
+    *PackageVersion = SECPKG_INTERFACE_VERSION_4;
     *pcTables = 2;
     *ppTables = secPkgFunctionTable;
 

Modified: branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild [iso-8859-1]
(original)
+++ branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild [iso-8859-1] Thu May 
5 20:33:21 2011
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="schannel" type="win32dll"
baseaddress="${BASEADDRESS_SCHANNEL}" installbase="system32"
installname="schannel.dll" allowwarnings="true">
+<module name="schannel" type="win32dll"
baseaddress="${BASEADDRESS_SCHANNEL}" installbase="system32"
installname="schannel.dll" unicode="yes"
allowwarnings="true">
 	<importlibrary definition="schannel.spec" />
 	<include base="schannel">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c [iso-8859-1] Thu May  5
20:33:21 2011
@@ -24,6 +24,7 @@
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
+#define SECURITY_WIN32
 #include "sspi.h"
 #include "ntsecapi.h"
 #include "ntsecpkg.h"

Modified: branches/sspi-bringup/reactos/dll/win32/wininet/http.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- 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] Thu May  5
20:33:21 2011
@@ -61,6 +61,7 @@
 #define NO_SHLWAPI_STRFCNS
 #define NO_SHLWAPI_GDI
 #include "shlwapi.h"
+#define SECURITY_WIN32
 #include "sspi.h"
 #include "wincrypt.h"
 

Modified: branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1]
(original)
+++ branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Thu May  5
20:33:21 2011
@@ -6,6 +6,7 @@
 	<importlibrary definition="wininet.spec" />
 	<include base="wininet">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
+	<include base="ReactOS">include/reactos/libs/zlib</include>
 	<define name="__WINESRC__" />
 	<define name="_WINE" />
 
@@ -23,6 +24,7 @@
 	<library>crypt32</library>
 	<library>ws2_32</library>
 	<library>pseh</library>
+	<library>zlib</library>
 	<file>cookie.c</file>
 	<file>dialogs.c</file>
 	<file>ftp.c</file>

Modified: branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original)
+++ branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Thu May  5
20:33:21 2011
@@ -889,9 +889,9 @@
 getnameinfo(const struct sockaddr FAR * sa,
             socklen_t       salen,
             char FAR *      host,
-            DWORD           hostlen,
+            socklen_t       hostlen,
             char FAR *      serv,
-            DWORD           servlen,
+            socklen_t       servlen,
             INT             flags)
 {
     UNIMPLEMENTED

Modified: branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c
URL:
http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…
==============================================================================
--- branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1]
(original)
+++ branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Thu May
 5 20:33:21 2011
@@ -902,9 +902,9 @@
 getnameinfo(const struct sockaddr FAR *sa,
             socklen_t salen,
             char FAR *host,
-            DWORD hostlen,
+            socklen_t hostlen,
             char FAR *serv,
-            DWORD servlen,
+            socklen_t servlen,
             INT flags)
 {
     INT ErrorCode;