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

fix coding guideline issue. Use BOOL instead of bool (#620)

This commit is contained in:
pan-wang 2018-02-28 12:02:15 -08:00 committed by GitHub
parent 71b90a31a9
commit fcbe74fbf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/RequestHandler/outofprocess/forwardinghandler.cpp
View File

@ -82,9 +82,9 @@ FORWARDING_HANDLER::OnExecuteRequestHandler()
{ {
REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE;
HRESULT hr = S_OK; HRESULT hr = S_OK;
bool fRequestLocked = FALSE; BOOL fRequestLocked = FALSE;
bool fHandleSet = FALSE; BOOL fHandleSet = FALSE;
bool fFailedToStartKestrel = FALSE; BOOL fFailedToStartKestrel = FALSE;
BOOL fSecure = FALSE; BOOL fSecure = FALSE;
HINTERNET hConnect = NULL; HINTERNET hConnect = NULL;
IHttpRequest *pRequest = m_pW3Context->GetRequest(); IHttpRequest *pRequest = m_pW3Context->GetRequest();
@ -394,9 +394,9 @@ REQUEST_NOTIFICATION_STATUS
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_PENDING; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_PENDING;
bool fLocked = FALSE; BOOL fLocked = FALSE;
bool fClientError = FALSE; BOOL fClientError = FALSE;
bool fClosed = FALSE; BOOL fClosed = FALSE;
DBG_ASSERT(m_pW3Context != NULL); DBG_ASSERT(m_pW3Context != NULL);
__analysis_assume(m_pW3Context != NULL); __analysis_assume(m_pW3Context != NULL);
@ -762,7 +762,7 @@ FORWARDING_HANDLER::StaticTerminate()
HRESULT HRESULT
FORWARDING_HANDLER::GetHeaders( FORWARDING_HANDLER::GetHeaders(
_In_ const PROTOCOL_CONFIG * pProtocol, _In_ const PROTOCOL_CONFIG * pProtocol,
_In_ bool fForwardWindowsAuthToken, _In_ BOOL fForwardWindowsAuthToken,
_In_ SERVER_PROCESS* pServerProcess, _In_ SERVER_PROCESS* pServerProcess,
_Out_ PCWSTR * ppszHeaders, _Out_ PCWSTR * ppszHeaders,
_Inout_ DWORD * pcchHeaders _Inout_ DWORD * pcchHeaders
@ -1208,11 +1208,11 @@ None
--*/ --*/
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
bool fLockAcquired = FALSE; BOOL fLockAcquired = FALSE;
bool fClientError = FALSE; BOOL fClientError = FALSE;
bool fAnotherCompletionExpected = FALSE; BOOL fAnotherCompletionExpected = FALSE;
bool fDoPostCompletion = FALSE; BOOL fDoPostCompletion = FALSE;
bool fEndRequest = (dwInternetStatus == WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING); BOOL fEndRequest = (dwInternetStatus == WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING);
DBG_ASSERT(m_pW3Context != NULL); DBG_ASSERT(m_pW3Context != NULL);
__analysis_assume(m_pW3Context != NULL); __analysis_assume(m_pW3Context != NULL);
@ -1574,8 +1574,8 @@ HRESULT
FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete( FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete(
HINTERNET hRequest, HINTERNET hRequest,
DWORD, DWORD,
__out bool * pfClientError, __out BOOL * pfClientError,
__out bool * pfAnotherCompletionExpected __out BOOL * pfAnotherCompletionExpected
) )
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -1683,7 +1683,7 @@ Finished:
HRESULT HRESULT
FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable( FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable(
HINTERNET hRequest, HINTERNET hRequest,
__out bool * pfAnotherCompletionExpected __out BOOL * pfAnotherCompletionExpected
) )
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -1797,7 +1797,7 @@ HRESULT
FORWARDING_HANDLER::OnWinHttpCompletionStatusDataAvailable( FORWARDING_HANDLER::OnWinHttpCompletionStatusDataAvailable(
HINTERNET hRequest, HINTERNET hRequest,
DWORD dwBytes, DWORD dwBytes,
_Out_ bool * pfAnotherCompletionExpected _Out_ BOOL * pfAnotherCompletionExpected
) )
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -1859,7 +1859,7 @@ HRESULT
FORWARDING_HANDLER::OnWinHttpCompletionStatusReadComplete( FORWARDING_HANDLER::OnWinHttpCompletionStatusReadComplete(
__in IHttpResponse * pResponse, __in IHttpResponse * pResponse,
DWORD dwStatusInformationLength, DWORD dwStatusInformationLength,
__out bool * pfAnotherCompletionExpected __out BOOL * pfAnotherCompletionExpected
) )
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -1944,7 +1944,7 @@ HRESULT
FORWARDING_HANDLER::OnSendingRequest( FORWARDING_HANDLER::OnSendingRequest(
DWORD cbCompletion, DWORD cbCompletion,
HRESULT hrCompletionStatus, HRESULT hrCompletionStatus,
__out bool * pfClientError __out BOOL * pfClientError
) )
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;

26
src/RequestHandler/outofprocess/forwardinghandler.h
View File

@ -95,35 +95,35 @@ private:
OnWinHttpCompletionSendRequestOrWriteComplete( OnWinHttpCompletionSendRequestOrWriteComplete(
HINTERNET hRequest, HINTERNET hRequest,
DWORD dwInternetStatus, DWORD dwInternetStatus,
_Out_ bool * pfClientError, _Out_ BOOL * pfClientError,
_Out_ bool * pfAnotherCompletionExpected _Out_ BOOL * pfAnotherCompletionExpected
); );
HRESULT HRESULT
OnWinHttpCompletionStatusHeadersAvailable( OnWinHttpCompletionStatusHeadersAvailable(
HINTERNET hRequest, HINTERNET hRequest,
_Out_ bool * pfAnotherCompletionExpected _Out_ BOOL * pfAnotherCompletionExpected
); );
HRESULT HRESULT
OnWinHttpCompletionStatusDataAvailable( OnWinHttpCompletionStatusDataAvailable(
HINTERNET hRequest, HINTERNET hRequest,
DWORD dwBytes, DWORD dwBytes,
_Out_ bool * pfAnotherCompletionExpected _Out_ BOOL * pfAnotherCompletionExpected
); );
HRESULT HRESULT
OnWinHttpCompletionStatusReadComplete( OnWinHttpCompletionStatusReadComplete(
_In_ IHttpResponse * pResponse, _In_ IHttpResponse * pResponse,
DWORD dwStatusInformationLength, DWORD dwStatusInformationLength,
_Out_ bool * pfAnotherCompletionExpected _Out_ BOOL * pfAnotherCompletionExpected
); );
HRESULT HRESULT
OnSendingRequest( OnSendingRequest(
DWORD cbCompletion, DWORD cbCompletion,
HRESULT hrCompletionStatus, HRESULT hrCompletionStatus,
_Out_ bool * pfClientError _Out_ BOOL * pfClientError
); );
HRESULT HRESULT
@ -151,7 +151,7 @@ private:
HRESULT HRESULT
GetHeaders( GetHeaders(
_In_ const PROTOCOL_CONFIG * pProtocol, _In_ const PROTOCOL_CONFIG * pProtocol,
_In_ bool fForwardWindowsAuthToken, _In_ BOOL fForwardWindowsAuthToken,
_In_ SERVER_PROCESS* pServerProcess, _In_ SERVER_PROCESS* pServerProcess,
_Out_ PCWSTR * ppszHeaders, _Out_ PCWSTR * ppszHeaders,
_Inout_ DWORD * pcchHeaders _Inout_ DWORD * pcchHeaders
@ -165,12 +165,12 @@ private:
HINTERNET m_hRequest; HINTERNET m_hRequest;
FORWARDING_REQUEST_STATUS m_RequestStatus; FORWARDING_REQUEST_STATUS m_RequestStatus;
bool m_fWebSocketEnabled; BOOL m_fWebSocketEnabled;
bool m_fResponseHeadersReceivedAndSet; BOOL m_fResponseHeadersReceivedAndSet;
bool m_fResetConnection; BOOL m_fResetConnection;
bool m_fHandleClosedDueToClient; BOOL m_fHandleClosedDueToClient;
bool m_fFinishRequest; BOOL m_fFinishRequest;
bool m_fHasError; BOOL m_fHasError;
BOOL m_fDoReverseRewriteHeaders; BOOL m_fDoReverseRewriteHeaders;
PCSTR m_pszOriginalHostHeader; PCSTR m_pszOriginalHostHeader;
PCWSTR m_pszHeaders; PCWSTR m_pszHeaders;