From ef194559122bb67297da9bc1d1807033f9d5f609 Mon Sep 17 00:00:00 2001 From: pan-wang Date: Wed, 26 Oct 2016 13:44:02 -0700 Subject: [PATCH] sync up the code with IIS OOB branch (#21) --- src/AspNetCore/Inc/processmanager.h | 2 +- src/AspNetCore/Src/filewatcher.cxx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/AspNetCore/Inc/processmanager.h b/src/AspNetCore/Inc/processmanager.h index 8cd7fd8e0f..b91e8e6bfb 100644 --- a/src/AspNetCore/Inc/processmanager.h +++ b/src/AspNetCore/Inc/processmanager.h @@ -160,7 +160,7 @@ private: m_ppServerProcessList[i] != NULL ) { // shutdown pServerProcess if not already shutdown. - m_ppServerProcessList[i]->StopProcess(); + m_ppServerProcessList[i]->SendSignal(); m_ppServerProcessList[i]->DereferenceServerProcess(); m_ppServerProcessList[i] = NULL; } diff --git a/src/AspNetCore/Src/filewatcher.cxx b/src/AspNetCore/Src/filewatcher.cxx index 545d76bc63..bf147c15c4 100644 --- a/src/AspNetCore/Src/filewatcher.cxx +++ b/src/AspNetCore/Src/filewatcher.cxx @@ -199,6 +199,7 @@ FILE_WATCHER_ENTRY::~FILE_WATCHER_ENTRY() } } +#pragma warning(disable:4100) HRESULT FILE_WATCHER_ENTRY::HandleChangeCompletion( @@ -301,11 +302,12 @@ Finished: return hr; } +#pragma warning( error : 4100 ) + HRESULT FILE_WATCHER_ENTRY::Monitor(VOID) { HRESULT hr = S_OK; - BOOL fRet = FALSE; DWORD cbRead; AcquireSRWLockExclusive(&_srwLock);