Author: sserapion Date: Sun Jan 8 22:12:07 2012 New Revision: 54883
URL: http://svn.reactos.org/svn/reactos?rev=54883&view=rev Log: Fix build. mark schannel as forked
Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c branches/sspi-bringup/reactos/lib/rtl/unicode.c branches/sspi-bringup/reactos/media/doc/README.WINE
Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/r... ============================================================================== --- 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] Sun Jan 8 22:12:07 2012 @@ -36,6 +36,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <ndk/ntndk.h> +#include <wininet.h>
#if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> @@ -1868,7 +1869,7 @@ { LONG refs; HANDLE completion_event; - INTERNET_BUFFERSA inet_buffers; + INTERNET_BUFFERS inet_buffers; void *destination_buffer; /* the address that inet_buffers.lpvBuffer will be * copied into when the call completes */ CRITICAL_SECTION cs;
Modified: branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/s... ============================================================================== --- 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] Sun Jan 8 22:12:07 2012 @@ -30,6 +30,10 @@ #include "ntsecpkg.h" #include "schannel.h"
+#define SCHANNEL_COMMENT_A "Schannel Security Package\0" +#define SCHANNEL_COMMENT_W L"Schannel Security Package\0" +#define SCHANNEL_COMMENT __MINGW_NAME_UAW(SCHANNEL_COMMENT) + #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(schannel); @@ -37,7 +41,7 @@ /*********************************************************************** * SpGetInfoUnified */ -static NTSTATUS WINAPI SpGetInfoUnified(PSecPkgInfoW PackageInfo) +static NTSTATUS NTAPI SpGetInfoUnified(PSecPkgInfo PackageInfo) { TRACE("(%p)\n", PackageInfo);
@@ -49,19 +53,16 @@ PackageInfo->wVersion = 1; PackageInfo->wRPCID = UNISP_RPC_ID; PackageInfo->cbMaxToken = 0x4000; - PackageInfo->Name = (LPWSTR)UNISP_NAME_W; - PackageInfo->Comment = (LPWSTR)UNISP_NAME_W; + PackageInfo->Name = UNISP_NAME; + PackageInfo->Comment = UNISP_NAME;
return STATUS_SUCCESS; }
-static SEC_WCHAR schannelCommentW[] = { 'S','c','h','a','n','n','e','l', - ' ','S','e','c','u','r','i','t','y',' ','P','a','c','k','a','g','e',0 }; - /*********************************************************************** * SpGetInfoSChannel */ -static NTSTATUS WINAPI SpGetInfoSChannel(PSecPkgInfoW PackageInfo) +static NTSTATUS NTAPI SpGetInfoSChannel(PSecPkgInfo PackageInfo) { TRACE("(%p)\n", PackageInfo);
@@ -73,8 +74,8 @@ PackageInfo->wVersion = 1; PackageInfo->wRPCID = UNISP_RPC_ID; PackageInfo->cbMaxToken = 0x4000; - PackageInfo->Name = (LPWSTR)SCHANNEL_NAME_W; - PackageInfo->Comment = schannelCommentW; + PackageInfo->Name = SCHANNEL_NAME; + PackageInfo->Comment = SCHANNEL_COMMENT;
return STATUS_SUCCESS; }
Modified: branches/sspi-bringup/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/lib/rtl/uni... ============================================================================== --- branches/sspi-bringup/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/lib/rtl/unicode.c [iso-8859-1] Sun Jan 8 22:12:07 2012 @@ -1664,7 +1664,7 @@ NTAPI RtlUnicodeStringToCountedOemString( IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, + IN PCUNICODE_STRING UniSource, IN BOOLEAN AllocateDestinationString) { NTSTATUS Status;
Modified: branches/sspi-bringup/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/media/doc/R... ============================================================================== --- branches/sspi-bringup/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 8 22:12:07 2012 @@ -144,7 +144,7 @@ reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Autosync reactos/dll/win32/sccbase # Autosync -reactos/dll/win32/schannel # Autosync +reactos/dll/win32/schannel # Forked reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Autosync
-
sserapion＠svn.reactos.org