diff --git a/src/coreclr/debug/daccess/daccess.cpp b/src/coreclr/debug/daccess/daccess.cpp index f9ec95c1f41838..1280b69561c8b3 100644 --- a/src/coreclr/debug/daccess/daccess.cpp +++ b/src/coreclr/debug/daccess/daccess.cpp @@ -92,7 +92,7 @@ BOOL WINAPI DllMain(HANDLE instance, DWORD reason, LPVOID reserved) } HRESULT -ConvertUtf8(__in LPCUTF8 utf8, +ConvertUtf8(_In_ LPCUTF8 utf8, ULONG32 bufLen, ULONG32* nameLen, __out_ecount_part_opt(bufLen, *nameLen) PWSTR buffer) @@ -228,7 +228,7 @@ GetFullMethodNameFromMetadata(IMDInternalImport* mdImport, } HRESULT -SplitFullName(__in_z __in PCWSTR fullName, +SplitFullName(__in_z _In_ PCWSTR fullName, SplitSyntax syntax, ULONG32 memberDots, __deref_out_opt LPUTF8* namespaceName, @@ -401,7 +401,7 @@ SplitFullName(__in_z __in PCWSTR fullName, } int -CompareUtf8(__in LPCUTF8 str1, __in LPCUTF8 str2, __in ULONG32 nameFlags) +CompareUtf8(_In_ LPCUTF8 str1, _In_ LPCUTF8 str2, _In_ ULONG32 nameFlags) { if (nameFlags & CLRDATA_BYNAME_CASE_INSENSITIVE) { @@ -7565,9 +7565,9 @@ typedef struct _WER_RUNTIME_EXCEPTION_INFORMATION // else detailed error code. // //---------------------------------------------------------------------------- -STDAPI OutOfProcessExceptionEventGetWatsonBucket(__in PDWORD pContext, - __in const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation, - __out GenericModeBlock * pGMB) +STDAPI OutOfProcessExceptionEventGetWatsonBucket(_In_ PDWORD pContext, + _In_ const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation, + _Out_ GenericModeBlock * pGMB) { HANDLE hProcess = pExceptionInformation->hProcess; HANDLE hThread = pExceptionInformation->hThread; @@ -7656,12 +7656,12 @@ STDAPI OutOfProcessExceptionEventGetWatsonBucket(__in PDWORD pContext, // Since this is called by external modules it's important that we don't let any exceptions leak out (see Win8 95224). // //---------------------------------------------------------------------------- -STDAPI OutOfProcessExceptionEventCallback(__in PDWORD pContext, - __in const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation, - __out BOOL * pbOwnershipClaimed, +STDAPI OutOfProcessExceptionEventCallback(_In_ PDWORD pContext, + _In_ const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation, + _Out_ BOOL * pbOwnershipClaimed, __out_ecount(*pchSize) PWSTR pwszEventName, __inout PDWORD pchSize, - __out PDWORD pdwSignatureCount) + _Out_ PDWORD pdwSignatureCount) { SUPPORTS_DAC_HOST_ONLY; @@ -7748,9 +7748,9 @@ STDAPI OutOfProcessExceptionEventCallback(__in PDWORD pContext, // Since this is called by external modules it's important that we don't let any exceptions leak out (see Win8 95224). // //---------------------------------------------------------------------------- -STDAPI OutOfProcessExceptionEventSignatureCallback(__in PDWORD pContext, - __in const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation, - __in DWORD dwIndex, +STDAPI OutOfProcessExceptionEventSignatureCallback(_In_ PDWORD pContext, + _In_ const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation, + _In_ DWORD dwIndex, __out_ecount(*pchName) PWSTR pwszName, __inout PDWORD pchName, __out_ecount(*pchValue) PWSTR pwszValue, @@ -7873,12 +7873,12 @@ STDAPI OutOfProcessExceptionEventSignatureCallback(__in PDWORD pContext, // this function are of the pwszName and pwszValue buffers. // //---------------------------------------------------------------------------- -STDAPI OutOfProcessExceptionEventDebuggerLaunchCallback(__in PDWORD pContext, - __in const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation, - __out BOOL * pbCustomDebuggerNeeded, +STDAPI OutOfProcessExceptionEventDebuggerLaunchCallback(_In_ PDWORD pContext, + _In_ const PWER_RUNTIME_EXCEPTION_INFORMATION pExceptionInformation, + _Out_ BOOL * pbCustomDebuggerNeeded, __out_ecount_opt(*pchSize) PWSTR pwszDebuggerLaunch, __inout PDWORD pchSize, - __out BOOL * pbAutoLaunchDebugger) + _Out_ BOOL * pbAutoLaunchDebugger) { SUPPORTS_DAC_HOST_ONLY; diff --git a/src/coreclr/debug/daccess/dacfn.cpp b/src/coreclr/debug/daccess/dacfn.cpp index e1b83aba17e20c..11f798ed04c199 100644 --- a/src/coreclr/debug/daccess/dacfn.cpp +++ b/src/coreclr/debug/daccess/dacfn.cpp @@ -89,7 +89,7 @@ DacExceptionFilter(Exception* ex, ClrDataAccess* access, } void __cdecl -DacWarning(__in char* format, ...) +DacWarning(_In_ char* format, ...) { char text[256]; va_list args; diff --git a/src/coreclr/debug/daccess/dacimpl.h b/src/coreclr/debug/daccess/dacimpl.h index 948bef16e498da..03697ba5ab53c0 100644 --- a/src/coreclr/debug/daccess/dacimpl.h +++ b/src/coreclr/debug/daccess/dacimpl.h @@ -222,7 +222,7 @@ struct METH_EXTENTS CLRDATA_ADDRESS_RANGE extents[1]; }; -HRESULT ConvertUtf8(__in LPCUTF8 utf8, +HRESULT ConvertUtf8(_In_ LPCUTF8 utf8, ULONG32 bufLen, ULONG32* nameLen, __out_ecount_part_opt(bufLen, *nameLen) PWSTR buffer); @@ -247,7 +247,7 @@ enum SplitSyntax SPLIT_NO_NAME, }; -HRESULT SplitFullName(__in_z __in PCWSTR fullName, +HRESULT SplitFullName(__in_z _In_ PCWSTR fullName, SplitSyntax syntax, ULONG32 memberDots, __deref_out_opt LPUTF8* namespaceName, @@ -255,7 +255,7 @@ HRESULT SplitFullName(__in_z __in PCWSTR fullName, __deref_out_opt LPUTF8* memberName, __deref_out_opt LPUTF8* params); -int CompareUtf8(__in LPCUTF8 str1, __in LPCUTF8 str2, __in ULONG32 nameFlags); +int CompareUtf8(_In_ LPCUTF8 str1, _In_ LPCUTF8 str2, _In_ ULONG32 nameFlags); #define INH_STATIC \ (CLRDATA_VALUE_ALL_KINDS | \ diff --git a/src/coreclr/debug/di/publish.cpp b/src/coreclr/debug/di/publish.cpp index 23003b980ad9f1..801e334c323037 100644 --- a/src/coreclr/debug/di/publish.cpp +++ b/src/coreclr/debug/di/publish.cpp @@ -928,7 +928,7 @@ HRESULT CorpubProcess::GetDisplayName(ULONG32 cchName, // CorpubAppDomain // ****************************************** -CorpubAppDomain::CorpubAppDomain (__in LPWSTR szAppDomainName, ULONG Id) +CorpubAppDomain::CorpubAppDomain (_In_ LPWSTR szAppDomainName, ULONG Id) : CordbCommonBase (0, enumCorpubAppDomain), m_pNext (NULL), m_szAppDomainName (szAppDomainName), diff --git a/src/coreclr/debug/di/rspriv.h b/src/coreclr/debug/di/rspriv.h index a34dd0e6a07288..5a89337f5a990d 100644 --- a/src/coreclr/debug/di/rspriv.h +++ b/src/coreclr/debug/di/rspriv.h @@ -10838,7 +10838,7 @@ class CorpubProcess : public CordbCommonBase, public ICorPublishProcess class CorpubAppDomain : public CordbCommonBase, public ICorPublishAppDomain { public: - CorpubAppDomain (__in LPWSTR szAppDomainName, ULONG Id); + CorpubAppDomain (_In_ LPWSTR szAppDomainName, ULONG Id); virtual ~CorpubAppDomain(); #ifdef _DEBUG diff --git a/src/coreclr/debug/di/shimcallback.cpp b/src/coreclr/debug/di/shimcallback.cpp index ba5f0771fca49a..4e8f029209def7 100644 --- a/src/coreclr/debug/di/shimcallback.cpp +++ b/src/coreclr/debug/di/shimcallback.cpp @@ -659,7 +659,7 @@ HRESULT ShimProxyCallback::DebuggerError(ICorDebugProcess * pProcess, HRESULT er // Implementation of ICorDebugManagedCallback::LogMessage -HRESULT ShimProxyCallback::LogMessage(ICorDebugAppDomain * pAppDomain, ICorDebugThread * pThread, LONG lLevel, __in LPWSTR pLogSwitchName, __in LPWSTR pMessage) +HRESULT ShimProxyCallback::LogMessage(ICorDebugAppDomain * pAppDomain, ICorDebugThread * pThread, LONG lLevel, _In_ LPWSTR pLogSwitchName, _In_ LPWSTR pMessage) { m_pShim->PreDispatchEvent(); class LogMessageEvent : public ManagedEvent @@ -695,7 +695,7 @@ HRESULT ShimProxyCallback::LogMessage(ICorDebugAppDomain * pAppDomain, ICorDebug // Implementation of ICorDebugManagedCallback::LogSwitch -HRESULT ShimProxyCallback::LogSwitch(ICorDebugAppDomain * pAppDomain, ICorDebugThread * pThread, LONG lLevel, ULONG ulReason, __in LPWSTR pLogSwitchName, __in LPWSTR pParentName) +HRESULT ShimProxyCallback::LogSwitch(ICorDebugAppDomain * pAppDomain, ICorDebugThread * pThread, LONG lLevel, ULONG ulReason, _In_ LPWSTR pLogSwitchName, _In_ LPWSTR pParentName) { m_pShim->PreDispatchEvent(); class LogSwitchEvent : public ManagedEvent @@ -1060,7 +1060,7 @@ HRESULT ShimProxyCallback::FunctionRemapOpportunity(ICorDebugAppDomain * pAppDom // Implementation of ICorDebugManagedCallback2::CreateConnection -HRESULT ShimProxyCallback::CreateConnection(ICorDebugProcess * pProcess, CONNID dwConnectionId, __in LPWSTR pConnectionName) +HRESULT ShimProxyCallback::CreateConnection(ICorDebugProcess * pProcess, CONNID dwConnectionId, _In_ LPWSTR pConnectionName) { m_pShim->PreDispatchEvent(); class CreateConnectionEvent : public ManagedEvent diff --git a/src/coreclr/debug/di/shimpriv.h b/src/coreclr/debug/di/shimpriv.h index 89a0c0d0c79374..56365229c8a766 100644 --- a/src/coreclr/debug/di/shimpriv.h +++ b/src/coreclr/debug/di/shimpriv.h @@ -128,15 +128,15 @@ class ShimProxyCallback : COM_METHOD LogMessage( ICorDebugAppDomain *pAppDomain, ICorDebugThread *pThread, LONG lLevel, - __in LPWSTR pLogSwitchName, - __in LPWSTR pMessage); + _In_ LPWSTR pLogSwitchName, + _In_ LPWSTR pMessage); COM_METHOD LogSwitch( ICorDebugAppDomain *pAppDomain, ICorDebugThread *pThread, LONG lLevel, ULONG ulReason, - __in LPWSTR pLogSwitchName, - __in LPWSTR pParentName); + _In_ LPWSTR pLogSwitchName, + _In_ LPWSTR pParentName); COM_METHOD CreateAppDomain(ICorDebugProcess *pProcess, ICorDebugAppDomain *pAppDomain); @@ -178,7 +178,7 @@ class ShimProxyCallback : ICorDebugFunction *pNewFunction, ULONG32 oldILOffset); - COM_METHOD CreateConnection(ICorDebugProcess *pProcess, CONNID dwConnectionId, __in LPWSTR pConnName); + COM_METHOD CreateConnection(ICorDebugProcess *pProcess, CONNID dwConnectionId, _In_ LPWSTR pConnName); COM_METHOD ChangeConnection(ICorDebugProcess *pProcess, CONNID dwConnectionId ); diff --git a/src/coreclr/dlls/dbgshim/dbgshim.cpp b/src/coreclr/dlls/dbgshim/dbgshim.cpp index ac1e2d7fe189ac..0372a3591d7317 100644 --- a/src/coreclr/dlls/dbgshim/dbgshim.cpp +++ b/src/coreclr/dlls/dbgshim/dbgshim.cpp @@ -79,12 +79,12 @@ if it exists, it will: DLLEXPORT HRESULT CreateProcessForLaunch( - __in LPWSTR lpCommandLine, - __in BOOL bSuspendProcess, - __in LPVOID lpEnvironment, - __in LPCWSTR lpCurrentDirectory, - __out PDWORD pProcessId, - __out HANDLE *pResumeHandle) + _In_ LPWSTR lpCommandLine, + _In_ BOOL bSuspendProcess, + _In_ LPVOID lpEnvironment, + _In_ LPCWSTR lpCurrentDirectory, + _Out_ PDWORD pProcessId, + _Out_ HANDLE *pResumeHandle) { PUBLIC_CONTRACT; @@ -140,7 +140,7 @@ CreateProcessForLaunch( DLLEXPORT HRESULT ResumeProcess( - __in HANDLE hResumeHandle) + _In_ HANDLE hResumeHandle) { PUBLIC_CONTRACT; if (ResumeThread(hResumeHandle) == (DWORD)-1) @@ -159,7 +159,7 @@ ResumeProcess( DLLEXPORT HRESULT CloseResumeHandle( - __in HANDLE hResumeHandle) + _In_ HANDLE hResumeHandle) { PUBLIC_CONTRACT; if (!CloseHandle(hResumeHandle)) @@ -190,7 +190,7 @@ HRESULT GetContinueStartupEvent( DWORD debuggeePID, LPCWSTR szTelestoFullPath, - __out HANDLE *phContinueStartupEvent); + _Out_ HANDLE *phContinueStartupEvent); #endif // TARGET_UNIX @@ -697,10 +697,10 @@ StartupHelperThread(LPVOID p) DLLEXPORT HRESULT RegisterForRuntimeStartup( - __in DWORD dwProcessId, - __in PSTARTUP_CALLBACK pfnCallback, - __in PVOID parameter, - __out PVOID *ppUnregisterToken) + _In_ DWORD dwProcessId, + _In_ PSTARTUP_CALLBACK pfnCallback, + _In_ PVOID parameter, + _Out_ PVOID *ppUnregisterToken) { return RegisterForRuntimeStartupEx(dwProcessId, NULL, pfnCallback, parameter, ppUnregisterToken); } @@ -738,11 +738,11 @@ RegisterForRuntimeStartup( DLLEXPORT HRESULT RegisterForRuntimeStartupEx( - __in DWORD dwProcessId, - __in LPCWSTR lpApplicationGroupId, - __in PSTARTUP_CALLBACK pfnCallback, - __in PVOID parameter, - __out PVOID *ppUnregisterToken) + _In_ DWORD dwProcessId, + _In_ LPCWSTR lpApplicationGroupId, + _In_ PSTARTUP_CALLBACK pfnCallback, + _In_ PVOID parameter, + _Out_ PVOID *ppUnregisterToken) { PUBLIC_CONTRACT; @@ -787,7 +787,7 @@ RegisterForRuntimeStartupEx( DLLEXPORT HRESULT UnregisterForRuntimeStartup( - __in PVOID pUnregisterToken) + _In_ PVOID pUnregisterToken) { PUBLIC_CONTRACT; @@ -824,8 +824,8 @@ const int cchEventNameBufferSize = (sizeof(StartupNotifyEventNamePrefix) + sizeo DLLEXPORT HRESULT GetStartupNotificationEvent( - __in DWORD debuggeePID, - __out HANDLE* phStartupEvent) + _In_ DWORD debuggeePID, + _Out_ HANDLE* phStartupEvent) { PUBLIC_CONTRACT; @@ -1220,9 +1220,9 @@ DLLEXPORT HRESULT EnumerateCLRs( DWORD debuggeePID, - __out HANDLE** ppHandleArrayOut, - __out LPWSTR** ppStringArrayOut, - __out DWORD* pdwArrayLengthOut) + _Out_ HANDLE** ppHandleArrayOut, + _Out_ LPWSTR** ppStringArrayOut, + _Out_ DWORD* pdwArrayLengthOut) { PUBLIC_CONTRACT; @@ -1357,9 +1357,9 @@ EnumerateCLRs( DLLEXPORT HRESULT CloseCLREnumeration( - __in HANDLE* pHandleArray, - __in LPWSTR* pStringArray, - __in DWORD dwArrayLength) + _In_ HANDLE* pHandleArray, + _In_ LPWSTR* pStringArray, + _In_ DWORD dwArrayLength) { PUBLIC_CONTRACT; @@ -1484,11 +1484,11 @@ const WCHAR *c_versionStrFormat = W("%08x;%08x;%p"); DLLEXPORT HRESULT CreateVersionStringFromModule( - __in DWORD pidDebuggee, - __in LPCWSTR szModuleName, + _In_ DWORD pidDebuggee, + _In_ LPCWSTR szModuleName, __out_ecount_part(cchBuffer, *pdwLength) LPWSTR pBuffer, - __in DWORD cchBuffer, - __out DWORD* pdwLength) + _In_ DWORD cchBuffer, + _Out_ DWORD* pdwLength) { PUBLIC_CONTRACT; @@ -1719,9 +1719,9 @@ CheckDbiAndRuntimeVersion( DLLEXPORT HRESULT CreateDebuggingInterfaceFromVersionEx( - __in int iDebuggerVersion, - __in LPCWSTR szDebuggeeVersion, - __out IUnknown ** ppCordb) + _In_ int iDebuggerVersion, + _In_ LPCWSTR szDebuggeeVersion, + _Out_ IUnknown ** ppCordb) { return CreateDebuggingInterfaceFromVersion2(iDebuggerVersion, szDebuggeeVersion, NULL, ppCordb); } @@ -1748,10 +1748,10 @@ CreateDebuggingInterfaceFromVersionEx( DLLEXPORT HRESULT CreateDebuggingInterfaceFromVersion2( - __in int iDebuggerVersion, - __in LPCWSTR szDebuggeeVersion, - __in LPCWSTR szApplicationGroupId, - __out IUnknown ** ppCordb) + _In_ int iDebuggerVersion, + _In_ LPCWSTR szDebuggeeVersion, + _In_ LPCWSTR szApplicationGroupId, + _Out_ IUnknown ** ppCordb) { PUBLIC_CONTRACT; @@ -1880,8 +1880,8 @@ CreateDebuggingInterfaceFromVersion2( DLLEXPORT HRESULT CreateDebuggingInterfaceFromVersion( - __in LPCWSTR szDebuggeeVersion, - __out IUnknown ** ppCordb + _In_ LPCWSTR szDebuggeeVersion, + _Out_ IUnknown ** ppCordb ) { PUBLIC_CONTRACT; @@ -1907,7 +1907,7 @@ HRESULT GetContinueStartupEvent( DWORD debuggeePID, LPCWSTR szTelestoFullPath, - __out HANDLE* phContinueStartupEvent) + _Out_ HANDLE* phContinueStartupEvent) { if ((phContinueStartupEvent == NULL) || (szTelestoFullPath == NULL)) return E_INVALIDARG; diff --git a/src/coreclr/dlls/dbgshim/dbgshim.h b/src/coreclr/dlls/dbgshim/dbgshim.h index 392cd7b9286a85..56841663d7d462 100644 --- a/src/coreclr/dlls/dbgshim/dbgshim.h +++ b/src/coreclr/dlls/dbgshim/dbgshim.h @@ -11,81 +11,81 @@ typedef VOID (*PSTARTUP_CALLBACK)(IUnknown *pCordb, PVOID parameter, HRESULT hr) EXTERN_C HRESULT CreateProcessForLaunch( - __in LPWSTR lpCommandLine, - __in BOOL bSuspendProcess, - __in LPVOID lpEnvironment, - __in LPCWSTR lpCurrentDirectory, - __out PDWORD pProcessId, - __out HANDLE *pResumeHandle); + _In_ LPWSTR lpCommandLine, + _In_ BOOL bSuspendProcess, + _In_ LPVOID lpEnvironment, + _In_ LPCWSTR lpCurrentDirectory, + _Out_ PDWORD pProcessId, + _Out_ HANDLE *pResumeHandle); EXTERN_C HRESULT ResumeProcess( - __in HANDLE hResumeHandle); + _In_ HANDLE hResumeHandle); EXTERN_C HRESULT CloseResumeHandle( - __in HANDLE hResumeHandle); + _In_ HANDLE hResumeHandle); EXTERN_C HRESULT RegisterForRuntimeStartup( - __in DWORD dwProcessId, - __in PSTARTUP_CALLBACK pfnCallback, - __in PVOID parameter, - __out PVOID *ppUnregisterToken); + _In_ DWORD dwProcessId, + _In_ PSTARTUP_CALLBACK pfnCallback, + _In_ PVOID parameter, + _Out_ PVOID *ppUnregisterToken); EXTERN_C HRESULT RegisterForRuntimeStartupEx( - __in DWORD dwProcessId, - __in LPCWSTR szApplicationGroupId, - __in PSTARTUP_CALLBACK pfnCallback, - __in PVOID parameter, - __out PVOID *ppUnregisterToken); + _In_ DWORD dwProcessId, + _In_ LPCWSTR szApplicationGroupId, + _In_ PSTARTUP_CALLBACK pfnCallback, + _In_ PVOID parameter, + _Out_ PVOID *ppUnregisterToken); EXTERN_C HRESULT UnregisterForRuntimeStartup( - __in PVOID pUnregisterToken); + _In_ PVOID pUnregisterToken); EXTERN_C HRESULT GetStartupNotificationEvent( - __in DWORD debuggeePID, - __out HANDLE* phStartupEvent); + _In_ DWORD debuggeePID, + _Out_ HANDLE* phStartupEvent); EXTERN_C HRESULT EnumerateCLRs(DWORD debuggeePID, - __out HANDLE** ppHandleArrayOut, - __out LPWSTR** ppStringArrayOut, - __out DWORD* pdwArrayLengthOut); + _Out_ HANDLE** ppHandleArrayOut, + _Out_ LPWSTR** ppStringArrayOut, + _Out_ DWORD* pdwArrayLengthOut); EXTERN_C HRESULT CloseCLREnumeration( - __in HANDLE* pHandleArray, - __in LPWSTR* pStringArray, - __in DWORD dwArrayLength); + _In_ HANDLE* pHandleArray, + _In_ LPWSTR* pStringArray, + _In_ DWORD dwArrayLength); EXTERN_C HRESULT CreateVersionStringFromModule( - __in DWORD pidDebuggee, - __in LPCWSTR szModuleName, + _In_ DWORD pidDebuggee, + _In_ LPCWSTR szModuleName, __out_ecount_part(cchBuffer, *pdwLength) LPWSTR pBuffer, - __in DWORD cchBuffer, - __out DWORD* pdwLength); + _In_ DWORD cchBuffer, + _Out_ DWORD* pdwLength); EXTERN_C HRESULT CreateDebuggingInterfaceFromVersionEx( - __in int iDebuggerVersion, - __in LPCWSTR szDebuggeeVersion, - __out IUnknown ** ppCordb); + _In_ int iDebuggerVersion, + _In_ LPCWSTR szDebuggeeVersion, + _Out_ IUnknown ** ppCordb); EXTERN_C DLLEXPORT HRESULT CreateDebuggingInterfaceFromVersion2( - __in int iDebuggerVersion, - __in LPCWSTR szDebuggeeVersion, - __in LPCWSTR szApplicationGroupId, - __out IUnknown ** ppCordb); + _In_ int iDebuggerVersion, + _In_ LPCWSTR szDebuggeeVersion, + _In_ LPCWSTR szApplicationGroupId, + _Out_ IUnknown ** ppCordb); EXTERN_C HRESULT CreateDebuggingInterfaceFromVersion( - __in LPCWSTR szDebuggeeVersion, - __out IUnknown ** ppCordb); + _In_ LPCWSTR szDebuggeeVersion, + _Out_ IUnknown ** ppCordb); diff --git a/src/coreclr/dlls/mscoree/mscoree.cpp b/src/coreclr/dlls/mscoree/mscoree.cpp index 4e2d87906ad309..54b2b665dd80ef 100644 --- a/src/coreclr/dlls/mscoree/mscoree.cpp +++ b/src/coreclr/dlls/mscoree/mscoree.cpp @@ -252,7 +252,7 @@ HRESULT GetInternalSystemDirectory(__out_ecount_part_opt(*pdwLength,*pdwLength) } -LPCWSTR GetInternalSystemDirectory(__out DWORD* pdwLength) +LPCWSTR GetInternalSystemDirectory(_Out_ DWORD* pdwLength) { LIMITED_METHOD_CONTRACT; diff --git a/src/coreclr/dlls/mscorpe/ceefilegenwriter.cpp b/src/coreclr/dlls/mscorpe/ceefilegenwriter.cpp index 6a0ba5a2499475..623f0087d400c0 100644 --- a/src/coreclr/dlls/mscorpe/ceefilegenwriter.cpp +++ b/src/coreclr/dlls/mscorpe/ceefilegenwriter.cpp @@ -487,7 +487,7 @@ HRESULT CeeFileGenWriter::generateImage(void **ppImage) return hr; } // HRESULT CeeFileGenWriter::generateImage() -HRESULT CeeFileGenWriter::setOutputFileName(__in LPWSTR fileName) +HRESULT CeeFileGenWriter::setOutputFileName(_In_ LPWSTR fileName) { if (m_outputFileName) delete[] m_outputFileName; @@ -498,7 +498,7 @@ HRESULT CeeFileGenWriter::setOutputFileName(__in LPWSTR fileName) return S_OK; } // HRESULT CeeFileGenWriter::setOutputFileName() -HRESULT CeeFileGenWriter::setResourceFileName(__in LPWSTR fileName) +HRESULT CeeFileGenWriter::setResourceFileName(_In_ LPWSTR fileName) { if (m_resourceFileName) delete[] m_resourceFileName; @@ -1294,7 +1294,7 @@ HRESULT CeeFileGenWriter::setVTableEntry(ULONG size, ULONG offset) return setVTableEntry64(size,(void*)(ULONG_PTR)offset); } // HRESULT CeeFileGenWriter::setVTableEntry() -HRESULT CeeFileGenWriter::computeSectionOffset(CeeSection §ion, __in char *ptr, +HRESULT CeeFileGenWriter::computeSectionOffset(CeeSection §ion, _In_ char *ptr, unsigned *offset) { *offset = section.computeOffset(ptr); @@ -1302,7 +1302,7 @@ HRESULT CeeFileGenWriter::computeSectionOffset(CeeSection §ion, __in char *p return S_OK; } // HRESULT CeeFileGenWriter::computeSectionOffset() -HRESULT CeeFileGenWriter::computeOffset(__in char *ptr, +HRESULT CeeFileGenWriter::computeOffset(_In_ char *ptr, CeeSection **pSection, unsigned *offset) { TESTANDRETURNPOINTER(pSection); diff --git a/src/coreclr/dlls/mscorpe/iceefilegen.cpp b/src/coreclr/dlls/mscorpe/iceefilegen.cpp index 6714d355d0bfc3..6c40d9699fce91 100644 --- a/src/coreclr/dlls/mscorpe/iceefilegen.cpp +++ b/src/coreclr/dlls/mscorpe/iceefilegen.cpp @@ -183,7 +183,7 @@ HRESULT ICeeFileGen::AddSectionReloc (HCEESECTION section, ULONG offset, HCEESEC } } -HRESULT ICeeFileGen::SetOutputFileName (HCEEFILE ceeFile, __in LPWSTR outputFileName) +HRESULT ICeeFileGen::SetOutputFileName (HCEEFILE ceeFile, _In_ LPWSTR outputFileName) { TESTANDRETURNPOINTER(ceeFile); TESTANDRETURNPOINTER(outputFileName); @@ -192,7 +192,7 @@ HRESULT ICeeFileGen::SetOutputFileName (HCEEFILE ceeFile, __in LPWSTR outputFile return(gen->setOutputFileName(outputFileName)); } -__success(return == S_OK) HRESULT ICeeFileGen::GetOutputFileName (HCEEFILE ceeFile, __out LPWSTR *outputFileName) +__success(return == S_OK) HRESULT ICeeFileGen::GetOutputFileName (HCEEFILE ceeFile, _Out_ LPWSTR *outputFileName) { TESTANDRETURNPOINTER(ceeFile); TESTANDRETURNPOINTER(outputFileName); @@ -204,7 +204,7 @@ __success(return == S_OK) HRESULT ICeeFileGen::GetOutputFileName (HCEEFILE ceeFi } -HRESULT ICeeFileGen::SetResourceFileName (HCEEFILE ceeFile, __in LPWSTR resourceFileName) +HRESULT ICeeFileGen::SetResourceFileName (HCEEFILE ceeFile, _In_ LPWSTR resourceFileName) { TESTANDRETURNPOINTER(ceeFile); TESTANDRETURNPOINTER(resourceFileName); @@ -214,7 +214,7 @@ HRESULT ICeeFileGen::SetResourceFileName (HCEEFILE ceeFile, __in LPWSTR resource } __success(return == S_OK) -HRESULT ICeeFileGen::GetResourceFileName (HCEEFILE ceeFile, __out LPWSTR *resourceFileName) +HRESULT ICeeFileGen::GetResourceFileName (HCEEFILE ceeFile, _Out_ LPWSTR *resourceFileName) { TESTANDRETURNPOINTER(ceeFile); TESTANDRETURNPOINTER(resourceFileName); @@ -277,7 +277,7 @@ HRESULT ICeeFileGen::GetMethodRVA(HCEEFILE ceeFile, ULONG codeOffset, ULONG *cod return S_OK; } -HRESULT ICeeFileGen::EmitString(HCEEFILE ceeFile, __in LPWSTR strValue, ULONG *strRef) +HRESULT ICeeFileGen::EmitString(HCEEFILE ceeFile, _In_ LPWSTR strValue, ULONG *strRef) { TESTANDRETURNPOINTER(ceeFile); @@ -429,7 +429,7 @@ HRESULT ICeeFileGen::SetStrongNameEntry(HCEEFILE ceeFile, ULONG size, ULONG offs return gen->setStrongNameEntry(size, offset); } -HRESULT ICeeFileGen::ComputeSectionOffset(HCEESECTION section, __in char *ptr, +HRESULT ICeeFileGen::ComputeSectionOffset(HCEESECTION section, _In_ char *ptr, unsigned *offset) { TESTANDRETURNPOINTER(section); @@ -443,7 +443,7 @@ HRESULT ICeeFileGen::ComputeSectionOffset(HCEESECTION section, __in char *ptr, __success(return == S_OK) HRESULT ICeeFileGen::ComputeSectionPointer(HCEESECTION section, ULONG offset, - __out char **ptr) + _Out_ char **ptr) { TESTANDRETURNPOINTER(section); @@ -454,7 +454,7 @@ HRESULT ICeeFileGen::ComputeSectionPointer(HCEESECTION section, ULONG offset, return S_OK; } -HRESULT ICeeFileGen::ComputeOffset(HCEEFILE ceeFile, __in char *ptr, +HRESULT ICeeFileGen::ComputeOffset(HCEEFILE ceeFile, _In_ char *ptr, HCEESECTION *pSection, unsigned *offset) { TESTANDRETURNPOINTER(pSection); diff --git a/src/coreclr/dlls/mscorpe/pewriter.cpp b/src/coreclr/dlls/mscorpe/pewriter.cpp index 9add4b56d13b80..b78b00c2853ffb 100644 --- a/src/coreclr/dlls/mscorpe/pewriter.cpp +++ b/src/coreclr/dlls/mscorpe/pewriter.cpp @@ -1829,7 +1829,7 @@ HRESULT PEWriter::fixup(CeeGenTokenMapper *pMapper) return(S_OK); // SUCCESS } -HRESULT PEWriter::Open(__in LPCWSTR fileName) +HRESULT PEWriter::Open(_In_ LPCWSTR fileName) { _ASSERTE(m_file == INVALID_HANDLE_VALUE); HRESULT hr = NOERROR; @@ -1913,7 +1913,7 @@ HRESULT PEWriter::Close() } /******************************************************************/ -HRESULT PEWriter::write(__in LPCWSTR fileName) { +HRESULT PEWriter::write(_In_ LPCWSTR fileName) { HRESULT hr; diff --git a/src/coreclr/dlls/mscorpe/pewriter.h b/src/coreclr/dlls/mscorpe/pewriter.h index 21817b1d5efc45..84ec61f9275eca 100644 --- a/src/coreclr/dlls/mscorpe/pewriter.h +++ b/src/coreclr/dlls/mscorpe/pewriter.h @@ -41,7 +41,7 @@ class PEWriter : public PESectionMan HRESULT link(); HRESULT fixup(CeeGenTokenMapper *pMapper); - HRESULT write(__in LPCWSTR fileName); + HRESULT write(_In_ LPCWSTR fileName); HRESULT write(void **ppImage); // calling these functions is optional @@ -174,7 +174,7 @@ class PEWriter : public PESectionMan HRESULT linkPlaceSections(entry * entries, unsigned iEntries); void setSectionIndex(IMAGE_SECTION_HEADER * h, unsigned sectionIndex); - HRESULT Open(__in LPCWSTR fileName); + HRESULT Open(_In_ LPCWSTR fileName); HRESULT Write(const void *data, int size); HRESULT Seek(int offset); HRESULT Pad(int align); @@ -257,8 +257,8 @@ class PESeedSection : public PEWriterSection { int getDirEntry() { _ASSERTE(!"PESeedSection"); return 0; } HRESULT directoryEntry(unsigned num) { _ASSERTE(!"PESeedSection"); return E_FAIL; } char * computePointer(unsigned offset) const { _ASSERTE(!"PESeedSection"); return NULL; } - BOOL containsPointer(__in char *ptr) const { _ASSERTE(!"PESeedSection"); return FALSE; } - unsigned computeOffset(__in char *ptr) const { _ASSERTE(!"PESeedSection"); return 0; } + BOOL containsPointer(_In_ char *ptr) const { _ASSERTE(!"PESeedSection"); return FALSE; } + unsigned computeOffset(_In_ char *ptr) const { _ASSERTE(!"PESeedSection"); return 0; } HRESULT cloneInstance(PESection *destination) { _ASSERTE(!"PESeedSection"); return E_FAIL; } // PEWriterSection diff --git a/src/coreclr/ilasm/asmman.cpp b/src/coreclr/ilasm/asmman.cpp index 7b5fd474b65157..2d76b20a371c63 100644 --- a/src/coreclr/ilasm/asmman.cpp +++ b/src/coreclr/ilasm/asmman.cpp @@ -49,7 +49,7 @@ BinStr* BinStrToUnicode(BinStr* pSource, bool Swap) return NULL; } -AsmManFile* AsmMan::GetFileByName(__in __nullterminated char* szFileName) +AsmManFile* AsmMan::GetFileByName(_In_ __nullterminated char* szFileName) { AsmManFile* ret = NULL; if(szFileName) @@ -63,7 +63,7 @@ AsmManFile* AsmMan::GetFileByName(__in __nullterminated char* szFileName return ret; } -mdToken AsmMan::GetFileTokByName(__in __nullterminated char* szFileName) +mdToken AsmMan::GetFileTokByName(_In_ __nullterminated char* szFileName) { AsmManFile* tmp = GetFileByName(szFileName); return(tmp ? tmp->tkTok : mdFileNil); @@ -109,7 +109,7 @@ mdToken AsmMan::GetComTypeTokByName( return(tmp ? tmp->tkTok : mdExportedTypeNil); } -AsmManAssembly* AsmMan::GetAsmRefByName(__in __nullterminated const char* szAsmRefName) +AsmManAssembly* AsmMan::GetAsmRefByName(_In_ __nullterminated const char* szAsmRefName) { AsmManAssembly* ret = NULL; if(szAsmRefName) @@ -124,12 +124,12 @@ AsmManAssembly* AsmMan::GetAsmRefByName(__in __nullterminated const char* sz } return ret; } -mdToken AsmMan::GetAsmRefTokByName(__in __nullterminated const char* szAsmRefName) +mdToken AsmMan::GetAsmRefTokByName(_In_ __nullterminated const char* szAsmRefName) { AsmManAssembly* tmp = GetAsmRefByName(szAsmRefName); return(tmp ? tmp->tkTok : mdAssemblyRefNil); } -AsmManAssembly* AsmMan::GetAsmRefByAsmName(__in __nullterminated const char* szAsmName) +AsmManAssembly* AsmMan::GetAsmRefByAsmName(_In_ __nullterminated const char* szAsmName) { AsmManAssembly* ret = NULL; if(szAsmName) @@ -160,7 +160,7 @@ void AsmMan::SetModuleName(__inout_opt __nullterminated char* szName) } //============================================================================================================== -void AsmMan::AddFile(__in __nullterminated char* szName, DWORD dwAttr, BinStr* pHashBlob) +void AsmMan::AddFile(_In_ __nullterminated char* szName, DWORD dwAttr, BinStr* pHashBlob) { AsmManFile* tmp = GetFileByName(szName); Assembler* pAsm = (Assembler*)m_pAssembler; @@ -244,7 +244,7 @@ void AsmMan::EmitFiles() } //end for(i = 0; tmp=m_FileLst.PEEK(i); i++) } -void AsmMan::StartAssembly(__in __nullterminated char* szName, __in_opt __nullterminated char* szAlias, DWORD dwAttr, BOOL isRef) +void AsmMan::StartAssembly(_In_ __nullterminated char* szName, __in_opt __nullterminated char* szAlias, DWORD dwAttr, BOOL isRef) { if(!isRef && (0==strcmp(szName, "mscorlib"))) ((Assembler*)m_pAssembler)->m_fIsMscorlib = TRUE; if(!isRef && (m_pAssembly != NULL)) @@ -674,7 +674,7 @@ void AsmMan::SetAssemblyAutodetect() } } -void AsmMan::StartComType(__in __nullterminated char* szName, DWORD dwAttr) +void AsmMan::StartComType(_In_ __nullterminated char* szName, DWORD dwAttr) { if((m_pCurComType = new AsmManComType)) { @@ -732,7 +732,7 @@ void AsmMan::EndComType() } } -void AsmMan::SetComTypeFile(__in __nullterminated char* szFileName) +void AsmMan::SetComTypeFile(_In_ __nullterminated char* szFileName) { if(m_pCurComType) { @@ -740,7 +740,7 @@ void AsmMan::SetComTypeFile(__in __nullterminated char* szFileName) } } -void AsmMan::SetComTypeAsmRef(__in __nullterminated char* szAsmRefName) +void AsmMan::SetComTypeAsmRef(_In_ __nullterminated char* szAsmRefName) { if(m_pCurComType) { @@ -748,7 +748,7 @@ void AsmMan::SetComTypeAsmRef(__in __nullterminated char* szAsmRefName) } } -void AsmMan::SetComTypeComType(__in __nullterminated char* szComTypeName) +void AsmMan::SetComTypeComType(_In_ __nullterminated char* szComTypeName) { if(m_pCurComType) { @@ -780,7 +780,7 @@ BOOL AsmMan::SetComTypeClassTok(mdToken tkClass) return FALSE; } -void AsmMan::StartManifestRes(__in __nullterminated char* szName, __in __nullterminated char* szAlias, DWORD dwAttr) +void AsmMan::StartManifestRes(_In_ __nullterminated char* szName, _In_ __nullterminated char* szAlias, DWORD dwAttr) { if((m_pCurManRes = new AsmManRes)) { @@ -808,7 +808,7 @@ void AsmMan::EndManifestRes() } -void AsmMan::SetManifestResFile(__in __nullterminated char* szFileName, ULONG ulOffset) +void AsmMan::SetManifestResFile(_In_ __nullterminated char* szFileName, ULONG ulOffset) { if(m_pCurManRes) { @@ -817,7 +817,7 @@ void AsmMan::SetManifestResFile(__in __nullterminated char* szFileName, ULONG } } -void AsmMan::SetManifestResAsmRef(__in __nullterminated char* szAsmRefName) +void AsmMan::SetManifestResAsmRef(_In_ __nullterminated char* szAsmRefName) { if(m_pCurManRes) { diff --git a/src/coreclr/ilasm/asmman.hpp b/src/coreclr/ilasm/asmman.hpp index 1290c9b2707c8a..4663a88e4e5f52 100644 --- a/src/coreclr/ilasm/asmman.hpp +++ b/src/coreclr/ilasm/asmman.hpp @@ -193,8 +193,8 @@ class AsmMan ErrorReporter* report; void* m_pAssembler; - AsmManFile* GetFileByName(__in __nullterminated char* szFileName); - AsmManAssembly* GetAsmRefByName(__in __nullterminated const char* szAsmRefName); + AsmManFile* GetFileByName(_In_ __nullterminated char* szFileName); + AsmManAssembly* GetAsmRefByName(_In_ __nullterminated const char* szAsmRefName); AsmManComType* GetComTypeByName(__in_opt __nullterminated char* szComTypeName, __in_opt __nullterminated char* szComEnclosingTypeName = NULL); mdToken GetComTypeTokByName(__in_opt __nullterminated char* szComTypeName, @@ -241,11 +241,11 @@ class AsmMan void SetModuleName(__inout_opt __nullterminated char* szName); - void AddFile(__in __nullterminated char* szName, DWORD dwAttr, BinStr* pHashBlob); + void AddFile(_In_ __nullterminated char* szName, DWORD dwAttr, BinStr* pHashBlob); void EmitFiles(); void EmitDebuggableAttribute(mdToken tkOwner); - void StartAssembly(__in __nullterminated char* szName, __in_opt __nullterminated char* szAlias, DWORD dwAttr, BOOL isRef); + void StartAssembly(_In_ __nullterminated char* szName, __in_opt __nullterminated char* szAlias, DWORD dwAttr, BOOL isRef); void EndAssembly(); void EmitAssemblyRefs(); void EmitAssembly(); @@ -257,27 +257,27 @@ class AsmMan void SetAssemblyHashBlob(BinStr* pHashBlob); void SetAssemblyAutodetect(); - void StartComType(__in __nullterminated char* szName, DWORD dwAttr); + void StartComType(_In_ __nullterminated char* szName, DWORD dwAttr); void EndComType(); - void SetComTypeFile(__in __nullterminated char* szFileName); - void SetComTypeAsmRef(__in __nullterminated char* szAsmRefName); - void SetComTypeComType(__in __nullterminated char* szComTypeName); + void SetComTypeFile(_In_ __nullterminated char* szFileName); + void SetComTypeAsmRef(_In_ __nullterminated char* szAsmRefName); + void SetComTypeComType(_In_ __nullterminated char* szComTypeName); BOOL SetComTypeImplementationTok(mdToken tk); BOOL SetComTypeClassTok(mdToken tkClass); - void StartManifestRes(__in __nullterminated char* szName, __in __nullterminated char* szAlias, DWORD dwAttr); + void StartManifestRes(_In_ __nullterminated char* szName, _In_ __nullterminated char* szAlias, DWORD dwAttr); void EndManifestRes(); - void SetManifestResFile(__in __nullterminated char* szFileName, ULONG ulOffset); - void SetManifestResAsmRef(__in __nullterminated char* szAsmRefName); + void SetManifestResFile(_In_ __nullterminated char* szFileName, ULONG ulOffset); + void SetManifestResAsmRef(_In_ __nullterminated char* szAsmRefName); - AsmManAssembly* GetAsmRefByAsmName(__in __nullterminated const char* szAsmName); + AsmManAssembly* GetAsmRefByAsmName(_In_ __nullterminated const char* szAsmName); - mdToken GetFileTokByName(__in __nullterminated char* szFileName); - mdToken GetAsmRefTokByName(__in __nullterminated const char* szAsmRefName); - mdToken GetAsmTokByName(__in __nullterminated const char* szAsmName) + mdToken GetFileTokByName(_In_ __nullterminated char* szFileName); + mdToken GetAsmRefTokByName(_In_ __nullterminated const char* szAsmRefName); + mdToken GetAsmTokByName(_In_ __nullterminated const char* szAsmName) { return (m_pAssembly && (strcmp(m_pAssembly->szName,szAsmName)==0)) ? m_pAssembly->tkTok : 0; }; - mdToken GetModuleRefTokByName(__in __nullterminated char* szName) + mdToken GetModuleRefTokByName(_In_ __nullterminated char* szName) { if(szName && *szName) { diff --git a/src/coreclr/ilasm/asmparse.h b/src/coreclr/ilasm/asmparse.h index ef377b5e430d7c..6299719edd3b3a 100644 --- a/src/coreclr/ilasm/asmparse.h +++ b/src/coreclr/ilasm/asmparse.h @@ -20,7 +20,7 @@ class ReadStream { virtual ~ReadStream() = default; - virtual unsigned getAll(__out char** ppch) = 0; + virtual unsigned getAll(_Out_ char** ppch) = 0; // read at most 'buffLen' bytes into 'buff', Return the // number of characters read. On EOF return 0 @@ -49,7 +49,7 @@ class BinStrStream : public ReadStream { //if(m_pBS) // delete m_pBS; }; - unsigned getAll(__out char **ppbuff) + unsigned getAll(_Out_ char **ppbuff) { *ppbuff = m_pStart; return m_pBS->length(); @@ -95,7 +95,7 @@ class BinStrStream : public ReadStream { /**************************************************************************/ class MappedFileStream : public ReadStream { public: - MappedFileStream(__in __nullterminated WCHAR* wFileName) + MappedFileStream(_In_ __nullterminated WCHAR* wFileName) { fileNameW = wFileName; m_hFile = INVALID_HANDLE_VALUE; @@ -124,7 +124,7 @@ class MappedFileStream : public ReadStream { fileNameW = NULL; } } - unsigned getAll(__out char** pbuff) + unsigned getAll(_Out_ char** pbuff) { *pbuff = m_pStart; return m_FileSize; @@ -214,14 +214,14 @@ typedef LIFO ARG_NAME_LIST_STACK; /*--------------------------------------------------------------------------*/ typedef char*(*PFN_NEXTCHAR)(char*); -char* nextcharU(__in __nullterminated char* pos); -char* nextcharW(__in __nullterminated char* pos); +char* nextcharU(_In_ __nullterminated char* pos); +char* nextcharW(_In_ __nullterminated char* pos); /*--------------------------------------------------------------------------*/ typedef unsigned(*PFN_SYM)(char*); -unsigned SymAU(__in __nullterminated char* curPos); -unsigned SymW(__in __nullterminated char* curPos); +unsigned SymAU(_In_ __nullterminated char* curPos); +unsigned SymW(_In_ __nullterminated char* curPos); /*--------------------------------------------------------------------------*/ typedef char*(*PFN_NEWSTRFROMTOKEN)(char*,size_t); @@ -235,8 +235,8 @@ char* NewStaticStrFromTokenW(__in_ecount(tokLen) char* curTok, size_t tokLen, __ /*--------------------------------------------------------------------------*/ typedef unsigned(*PFN_GETDOUBLE)(char*,unsigned,double**); -unsigned GetDoubleAU(__in __nullterminated char* begNum, unsigned L, double** ppRes); -unsigned GetDoubleW(__in __nullterminated char* begNum, unsigned L, double** ppRes); +unsigned GetDoubleAU(_In_ __nullterminated char* begNum, unsigned L, double** ppRes); +unsigned GetDoubleW(_In_ __nullterminated char* begNum, unsigned L, double** ppRes); /*--------------------------------------------------------------------------*/ struct PARSING_ENVIRONMENT { @@ -284,9 +284,9 @@ class AsmParse : public ErrorReporter virtual void warn(const char* fmt, ...); virtual void msg(const char* fmt, ...); char *getLine(int lineNum) { return penv->in->getLine(lineNum); }; - unsigned getAll(__out char** pbuff) { return penv->in->getAll(pbuff); }; + unsigned getAll(_Out_ char** pbuff) { return penv->in->getAll(pbuff); }; bool Success() {return success; }; - void SetIncludePath(__in WCHAR* wz) { wzIncludePath = wz; }; + void SetIncludePath(_In_ WCHAR* wz) { wzIncludePath = wz; }; ARG_NAME_LIST_STACK m_ANSFirst; ARG_NAME_LIST_STACK m_ANSLast; @@ -303,15 +303,15 @@ class AsmParse : public ErrorReporter HANDLE hstderr; private: - friend void yyerror(__in __nullterminated const char* str); + friend void yyerror(_In_ __nullterminated const char* str); friend int parse_literal(unsigned curSym, __inout __nullterminated char* &curPos, BOOL translate_escapes); friend int yyparse(); friend int yylex(); friend Instr* SetupInstr(unsigned short opcode); friend int findKeyword(const char* name, size_t nameLen, unsigned short* opcode); friend TypeDefDescr* findTypedef(__in_ecount(nameLen) char* name, size_t nameLen); - friend char* skipBlanks(__in __nullterminated char*,unsigned*); - friend char* nextBlank(__in __nullterminated char*); + friend char* skipBlanks(_In_ __nullterminated char*,unsigned*); + friend char* nextBlank(_In_ __nullterminated char*); friend int ProcessEOF(); friend unsigned __int8* skipType(unsigned __int8* ptr, BOOL fFixupType); friend void FixupConstraints(); diff --git a/src/coreclr/ilasm/assem.cpp b/src/coreclr/ilasm/assem.cpp index e8044d16ab2b7f..6ab3fcb1099697 100644 --- a/src/coreclr/ilasm/assem.cpp +++ b/src/coreclr/ilasm/assem.cpp @@ -1039,7 +1039,7 @@ BOOL Assembler::EmitProp(PropDescriptor* pPD) return TRUE; } -Class *Assembler::FindCreateClass(__in __nullterminated const char *pszFQN) +Class *Assembler::FindCreateClass(_In_ __nullterminated const char *pszFQN) { Class *pSearch = NULL; @@ -1186,7 +1186,7 @@ BOOL Assembler::DoGlobalFixups() return TRUE; } -state_t Assembler::AddGlobalLabel(__in __nullterminated char *pszName, HCEESECTION section) +state_t Assembler::AddGlobalLabel(_In_ __nullterminated char *pszName, HCEESECTION section) { if (FindGlobalLabel(pszName) != NULL) { @@ -1213,7 +1213,7 @@ state_t Assembler::AddGlobalLabel(__in __nullterminated char *pszName, HCEESECTI return m_State; } -void Assembler::AddLabel(DWORD CurPC, __in __nullterminated char *pszName) +void Assembler::AddLabel(DWORD CurPC, _In_ __nullterminated char *pszName) { if (m_pCurMethod->FindLabel(pszName) != NULL) { diff --git a/src/coreclr/ilasm/assembler.cpp b/src/coreclr/ilasm/assembler.cpp index 48f9487656f7cf..3063a48c1d798c 100644 --- a/src/coreclr/ilasm/assembler.cpp +++ b/src/coreclr/ilasm/assembler.cpp @@ -15,7 +15,7 @@ #define FAIL_UNLESS(x, y) if (!(x)) { report->error y; return; } /**************************************************************************/ -void Assembler::StartNameSpace(__in __nullterminated char* name) +void Assembler::StartNameSpace(_In_ __nullterminated char* name) { m_NSstack.PUSH(m_szNamespace); m_szNamespace = name; @@ -91,7 +91,7 @@ void Assembler::ClearBoundList(void) m_TyParList = NULL; } /**************************************************************************/ -mdToken Assembler::ResolveClassRef(mdToken tkResScope, __in __nullterminated const char *pszFullClassName, Class** ppClass) +mdToken Assembler::ResolveClassRef(mdToken tkResScope, _In_ __nullterminated const char *pszFullClassName, Class** ppClass) { Class *pClass = NULL; mdToken tkRet = mdTokenNil; @@ -239,7 +239,7 @@ mdToken Assembler::ResolveTypeSpec(BinStr* typeSpec) } /**************************************************************************/ -mdToken Assembler::GetAsmRef(__in __nullterminated const char* szName) +mdToken Assembler::GetAsmRef(_In_ __nullterminated const char* szName) { mdToken tkResScope = 0; if(strcmp(szName,"*")==0) tkResScope = mdTokenNil; @@ -330,7 +330,7 @@ mdToken Assembler::GetInterfaceImpl(mdToken tsClass, mdToken tsInterface) } /**************************************************************************/ -mdToken Assembler::GetModRef(__in __nullterminated char* szName) +mdToken Assembler::GetModRef(_In_ __nullterminated char* szName) { mdToken tkResScope = 0; if(!strcmp(szName,m_szScopeName)) @@ -417,7 +417,7 @@ DWORD Assembler::CheckClassFlagsIfNested(Class* pEncloser, DWORD attr) /**************************************************************************/ -void Assembler::StartClass(__in __nullterminated char* name, DWORD attr, TyParList *typars) +void Assembler::StartClass(_In_ __nullterminated char* name, DWORD attr, TyParList *typars) { Class *pEnclosingClass = m_pCurClass; char *szFQN; @@ -607,7 +607,7 @@ void Assembler::SetPinvoke(BinStr* DllName, int Ordinal, BinStr* Alias, int Attr } /**************************************************************************/ -void Assembler::StartMethod(__in __nullterminated char* name, BinStr* sig, CorMethodAttr flags, BinStr* retMarshal, DWORD retAttr, TyParList *typars) +void Assembler::StartMethod(_In_ __nullterminated char* name, BinStr* sig, CorMethodAttr flags, BinStr* retMarshal, DWORD retAttr, TyParList *typars) { if (m_pCurMethod != NULL) { @@ -801,7 +801,7 @@ void Assembler::EndMethod() } /**************************************************************************/ /* rvaLabel is the optional label that indicates this field points at a particular RVA */ -void Assembler::AddField(__inout_z __inout char* name, BinStr* sig, CorFieldAttr flags, __in __nullterminated char* rvaLabel, BinStr* pVal, ULONG ulOffset) +void Assembler::AddField(__inout_z __inout char* name, BinStr* sig, CorFieldAttr flags, _In_ __nullterminated char* rvaLabel, BinStr* pVal, ULONG ulOffset) { FieldDescriptor* pFD; ULONG i,n; @@ -1030,7 +1030,7 @@ void Assembler::NewSEHDescriptor(void) //sets m_SEHD if(m_SEHD == NULL) report->error("Failed to allocate SEH descriptor\n"); } /**************************************************************************/ -void Assembler::SetTryLabels(__in __nullterminated char * szFrom, __in __nullterminated char *szTo) +void Assembler::SetTryLabels(_In_ __nullterminated char * szFrom, _In_ __nullterminated char *szTo) { if(!m_SEHD) return; Label *pLbl = m_pCurMethod->FindLabel(szFrom); @@ -1043,7 +1043,7 @@ void Assembler::SetTryLabels(__in __nullterminated char * szFrom, __in __nullter else report->error("Undefined 1st label in 'try