Code changes to get ANCM current working on github

This commit is contained in:
Justin Kotalik 2018-04-09 14:14:55 -07:00
parent b594130020
commit df9efa0770
15 changed files with 642 additions and 82 deletions

View File

@ -82,7 +82,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>precomp.hxx</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
<AdditionalIncludeDirectories>..\IISLib;.\Inc</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\IISLib;inc\</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<TreatWarningAsError>true</TreatWarningAsError>
@ -115,7 +115,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>precomp.hxx</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
<AdditionalIncludeDirectories>..\IISLib;.\Inc</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\IISLib;inc\</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<TreatWarningAsError>true</TreatWarningAsError>
@ -148,7 +148,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\IISLib;inc</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\IISLib;inc\</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>precomp.hxx</PrecompiledHeaderFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<TreatWarningAsError>true</TreatWarningAsError>
@ -184,7 +184,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>precomp.hxx</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>..\IISLib;inc</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\IISLib;inc\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<TreatWarningAsError>true</TreatWarningAsError>
<SDLCheck>true</SDLCheck>
@ -231,6 +231,47 @@
<ItemGroup>
<Xml Include="aspnetcore_schema.xml" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\application.cxx" />
<ClCompile Include="src\applicationmanager.cxx" />
<ClCompile Include="src\aspnetcoreconfig.cxx" />
<ClCompile Include="src\filewatcher.cxx" />
<ClCompile Include="src\forwarderconnection.cxx" />
<ClCompile Include="src\forwardinghandler.cxx" />
<ClCompile Include="src\main.cxx" />
<ClCompile Include="src\path.cxx" />
<ClCompile Include="src\processmanager.cxx" />
<ClCompile Include="src\protocolconfig.cxx" />
<ClCompile Include="src\proxymodule.cxx" />
<ClCompile Include="src\responseheaderhash.cxx" />
<ClCompile Include="src\serverprocess.cxx" />
<ClCompile Include="src\websockethandler.cxx" />
<ClCompile Include="src\winhttphelper.cxx" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Inc\application.h" />
<ClInclude Include="Inc\applicationmanager.h" />
<ClInclude Include="Inc\aspnetcoreconfig.h" />
<ClInclude Include="Inc\aspnetcore_msg.h" />
<ClInclude Include="Inc\debugutil.h" />
<ClInclude Include="Inc\environmentvariablehash.h" />
<ClInclude Include="Inc\filewatcher.h" />
<ClInclude Include="Inc\forwarderconnection.h" />
<ClInclude Include="Inc\forwardinghandler.h" />
<ClInclude Include="Inc\fx_ver.h" />
<ClInclude Include="Inc\globalmodule.h" />
<ClInclude Include="Inc\path.h" />
<ClInclude Include="Inc\processmanager.h" />
<ClInclude Include="Inc\protocolconfig.h" />
<ClInclude Include="Inc\proxymodule.h" />
<ClInclude Include="Inc\resource.h" />
<ClInclude Include="Inc\responseheaderhash.h" />
<ClInclude Include="Inc\serverprocess.h" />
<ClInclude Include="Inc\sttimer.h" />
<ClInclude Include="Inc\websockethandler.h" />
<ClInclude Include="Inc\winhttphelper.h" />
<ClInclude Include="src\precomp.hxx" />
</ItemGroup>
<Import Project="..\..\..\build\native.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -0,0 +1,225 @@
 application.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
