diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-07-30 13:15:22 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-07-30 13:15:22 -0700 |
| commit | 6357886a38249eb80fcc8d9cc727371e9483120a (patch) | |
| tree | e25ff7fad2c453576c8b46e282fffa20b321ee2f /src/debug | |
| parent | b53dd122d5c3fa4df4dcb0f65eb0ec57d87551a8 (diff) | |
| parent | 4c036c0801950f48c3316aeef414819a1c43b194 (diff) | |
| download | coreclr-6357886a38249eb80fcc8d9cc727371e9483120a.tar.gz coreclr-6357886a38249eb80fcc8d9cc727371e9483120a.tar.bz2 coreclr-6357886a38249eb80fcc8d9cc727371e9483120a.zip | |
Merge pull request #1314 from dotnet-bot/from-tfs
Merge changes from TFS
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/di/symbolinfo.h | 2 | ||||
| -rw-r--r-- | src/debug/ee/debugger.h | 4 | ||||
| -rw-r--r-- | src/debug/ee/rcthread.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/debug/di/symbolinfo.h b/src/debug/di/symbolinfo.h index 46c7ff9e93..271fb75839 100644 --- a/src/debug/di/symbolinfo.h +++ b/src/debug/di/symbolinfo.h @@ -117,7 +117,7 @@ public: STDMETHOD(GetTypeDefProps)( // S_OK or error. mdTypeDef td, // [IN] TypeDef token for inquiry. - __out_ecount_part_opt(cchTypeDef, pchTypeDef) + __out_ecount_part_opt(cchTypeDef, *pchTypeDef) LPWSTR szTypeDef, // [OUT] Put name here. ULONG cchTypeDef, // [IN] size of name buffer in wide chars. ULONG *pchTypeDef, // [OUT] put size of name (wide chars) here. diff --git a/src/debug/ee/debugger.h b/src/debug/ee/debugger.h index 9b98f6bde6..2a1ca0cf10 100644 --- a/src/debug/ee/debugger.h +++ b/src/debug/ee/debugger.h @@ -2059,7 +2059,7 @@ public: void SendInterceptExceptionComplete(Thread *thread); HRESULT AttachDebuggerForBreakpoint(Thread *thread, - __in_opt __in_z WCHAR *wszLaunchReason); + __in_opt WCHAR *wszLaunchReason); void ThreadIsSafe(Thread *thread); @@ -3591,7 +3591,7 @@ void DbgLogHelper(DebuggerIPCEventType event); // Helpers for cleanup // These are various utility functions, mainly where we factor out code. //----------------------------------------------------------------------------- -void GetPidDecoratedName(__out_z __in_ecount(cBufSizeInChars) WCHAR * pBuf, +void GetPidDecoratedName(__out_ecount(cBufSizeInChars) WCHAR * pBuf, int cBufSizeInChars, const WCHAR * pPrefix); diff --git a/src/debug/ee/rcthread.cpp b/src/debug/ee/rcthread.cpp index cf19d6fbec..442c0748a3 100644 --- a/src/debug/ee/rcthread.cpp +++ b/src/debug/ee/rcthread.cpp @@ -122,7 +122,7 @@ void DebuggerRCThread::CloseIPCHandles() // cBufSizeInChars - the size of the buffer in characters, including the null. // pPrefx - The undecorated name of the event. //----------------------------------------------------------------------------- -void GetPidDecoratedName(__out_z __in_ecount(cBufSizeInChars) WCHAR * pBuf, +void GetPidDecoratedName(__out_ecount(cBufSizeInChars) WCHAR * pBuf, int cBufSizeInChars, const WCHAR * pPrefix) { |