Support for Visual studio

The changes necessary to support visual studio fall into 2 basic groups.
1) reordering of header files, and 2) changes to support syntax
differences between mingw and visual studio and 3).  All changes are
conditional upon the definition of the macro __VS_BUILD__ .

contrib/win32/win32compat/lsa/Debug.h

@@ -66,11 +66,15 @@
   #define DBG_ENTER(FUNC_NAME) DbgEntry(FUNC_NAME)
                           
   #define DBG_LEAVE(FUNC_NAME) DbgLeave(FUNC_NAME)
-  
+#ifndef __VS_BUILD__
   #define DBG_MSG(FMT, ARGS...) DbgMsg(FMT, ## ARGS)
   
   #define DBG_MSG_NOLN(FMT, ARGS...) DbgMsgNoLn(FMT, ## ARGS)
-  
+#else
+#define DBG_MSG(FMT, ...) DbgMsg(FMT, __VA_ARGS__)
+
+#define DBG_MSG_NOLN(FMT, ...) DbgMsgNoLn(FMT, __VA_ARGS__)
+#endif
 
   #define DBG_DUMP_TO_FILE(fname, ptr, size) //DbgDumpToFile(fname, ptr, size)
   

contrib/win32/win32compat/lsa/Key.cpp

@@ -29,10 +29,28 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef __VS_BUILD__
+#include <winsock2.h>
+#include <Windows.h>
+#include <LsaLookup.h>
+#include <Ntsecapi.h>
+#endif
+
 #include <winsock2.h>
 #include "Key.h"
 
+#ifdef __VS_BUILD__
+#ifdef __cplusplus
+extern "C" {
+#endif
+#endif // __VS_BUILD__
 extern LSA_SECPKG_FUNCTION_TABLE LsaApi;
+#ifdef __VS_BUILD__
+#ifdef __cplusplus
+}
+#endif
+#endif
+
 
 #ifdef DYNAMIC_OPENSSL
   extern SSLFuncList DynSSL;

contrib/win32/win32compat/lsa/KeyAuth.cpp

@@ -31,7 +31,17 @@
 
 #include "KeyAuth.h"
 
-extern LSA_SECPKG_FUNCTION_TABLE LsaApi;
+#ifdef __VS_BUILD__
+#ifdef __cplusplus
+extern "C" {
+#endif
+#endif // __VS_BUILD__
+	extern LSA_SECPKG_FUNCTION_TABLE LsaApi;
+#ifdef __VS_BUILD__
+#ifdef __cplusplus
+}
+#endif
+#endif
 
 #ifdef DYNAMIC_OPENSSL
   extern SSLFuncList DynSSL;

contrib/win32/win32compat/lsa/KeyAuth.h

@@ -34,6 +34,15 @@
 
 #undef STRING
 
+#ifdef __VS_BUILD__
+#define UMDF_USING_NTSTATUS 
+#include <winsock2.h>
+#include <Windows.h>
+#include <LsaLookup.h>
+#include <Ntsecapi.h>
+#endif
+
+
 #include <winsock2.h>
 
 #include "Win64Fix.h"

contrib/win32/win32compat/lsa/LsaString.cpp

@@ -29,10 +29,28 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef __VS_BUILD__
+#define UMDF_USING_NTSTATUS 
+#include <winsock2.h>
+#include <Windows.h>
+#include <LsaLookup.h>
+#include <Ntsecapi.h>
+#endif
+
 #include <winsock2.h>
 #include "LsaString.h"
 
-extern LSA_SECPKG_FUNCTION_TABLE LsaApi;
+#ifdef __VS_BUILD__
+#ifdef __cplusplus
+extern "C" {
+#endif
+#endif // __VS_BUILD__
+	extern LSA_SECPKG_FUNCTION_TABLE LsaApi;
+#ifdef __VS_BUILD__
+#ifdef __cplusplus
+}
+#endif
+#endif
 
 //
 // Allocate empty UNICODE_STRING in LSA address space.

contrib/win32/win32compat/lsa/LsaString.h

@@ -34,6 +34,8 @@
 
 #undef STRING
 