applicationmanager.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
aspnetcoreconfig.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
filewatcher.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
forwarderconnection.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
forwardinghandler.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
main.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(8): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(9): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(10): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(152): error C2065: 'CProxyModuleFactory': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(152): error C2065: 'pFactory': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(220): error C2065: 'pFactory': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(220): error C2061: syntax error: identifier 'CProxyModuleFactory'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(221): error C2065: 'pFactory': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(228): error C2065: 'pFactory': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(236): error C2065: 'pFactory': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(270): error C2065: 'pFactory': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(272): error C2065: 'pFactory': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(272): error C2227: left of '->Terminate' must point to class/struct/union/generic type
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(272): note: type is 'unknown-type'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\main.cxx(273): error C2065: 'pFactory': undeclared identifier
path.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
processmanager.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
protocolconfig.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
proxymodule.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(9): error C2653: 'CProxyModuleFactory': is not a class or namespace name
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(14): error C2065: 'CProxyModule': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(14): error C2065: 'pModule': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(14): error C2061: syntax error: identifier 'CProxyModule'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(15): error C2065: 'pModule': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(20): error C2065: 'pModule': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(26): error C2653: 'CProxyModuleFactory': is not a class or namespace name
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(58): error C2355: 'this': can only be referenced inside non-static member functions or non-static data member initializers
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(61): error C2653: 'CProxyModule': is not a class or namespace name
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(62): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(63): error C2550: 'CProxyModule': constructor initializer lists are only allowed on constructor definitions
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(64): warning C4508: 'CProxyModule': function should return a value; 'void' return type assumed
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(66): error C2653: 'CProxyModule': is not a class or namespace name
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(67): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(67): error C2084: function 'int CProxyModule(void)' already has a body
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(61): note: see previous definition of 'CProxyModule'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(68): error C2065: 'm_pHandler': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(74): error C2065: 'm_pHandler': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(74): error C2227: left of '->DereferenceForwardingHandler' must point to class/struct/union/generic type
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(74): note: type is 'unknown-type'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(75): error C2065: 'm_pHandler': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(81): error C2653: 'CProxyModule': is not a class or namespace name
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(86): error C2065: 'm_pHandler': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(87): error C2065: 'm_pHandler': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(93): error C2065: 'm_pHandler': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(93): error C2227: left of '->OnExecuteRequestHandler' must point to class/struct/union/generic type
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(93): note: type is 'unknown-type'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(98): error C2653: 'CProxyModule': is not a class or namespace name
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(111): error C2065: 'm_pHandler': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(111): error C2227: left of '->OnAsyncCompletion' must point to class/struct/union/generic type
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\proxymodule.cxx(111): note: type is 'unknown-type'
responseheaderhash.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
serverprocess.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(836): error C4839: non-standard use of class 'STRU' as an argument to a variadic function
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(836): note: the constructor and destructor will not be called; a bitwise copy of the class will be passed as the argument
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(10): note: see declaration of 'STRU'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(839): error C2248: 'STRU::STRU': cannot access private member declared in class 'STRU'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(365): note: see declaration of 'STRU::STRU'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(10): note: see declaration of 'STRU'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(1075): error C4839: non-standard use of class 'STRU' as an argument to a variadic function
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(1075): note: the constructor and destructor will not be called; a bitwise copy of the class will be passed as the argument
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(10): note: see declaration of 'STRU'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\serverprocess.cxx(1077): error C2248: 'STRU::STRU': cannot access private member declared in class 'STRU'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(365): note: see declaration of 'STRU::STRU'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\iislib\stringu.h(10): note: see declaration of 'STRU'
websockethandler.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(40): error C2614: 'WEBSOCKET_HANDLER': illegal member initialization: '_pWebSocketContext' is not a base or member
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(292): error C2065: '_pWebSocketContext': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(292): error C2065: 'IWebSocketContext': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(292): error C2059: syntax error: ')'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(294): error C2065: '_pWebSocketContext': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(404): error C2065: '_pWebSocketContext': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(404): error C2227: left of '->ReadFragment' must point to class/struct/union/generic type
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(404): note: type is 'unknown-type'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(538): error C2065: '_pWebSocketContext': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(538): error C2227: left of '->SendConnectionClose' must point to class/struct/union/generic type
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(538): note: type is 'unknown-type'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(563): error C2065: '_pWebSocketContext': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(563): error C2227: left of '->WriteFragment' must point to class/struct/union/generic type
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(563): note: type is 'unknown-type'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(619): error C2065: '_pWebSocketContext': undeclared identifier
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(619): error C2227: left of '->GetCloseStatus' must point to class/struct/union/generic type
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\src\websockethandler.cxx(619): note: type is 'unknown-type'
winhttphelper.cxx
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\websockethandler.h(187): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(48): error C2238: unexpected token(s) preceding ';'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2143: syntax error: missing ';' before '*'
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
c:\users\jukotali\code\iisintegration\src\aspnetcoremodulev1\aspnetcore\inc\proxymodule.h(50): error C2238: unexpected token(s) preceding ';'

View File

