huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sync up the code with IIS OOB branch (#21)

This commit is contained in:
pan-wang 2016-10-26 13:44:02 -07:00 committed by GitHub
parent 64ab88fa66
commit ef19455912
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AspNetCore/Inc/processmanager.h
View File

@ -160,7 +160,7 @@ private:
m_ppServerProcessList[i] != NULL ) m_ppServerProcessList[i] != NULL )
{ {
// shutdown pServerProcess if not already shutdown. // shutdown pServerProcess if not already shutdown.
m_ppServerProcessList[i]->StopProcess(); m_ppServerProcessList[i]->SendSignal();
m_ppServerProcessList[i]->DereferenceServerProcess(); m_ppServerProcessList[i]->DereferenceServerProcess();
m_ppServerProcessList[i] = NULL; m_ppServerProcessList[i] = NULL;
} }

4
src/AspNetCore/Src/filewatcher.cxx
View File

@ -199,6 +199,7 @@ FILE_WATCHER_ENTRY::~FILE_WATCHER_ENTRY()
} }
} }
#pragma warning(disable:4100)
HRESULT HRESULT
FILE_WATCHER_ENTRY::HandleChangeCompletion( FILE_WATCHER_ENTRY::HandleChangeCompletion(
@ -301,11 +302,12 @@ Finished:
return hr; return hr;
} }
#pragma warning( error : 4100 )
HRESULT HRESULT
FILE_WATCHER_ENTRY::Monitor(VOID) FILE_WATCHER_ENTRY::Monitor(VOID)
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
BOOL fRet = FALSE;
DWORD cbRead; DWORD cbRead;
AcquireSRWLockExclusive(&_srwLock); AcquireSRWLockExclusive(&_srwLock);