+
+
 #include "Win64Fix.h"
 
 #include <stdio.h>
@@ -43,11 +45,15 @@
 #include <Ntsecapi.h>
 #include <NTSecPkg.h>
 
+#ifndef __VS_BUILD__
 #ifdef _WIN64
 #include <ntstatus.h>
 #else
 #include <ddk/ntstatus.h>
 #endif
+#else
+#include <ntstatus.h>
+#endif
 
 #include "Debug.h"
 

contrib/win32/win32compat/lsa/PopBinary.cpp

@@ -31,7 +31,17 @@
 
 #include "PopBinary.h"
 
-extern LSA_SECPKG_FUNCTION_TABLE LsaApi;
+#ifdef __VS_BUILD__
+#ifdef __cplusplus
+extern "C" {
+#endif
+#endif // __VS_BUILD__
+	extern LSA_SECPKG_FUNCTION_TABLE LsaApi;
+#ifdef __VS_BUILD__
+#ifdef __cplusplus
+}
+#endif
+#endif
 
 #ifdef DYNAMIC_OPENSSL
   extern SSLFuncList DynSSL;

contrib/win32/win32compat/lsa/PopBinary.h

@@ -34,6 +34,14 @@
 
 #undef STRING
 
+#ifdef __VS_BUILD__
+#define UMDF_USING_NTSTATUS 
+#include <winsock2.h>
+#include <Windows.h>
+#include <LsaLookup.h>
+#include <Ntsecapi.h>
+#endif
+
 #include <winsock2.h>
 
 #include "Win64Fix.h"

contrib/win32/win32compat/lsa/Ssh-lsa.cpp

@@ -31,6 +31,15 @@
 
 #define WINVER 0x501
 
+#ifdef __VS_BUILD__
+#define UMDF_USING_NTSTATUS 
+#include <winsock2.h>
+#include <Windows.h>
+#include <LsaLookup.h>
+#include <Ntsecapi.h>
+#endif
+
+
 #include <winsock2.h>
 #include "Ssh-lsa.h"
 
@@ -432,9 +441,13 @@ Int AuthorizeUser(wchar_t homeDir[MAX_PATH], HANDLE token, SshLsaAuth *auth)
     if (wcschr(nextFile, ':') == NULL)
     {
       DBG_MSG("Expanding relative path to user homedir.\n");
-      
+#ifndef __VS_BUILD__
       snwprintf(keyFileName, sizeof(keyFileName), 
                     L"%ls\\%ls", homeDir, nextFile);
+#else
+	  _snwprintf(keyFileName, sizeof(keyFileName),
+		  L"%ls\\%ls", homeDir, nextFile);
+#endif
                           
       fileToCheck = keyFileName;
     }

contrib/win32/win32compat/lsa/Ssh-lsa.h

@@ -42,11 +42,15 @@
 
 #include <NTSecPkg.h>
 
+#ifndef __VS_BUILD__
 #ifdef _WIN64
 #include <ntstatus.h>
 #else
 #include <ddk/ntstatus.h>
 #endif
+#else
+#include <ntstatus.h>
+#endif
 
 #include <Userenv.h>
 #include <Shlwapi.h>
@@ -84,9 +88,17 @@ typedef struct _SshLsaAuth
 } 
 SshLsaAuth;
 
+#ifndef __VS_BUILD__
 typedef VOID WINAPI (*RtlInitUnicodeStringPtr) 
                          (PUNICODE_STRING, PCWSTR SourceString);
 
+#else
+typedef VOID (WINAPI *RtlInitUnicodeStringPtr)
+						(PUNICODE_STRING, PCWSTR SourceString);
+#endif
+
+
+#ifndef __VS_BUILD__
 #ifndef _WIN64
 typedef struct _LSA_TOKEN_INFORMATION_V1
 {
@@ -106,5 +118,6 @@ typedef struct _LSA_TOKEN_INFORMATION_V1
 } 
 LSA_TOKEN_INFORMATION_V1, *PLSA_TOKEN_INFORMATION_V1;
 #endif
+#endif
 
 #endif