@ -1,19 +1,18 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
#pragma once
extern HTTP_MODULE_ID g_pModuleId;
extern IHttpServer *g_pHttpServer;
extern HMODULE g_hAspnetCoreRH;
#include "forwardinghandler.h"
class ASPNET_CORE_PROXY_MODULE : public CHttpModule
class CProxyModule : public CHttpModule
{
public:
public:
ASPNET_CORE_PROXY_MODULE();
CProxyModule();
~ASPNET_CORE_PROXY_MODULE();
~CProxyModule();
void * operator new(size_t size, IModuleAllocator * pPlacement)
{
@ -21,44 +20,43 @@ class ASPNET_CORE_PROXY_MODULE : public CHttpModule
}
VOID
operator delete(
void *
)
{}
operator delete(
void *
)
{
}
__override
REQUEST_NOTIFICATION_STATUS
OnExecuteRequestHandler(
IHttpContext * pHttpContext,
IHttpEventProvider * pProvider
);
REQUEST_NOTIFICATION_STATUS
OnExecuteRequestHandler(
IHttpContext * pHttpContext,
IHttpEventProvider * pProvider
);
__override
REQUEST_NOTIFICATION_STATUS
OnAsyncCompletion(
IHttpContext * pHttpContext,
DWORD dwNotification,
BOOL fPostNotification,
IHttpEventProvider * pProvider,
IHttpCompletionInfo * pCompletionInfo
);
REQUEST_NOTIFICATION_STATUS
OnAsyncCompletion(
IHttpContext * pHttpContext,
DWORD dwNotification,
BOOL fPostNotification,
IHttpEventProvider * pProvider,
IHttpCompletionInfo * pCompletionInfo
);
private:
private:
APPLICATION_INFO *m_pApplicationInfo;
APPLICATION *m_pApplication;
REQUEST_HANDLER *m_pHandler;
FORWARDING_HANDLER * m_pHandler;
};
class ASPNET_CORE_PROXY_MODULE_FACTORY : public IHttpModuleFactory
class CProxyModuleFactory : public IHttpModuleFactory
{
public:
public:
HRESULT
GetHttpModule(
CHttpModule ** ppModule,
IModuleAllocator * pAllocator
);
GetHttpModule(
CHttpModule ** ppModule,
IModuleAllocator * pAllocator
);
VOID
Terminate();
Terminate();
};

View File

