EAP modules divided to libraries

CredWrite/CredWrite.props

@@ -7,8 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\EAPMethods\EAPMethodEvents\temp\EAPMethodEvents.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>EAPMETHOD_TYPE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

CredWrite/CredWrite.vcxproj

@@ -86,8 +86,6 @@
     <ClInclude Include="StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\EAPMethods\src\EAP.cpp" />
-    <ClCompile Include="..\EAPMethods\src\PAP.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -100,9 +98,15 @@
     <ResourceCompile Include="CredWrite.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EAPMethods\EAPMethodEvents\EAPMethodEvents.vcxproj">
+    <ProjectReference Include="..\lib\EAPBase\build\EAPBase.vcxproj">
+      <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\lib\PAP\build\PAP.vcxproj">
+      <Project>{36b0cf8a-7794-46c3-8099-825ba962b4c7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>

CredWrite/CredWrite.vcxproj.filters

@@ -26,12 +26,6 @@
     <ClCompile Include="Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\EAPMethods\src\EAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\EAPMethods\src\PAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="CredWrite.rc">

CredWrite/Main.cpp

@@ -20,12 +20,10 @@
 
 #include "StdAfx.h"
 
-#pragma comment(lib, "Crypt32.lib")
-
 using namespace std;
 using namespace winstd;
 
-eap::module g_module;
+eap::module g_module(eap::type_undefined);
 
 
 static int CredWrite()

CredWrite/StdAfx.h

@@ -20,17 +20,30 @@
 
 #pragma once
 
-#include "../include/Version.h"
-
-#include "../EAPMethods/include/EAP.h"
-#include "../EAPMethods/include/PAP.h"
+#include "../lib/PAP/include/Credentials.h"
+#include "../lib/EAPBase/include/Module.h"
 
+#include <WinStd/Common.h>
 #include <WinStd/Base64.h>
-#include <WinStd/Cred.h>
-#include <WinStd/Crypt.h>
 #include <WinStd/Win.h>
 
-#include <tchar.h>
 #include <Windows.h>
+#include <eaptypes.h> // Must include after <Windows.h>
+#include <tchar.h>
 
 #include <memory>
+
+//#include "../include/Version.h"
+//
+//#include "../EAPMethods/include/EAP.h"
+//#include "../EAPMethods/include/PAP.h"
+//
+//#include <WinStd/Base64.h>
+//#include <WinStd/Cred.h>
+//#include <WinStd/Crypt.h>
+//#include <WinStd/Win.h>
+//
+//#include <tchar.h>
+//#include <Windows.h>
+//
+//#include <memory>