@ -0,0 +1,280 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
#pragma once
#ifndef _STTIMER_H
#define _STTIMER_H
class STTIMER
{
public:
STTIMER()
: _pTimer( NULL )
{
fInCanel = FALSE;
}
virtual
~STTIMER()
{
if ( _pTimer )
{
CancelTimer();
CloseThreadpoolTimer( _pTimer );
_pTimer = NULL;
}
}
HRESULT
InitializeTimer(
PTP_TIMER_CALLBACK pfnCallback,
VOID * pContext,
DWORD dwInitialWait = 0,
DWORD dwPeriod = 0
)
{
_pTimer = CreateThreadpoolTimer( pfnCallback,
pContext,
NULL );
if ( !_pTimer )
{
return HRESULT_FROM_WIN32( GetLastError() );
}
if ( dwInitialWait )
{
SetTimer( dwInitialWait,
dwPeriod );
}
return S_OK;
}
VOID
SetTimer(
DWORD dwInitialWait,
DWORD dwPeriod = 0
)
{
FILETIME ftInitialWait;
if ( dwInitialWait == 0 && dwPeriod == 0 )
{
//
// Special case. We are preventing new callbacks
// from being queued. Any existing callbacks in the
// queue will still run.
//
// This effectively disables the timer. It can be
// re-enabled by setting non-zero initial wait or
// period values.
//
if (_pTimer != NULL)
{
SetThreadpoolTimer(_pTimer, NULL, 0, 0);
}
return;
}
InitializeRelativeFileTime( &ftInitialWait, dwInitialWait );
SetThreadpoolTimer( _pTimer,
&ftInitialWait,
dwPeriod,
0 );
}
VOID
CancelTimer()
{
//
// Disable the timer
//
if (fInCanel)
return;
fInCanel = TRUE;
SetTimer( 0 );
//
// Wait until any callbacks queued prior to disabling
// have completed.
//
if (_pTimer != NULL)
WaitForThreadpoolTimerCallbacks( _pTimer, TRUE );
_pTimer = NULL;
fInCanel = FALSE;
}
static
VOID
CALLBACK
TimerCallback(
_In_ PTP_CALLBACK_INSTANCE Instance,
_In_ PVOID Context,
_In_ PTP_TIMER Timer
)
{
Instance;
Timer;
STRU* pstruLogFilePath = (STRU*)Context;
HANDLE hStdoutHandle = NULL;
SECURITY_ATTRIBUTES saAttr = { 0 };
HRESULT hr = S_OK;
saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
saAttr.bInheritHandle = TRUE;
saAttr.lpSecurityDescriptor = NULL;
hStdoutHandle = CreateFileW(pstruLogFilePath->QueryStr(),
FILE_READ_DATA,
FILE_SHARE_WRITE,
&saAttr,
OPEN_ALWAYS,
FILE_ATTRIBUTE_NORMAL,
NULL);
if (hStdoutHandle == INVALID_HANDLE_VALUE)
{
hr = HRESULT_FROM_WIN32(GetLastError());
}
CloseHandle(hStdoutHandle);
}
private:
VOID
InitializeRelativeFileTime(
FILETIME * pft,
DWORD dwMilliseconds
)
{
LARGE_INTEGER li;
//
// The pftDueTime parameter expects the time to be
// expressed as the number of 100 nanosecond intervals
// times -1.
//
// To convert from milliseconds, we'll multiply by
// -10000
//
li.QuadPart = (LONGLONG)dwMilliseconds * -10000;
pft->dwHighDateTime = li.HighPart;
pft->dwLowDateTime = li.LowPart;
};
TP_TIMER * _pTimer;
BOOL fInCanel;
};
class STELAPSED
{
public:
STELAPSED()
: _dwInitTime( 0 ),
_dwInitTickCount( 0 ),
_dwPerfCountsPerMillisecond( 0 ),
_fUsingHighResolution( FALSE )
{
LARGE_INTEGER li;
BOOL fResult;
_dwInitTickCount = GetTickCount64();
fResult = QueryPerformanceFrequency( &li );
if ( !fResult )
{
goto Finished;
}
_dwPerfCountsPerMillisecond = li.QuadPart / 1000;
fResult = QueryPerformanceCounter( &li );
if ( !fResult )
{
goto Finished;
}
_dwInitTime = li.QuadPart / _dwPerfCountsPerMillisecond;
_fUsingHighResolution = TRUE;
Finished:
return;
}
virtual
~STELAPSED()
{
}
LONGLONG
QueryElapsedTime()
{
LARGE_INTEGER li;
if ( _fUsingHighResolution && QueryPerformanceCounter( &li ) )
{
DWORD64 dwCurrentTime = li.QuadPart / _dwPerfCountsPerMillisecond;
if ( dwCurrentTime < _dwInitTime )
{
//
// It's theoretically possible that QueryPerformanceCounter
// may return slightly different values on different CPUs.
// In this case, we don't want to return an unexpected value
// so we'll return zero. This is acceptable because
// presumably such a case would only happen for a very short
// time window.
//
// It would be possible to prevent this by ensuring processor
// affinity for all calls to QueryPerformanceCounter, but that
// would be undesirable in the general case because it could
// introduce unnecessary context switches and potentially a
// CPU bottleneck.
//
// Note that this issue also applies to callers doing rapid
// calls to this function. If a caller wants to mitigate
// that, they could enforce the affinitization, or they
// could implement a similar sanity check when comparing
// returned values from this function.
//
return 0;
}
return dwCurrentTime - _dwInitTime;
}
return GetTickCount64() - _dwInitTickCount;
}
BOOL
QueryUsingHighResolution()
{
return _fUsingHighResolution;
}
private:
DWORD64 _dwInitTime;
DWORD64 _dwInitTickCount;
DWORD64 _dwPerfCountsPerMillisecond;
BOOL _fUsingHighResolution;
};
#endif // _STTIMER_H

View File

@ -4,12 +4,6 @@
#include "precomp.hxx"
#include <IPHlpApi.h>
#ifdef DEBUG
DECLARE_DEBUG_PRINTS_OBJECT();
DECLARE_DEBUG_VARIABLE();
DECLARE_PLATFORM_TYPE();
#endif // DEBUG
HTTP_MODULE_ID g_pModuleId = NULL;
IHttpServer * g_pHttpServer = NULL;
BOOL g_fAsyncDisconnectAvailable = FALSE;

View File

@ -1,36 +1,45 @@
// Copyright(c).NET Foundation.All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
#pragma once
/*++
Copyright (c) 2013 Microsoft Corporation
Module Name:
precomp.hxx
Abstract:
Precompiled header.
--*/
#pragma warning( disable : 4091)
//
// System related headers
//
#define _WIN32_WINNT 0x0600
#define _WINSOCKAPI_
#define NTDDI_VERSION 0x06010000
#define WINVER 0x0601
#define _WIN32_WINNT 0x0601
#include <windows.h>
#include <atlbase.h>
#include <pdh.h>
//#include <ntassert.h>
#include <Shlobj.h>
#include <ntassert.h>
#include <httpserv.h>
#include <iiswebsocket.h>
#include <httptrace.h>
// This should remove our issue of compiling for win7 without header files.
// We force the Windows 8 version check logic in iiswebsocket.h to succeed even though we're compiling for Windows 7.
// Then, we set the version defines back to Windows 7 to for the remainder of the compilation.
#undef NTDDI_VERSION
#undef WINVER
#undef _WIN32_WINNT
#define NTDDI_VERSION 0x06020000
#define WINVER 0x0602
#define _WIN32_WINNT 0x0602
#include <iiswebsocket.h>
#undef NTDDI_VERSION
#undef WINVER
#undef _WIN32_WINNT
#define NTDDI_VERSION 0x06010000
#define WINVER 0x0601
#define _WIN32_WINNT 0x0601
#include <httptrace.h>
#include <winhttp.h>
//
@ -88,11 +97,11 @@ inline bool IsSpace(char ch)
#include <dbgutil.h>
#include "ahutil.h"
#include "multisz.hxx"
#include "multisza.hxx"
#include "multisz.h"
#include "multisza.h"
#include "sttimer.h"
#include <listentry.h>
#include <base64.hxx>
#include <base64.h>
#include <datetime.h>
#include <reftrace.h>
#include <acache.h>
@ -144,4 +153,4 @@ extern BOOL g_fAsyncDisconnectAvailable;
extern PVOID g_pModuleId;
extern BOOL g_fWebSocketSupported;
extern BOOL g_fEnableReferenceCountTracing;
extern DWORD g_dwActiveServerProcesses;
extern DWORD g_dwActiveServerProcesses;

View File

@ -30,15 +30,15 @@ CProxyModuleFactory::Terminate(
Routine description:
Function called by IIS for global (non-request-specific) notifications
Function called by IIS for global (non-request-specific) notifications
Arguments:
None.
None.
Return value:
None
None
--*/
{
@ -109,6 +109,6 @@ CProxyModule::OnAsyncCompletion(
DBG_ASSERT(fPostNotification == FALSE);
return m_pHandler->OnAsyncCompletion(
pCompletionInfo->GetCompletionBytes(),
pCompletionInfo->GetCompletionStatus());
pCompletionInfo->GetCompletionBytes(),
pCompletionInfo->GetCompletionStatus());
}

View File

@ -833,7 +833,7 @@ SERVER_PROCESS::PostStartCheck(
pStruErrorMessage->SafeSnwprintf(
ASPNETCORE_EVENT_PROCESS_START_NOTREADY_ERROR_MSG,
m_struAppFullPath.QueryStr(),
m_pszRootApplicationPath,
m_pszRootApplicationPath.QueryStr(),
pStruCommandline->QueryStr(),
m_dwPort,
hr);
@ -1072,7 +1072,7 @@ Finished:
strEventMsg.SafeSnwprintf(
ASPNETCORE_EVENT_PROCESS_START_POSTCREATE_ERROR_MSG,
m_struAppFullPath.QueryStr(),
m_pszRootApplicationPath,
m_pszRootApplicationPath.QueryStr(),
struCommandLine.QueryStr(),
hr);
}

View File

@ -10,4 +10,4 @@
#define ProductVersion 8,1,18099,0
#define ProductVersionStr "8.1.18099.0\0"
#define PlatformToolset "v141\0"
#define CommitHash "e07bcc3f9b123ef8dbde6a0328ef4c9f07ed73b0\0"
#define CommitHash "1394ac939d3418b2610b5e2caf152b33767f0560\0"

View File

@ -0,0 +1,13 @@
 acache.cxx
ahutil.cpp
base64.cpp
multisz.cpp
multisza.cpp
stringa.cpp
stringu.cpp
util.cxx
Generating Code...
reftrace.c
tracelog.c
Generating Code...
IISLib.vcxproj -> C:\Users\jukotali\code\IISIntegration\Debug\IISLib.lib

View File

@ -23,7 +23,7 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>IISLib</RootNamespace>
<ProjectName>IISLib</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

View File

@ -10,4 +10,4 @@
#define ProductVersion 8,1,18099,0
#define ProductVersionStr "8.1.18099.0\0"
#define PlatformToolset "v141\0"
#define CommitHash "e07bcc3f9b123ef8dbde6a0328ef4c9f07ed73b0\0"
#define CommitHash "8679fdf3558d67abc7b51ddadff02a390e5d7670\0"

View File

@ -10,4 +10,4 @@
#define ProductVersion 8,1,18099,0
#define ProductVersionStr "8.1.18099.0\0"
#define PlatformToolset "v141\0"
#define CommitHash "e07bcc3f9b123ef8dbde6a0328ef4c9f07ed73b0\0"
#define CommitHash "8679fdf3558d67abc7b51ddadff02a390e5d7670\0"