diff options
67 files changed, 150 insertions, 150 deletions
diff --git a/src/ToolBox/SOS/Strike/ExpressionNode.cpp b/src/ToolBox/SOS/Strike/ExpressionNode.cpp index 7fd4089e29..9e3f9356fa 100644 --- a/src/ToolBox/SOS/Strike/ExpressionNode.cpp +++ b/src/ToolBox/SOS/Strike/ExpressionNode.cpp @@ -832,7 +832,7 @@ HRESULT ExpressionNode::PopulateEnumValue(ICorDebugValue* pEnumValue, BYTE* enum else charsCopied = _snwprintf_s(pTextValueCursor, cchTextValueCursor, _TRUNCATE, L" | %s", mdName); - // if an error or truncation occured, stop copying + // if an error or truncation occurred, stop copying if(charsCopied == -1) { cchTextValueCursor = 0; diff --git a/src/ToolBox/SOS/Strike/apollososdocs.txt b/src/ToolBox/SOS/Strike/apollososdocs.txt index b9771898bf..71fefcf4d7 100644 --- a/src/ToolBox/SOS/Strike/apollososdocs.txt +++ b/src/ToolBox/SOS/Strike/apollososdocs.txt @@ -2020,7 +2020,7 @@ The percentage column contains a breakout of free or unrooted bytes to total byt COMMAND: analyzeoom. !AnalyzeOOM -!AnalyzeOOM displays the info of the last OOM occured on an allocation request to +!AnalyzeOOM displays the info of the last OOM occurred on an allocation request to the GC heap (in Server GC it displays OOM, if any, on each GC heap). To see the managed exception(s) use the !Threads command which will show you @@ -2064,12 +2064,12 @@ Sample output: 0:011> !ao ---------Heap 2 --------- -Managed OOM occured after GC #28 (Requested to allocate 1234 bytes) +Managed OOM occurred after GC #28 (Requested to allocate 1234 bytes) Reason: Didn't have enough memory to commit Detail: SOH: Didn't have enough memory to grow the internal GC datastructures (800000 bytes) - on GC entry available commit space was 500 MB ---------Heap 4 --------- -Managed OOM occured after GC #12 (Requested to allocate 100000 bytes) +Managed OOM occurred after GC #12 (Requested to allocate 100000 bytes) Reason: Didn't have enough memory to allocate an LOH segment Detail: LOH: Failed to reserve memory (16777216 bytes) diff --git a/src/ToolBox/SOS/Strike/disasm.cpp b/src/ToolBox/SOS/Strike/disasm.cpp index 5d13fbc529..ceb3c38ba7 100644 --- a/src/ToolBox/SOS/Strike/disasm.cpp +++ b/src/ToolBox/SOS/Strike/disasm.cpp @@ -530,7 +530,7 @@ INT_PTR ParseHexNumber (__in_z char *ptr, ___out char **endptr) value1 = (value1 << 32) | value2; endptr1 = endptr2; } - // if the hex number was specified as 000006fbf9b70f50, an overflow occured + // if the hex number was specified as 000006fbf9b70f50, an overflow occurred else if (ULONG_MAX == value1 && errno == ERANGE) { if (!strncmp(ptr, "0x", 2)) diff --git a/src/ToolBox/SOS/Strike/sosdocs.txt b/src/ToolBox/SOS/Strike/sosdocs.txt index 9161194ea1..e7dc3a4ac2 100644 --- a/src/ToolBox/SOS/Strike/sosdocs.txt +++ b/src/ToolBox/SOS/Strike/sosdocs.txt @@ -2006,7 +2006,7 @@ The percentage column contains a breakout of free or unrooted bytes to total byt COMMAND: analyzeoom. !AnalyzeOOM -!AnalyzeOOM displays the info of the last OOM occured on an allocation request to +!AnalyzeOOM displays the info of the last OOM occurred on an allocation request to the GC heap (in Server GC it displays OOM, if any, on each GC heap). To see the managed exception(s) use the !Threads command which will show you @@ -2050,12 +2050,12 @@ Sample output: 0:011> !ao ---------Heap 2 --------- -Managed OOM occured after GC #28 (Requested to allocate 1234 bytes) +Managed OOM occurred after GC #28 (Requested to allocate 1234 bytes) Reason: Didn't have enough memory to commit Detail: SOH: Didn't have enough memory to grow the internal GC datastructures (800000 bytes) - on GC entry available commit space was 500 MB ---------Heap 4 --------- -Managed OOM occured after GC #12 (Requested to allocate 100000 bytes) +Managed OOM occurred after GC #12 (Requested to allocate 100000 bytes) Reason: Didn't have enough memory to allocate an LOH segment Detail: LOH: Failed to reserve memory (16777216 bytes) diff --git a/src/ToolBox/SOS/Strike/strike.cpp b/src/ToolBox/SOS/Strike/strike.cpp index fe8e4014e6..2434345d3c 100644 --- a/src/ToolBox/SOS/Strike/strike.cpp +++ b/src/ToolBox/SOS/Strike/strike.cpp @@ -4198,7 +4198,7 @@ static const char *const str_fgm[] = void PrintOOMInfo(DacpOomData* oomData) { - ExtOut("Managed OOM occured after GC #%d (Requested to allocate %d bytes)\n", + ExtOut("Managed OOM occurred after GC #%d (Requested to allocate %d bytes)\n", oomData->gc_index, oomData->alloc_size); if ((oomData->reason == oom_budget) || diff --git a/src/binder/assemblybinder.cpp b/src/binder/assemblybinder.cpp index ecd34499af..1fea74ef64 100644 --- a/src/binder/assemblybinder.cpp +++ b/src/binder/assemblybinder.cpp @@ -1303,7 +1303,7 @@ namespace BINDER_SPACE IF_FAIL_GO(FUSION_E_REF_DEF_MISMATCH); } - // Up-stack expects S_OK when we don't find any candidate assemblies and no fatal error occured (ie, no S_FALSE) + // Up-stack expects S_OK when we don't find any candidate assemblies and no fatal error occurred (ie, no S_FALSE) hr = S_OK; Exit: return hr; diff --git a/src/binder/failurecache.cpp b/src/binder/failurecache.cpp index 931a56ec1a..8cf1cbdac8 100644 --- a/src/binder/failurecache.cpp +++ b/src/binder/failurecache.cpp @@ -42,7 +42,7 @@ namespace BINDER_SPACE NewHolder<FailureCacheEntry> pFailureCacheEntry; SAFE_NEW(pFailureCacheEntry, FailureCacheEntry); - // No error occured; report the original error + // No error occurred; report the original error hr = hrBindingResult; pFailureCacheEntry->GetAssemblyNameOrPath().Set(assemblyNameorPath); diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp index 484905b62b..8b148612b8 100644 --- a/src/debug/di/process.cpp +++ b/src/debug/di/process.cpp @@ -4700,7 +4700,7 @@ void CordbProcess::DispatchRCEvent() } HRESULT hrCallback = S_OK; - // It's possible a ICorDebugProcess::Detach() may have occured by now. + // It's possible a ICorDebugProcess::Detach() may have occurred by now. { // @dbgtodo shim: eventually the entire RCET should be considered outside the RS. PUBLIC_CALLBACK_IN_THIS_SCOPE0_NO_LOCK(this); @@ -4999,7 +4999,7 @@ void CordbProcess::RawDispatchEvent( _ASSERTE(pAppDomain != NULL); - // For some exceptions very early in startup (eg, TypeLoad), this may have occured before we + // For some exceptions very early in startup (eg, TypeLoad), this may have occurred before we // even executed jitted code on the thread. We may have not received a CreateThread yet. // In V2, we detected this and sent a LogMessage on a random thread. // In V3, we lazily create the CordbThread objects (possibly before the CreateThread event), @@ -11305,7 +11305,7 @@ HRESULT CordbProcess::SetEnableCustomNotification(ICorDebugClass * pClass, BOOL // countBytes - number of bytes in pRawRecord buffer. // format - format of pRawRecord // dwFlags - flags providing auxillary info for exception record. -// dwThreadId - thread that exception occured on. +// dwThreadId - thread that exception occurred on. // pCallback - callback to dispatch potential managed events on. // pContinueStatus - Continuation status for exception. This dictates what // to pass to kernel32!ContinueDebugEvent(). @@ -12235,8 +12235,8 @@ Reaction CordbProcess::Triage1stChanceNonSpecial(CordbUnmanagedThread * pUnmanag // Triage a 1st-chance exception when the CLR is initialized. // // Arguments: -// pUnmanagedThread - thread that the event has occured on. -// pEvent - native debug event for the exception that occured that this is triaging. +// pUnmanagedThread - thread that the event has occurred on. +// pEvent - native debug event for the exception that occurred that this is triaging. // // Return Value: // Reaction for how to handle this event. @@ -12534,8 +12534,8 @@ Reaction CordbProcess::TriageExcep1stChanceAndInit(CordbUnmanagedThread * pUnman // Triage a 2nd-chance exception when the CLR is initialized. // // Arguments: -// pUnmanagedThread - thread that the event has occured on. -// pEvent - native debug event for the exception that occured that this is triaging. +// pUnmanagedThread - thread that the event has occurred on. +// pEvent - native debug event for the exception that occurred that this is triaging. // // Return Value: // Reaction for how to handle this event. @@ -12568,7 +12568,7 @@ Reaction CordbProcess::TriageExcep2ndChanceAndInit(CordbUnmanagedThread * pUnman if (dwNo2ndChance) { - CONSISTENCY_CHECK_MSGF(false, ("2nd chance exception occured on LS thread=0x%x, code=0x%08x, address=0x%p\n" + CONSISTENCY_CHECK_MSGF(false, ("2nd chance exception occurred on LS thread=0x%x, code=0x%08x, address=0x%p\n" "This assert is firing b/c you explicitly requested it by having the 'DbgNo2ndChance' knob enabled.\n" "Disable it to avoid asserts on 2nd chance.", pUnmanagedThread->m_id, @@ -12621,8 +12621,8 @@ Reaction CordbProcess::TriageExcep2ndChanceAndInit(CordbUnmanagedThread * pUnman // Triage a win32 Debug event to get a reaction // // Arguments: -// pUnmanagedThread - thread that the event has occured on. -// pEvent - native debug event for the exception that occured that this is triaging. +// pUnmanagedThread - thread that the event has occurred on. +// pEvent - native debug event for the exception that occurred that this is triaging. // // Return Value: // Reaction for how to handle this event. diff --git a/src/debug/di/shimevents.cpp b/src/debug/di/shimevents.cpp index 2a1430176e..a381218ae5 100644 --- a/src/debug/di/shimevents.cpp +++ b/src/debug/di/shimevents.cpp @@ -78,7 +78,7 @@ ICorDebugManagedCallback3 * ManagedEvent::DispatchArgs::GetCallback3() return m_pCallback3; } -// Returns OS Thread Id that this event occured on, 0 if no thread affinity. +// Returns OS Thread Id that this event occurred on, 0 if no thread affinity. DWORD ManagedEvent::GetOSTid() { return m_dwThreadId; diff --git a/src/debug/ee/controller.cpp b/src/debug/ee/controller.cpp index 9a990dec81..9988378c7a 100644 --- a/src/debug/ee/controller.cpp +++ b/src/debug/ee/controller.cpp @@ -2775,7 +2775,7 @@ DebuggerControllerPatch *DebuggerController::GetEnCPatch(const BYTE *address) #endif //EnC_SUPPORTED // DebuggerController::DispatchPatchOrSingleStep - Ask any patches that are active at a given -// address if they want to do anything about the exception that's occured there. How: For the given +// address if they want to do anything about the exception that's occurred there. How: For the given // address, go through the list of patches & see if any of them are interested (by invoking their // DebuggerController's TriggerPatch). Put any DCs that are interested into a queue and then calls // SendEvent on each. diff --git a/src/debug/ee/debugger.cpp b/src/debug/ee/debugger.cpp index 270615bc1e..41359b8d80 100644 --- a/src/debug/ee/debugger.cpp +++ b/src/debug/ee/debugger.cpp @@ -7714,7 +7714,7 @@ HRESULT Debugger::SendException(Thread *pThread, if (fAttaching) { JitAttach(pThread, pExceptionInfo, managedEventNeeded, FALSE); - // If the jit-attach occured, CORDebuggerAttached() may now be true and we can + // If the jit-attach occurred, CORDebuggerAttached() may now be true and we can // just act as if a debugger was always attached. } diff --git a/src/debug/ee/funceval.cpp b/src/debug/ee/funceval.cpp index 40e22aff5f..c7ec48d20c 100644 --- a/src/debug/ee/funceval.cpp +++ b/src/debug/ee/funceval.cpp @@ -2961,7 +2961,7 @@ void FuncEvalWrapper(MethodDescCallSite* pMDCS, DebuggerEval *pDE, ARG_SLOT *pAr /* * RecordFuncEvalException * - * Helper function records the details of an exception that occured during a FuncEval + * Helper function records the details of an exception that occurred during a FuncEval * Note that this should be called from within the target domain of the FuncEval. * * Parameters: @@ -3486,7 +3486,7 @@ static void GCProtectArgsAndDoNormalFuncEval(DebuggerEval *pDE, RecordFuncEvalException( pDE, ppException); } // Note: we need to catch all exceptioins here because they all get reported as the result of - // the funceval. If a ThreadAbort occured other than for a funcEval abort, we'll re-throw it manually. + // the funceval. If a ThreadAbort occurred other than for a funcEval abort, we'll re-throw it manually. EX_END_CATCH(SwallowAllExceptions); // Restore context @@ -3692,7 +3692,7 @@ void FuncEvalHijackRealWorker(DebuggerEval *pDE, Thread* pThread, FuncEvalFrame* RecordFuncEvalException( pDE, ppException); } // Note: we need to catch all exceptioins here because they all get reported as the result of - // the funceval. If a ThreadAbort occured other than for a funcEval abort, we'll re-throw it manually. + // the funceval. If a ThreadAbort occurred other than for a funcEval abort, we'll re-throw it manually. EX_END_CATCH(SwallowAllExceptions); GCPROTECT_END(); diff --git a/src/debug/inc/dbgtransportsession.h b/src/debug/inc/dbgtransportsession.h index 4f844ba984..6464646f1f 100644 --- a/src/debug/inc/dbgtransportsession.h +++ b/src/debug/inc/dbgtransportsession.h @@ -397,7 +397,7 @@ private: SS_Opening_NC, // Session is being formed but no connection is established yet SS_Opening, // Session is being formed, the low level connection is in place SS_Open, // Session is fully formed and normal transport messages can be sent and received - SS_Resync_NC, // A low level connection error is occured and we're attempting to re-form the link + SS_Resync_NC, // A low level connection error is occurred and we're attempting to re-form the link SS_Resync, // We're trying to resynchronize high level state over the new connection }; diff --git a/src/dlls/mscoree/delayload.cpp b/src/dlls/mscoree/delayload.cpp index 0226f7da2e..8ea2311314 100644 --- a/src/dlls/mscoree/delayload.cpp +++ b/src/dlls/mscoree/delayload.cpp @@ -68,10 +68,10 @@ ExternC extern PfnDliHook __pfnDliNotifyHook = CorDelayLoadHook; extern void DECLSPEC_NORETURN ThrowOutOfMemory(); //***************************************************************************** -// Called for errors that might have occured. +// Called for errors that might have occurred. //***************************************************************************** FARPROC __stdcall CorDelayErrorHook( // Always 0. - unsigned dliNotify, // What event has occured, dli* flag. + unsigned dliNotify, // What event has occurred, dli* flag. DelayLoadInfo *pdli) // Description of the event. { @@ -164,7 +164,7 @@ DWORD _FormatMessage( // How many characters written. // A library failed to load. This is always a bad thing. //***************************************************************************** void _FailLoadLib( - unsigned dliNotify, // What event has occured, dli* flag. + unsigned dliNotify, // What event has occurred, dli* flag. DelayLoadInfo *pdli) // Description of the event. { STATIC_CONTRACT_NOTHROW; @@ -215,7 +215,7 @@ void _FailLoadLib( // A library failed to load. This is always a bad thing. //***************************************************************************** void _FailGetProc( - unsigned dliNotify, // What event has occured, dli* flag. + unsigned dliNotify, // What event has occurred, dli* flag. DelayLoadInfo *pdli) // Description of the event. { STATIC_CONTRACT_NOTHROW; @@ -304,7 +304,7 @@ HMODULE DoPreloadLibraryThrowing(LPCSTR szLibrary) // load event that occurs while the application is running. //***************************************************************************** FARPROC __stdcall CorDelayLoadHook( // Always 0. - unsigned dliNotify, // What event has occured, dli* flag. + unsigned dliNotify, // What event has occurred, dli* flag. DelayLoadInfo *pdli) // Description of the event. { #ifdef _DEBUG diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp index 0c42d721c1..ae12b9f240 100644 --- a/src/gc/gc.cpp +++ b/src/gc/gc.cpp @@ -18911,7 +18911,7 @@ void gc_heap::scan_dependent_handles (int condemned_gen_number, ScanContext *sc, } // Process any mark stack overflow that may have resulted from scanning handles (or if we didn't need to - // scan any handles at all this is the processing of overflows that may have occured prior to this method + // scan any handles at all this is the processing of overflows that may have occurred prior to this method // invocation). process_mark_overflow(condemned_gen_number); } @@ -36204,7 +36204,7 @@ inline void testGCShadow(Object** ptr) // If you get this assertion, someone updated a GC poitner in the heap without // using the write barrier. To find out who, check the value of // dd_collection_count (dynamic_data_of (0)). Also - // note the value of 'ptr'. Rerun the App that the previous GC just occured. + // note the value of 'ptr'. Rerun the App that the previous GC just occurred. // Then put a data breakpoint for the value of 'ptr' Then check every write // to pointer between the two GCs. The last one is not using the write barrier. diff --git a/src/inc/cordebug.idl b/src/inc/cordebug.idl index f5f975bf26..f9017df097 100644 --- a/src/inc/cordebug.idl +++ b/src/inc/cordebug.idl @@ -1474,7 +1474,7 @@ interface ICorDebugManagedCallback2 : IUnknown // Clients should not make any assumption about whether the controller is a process or appdomain (though they can // always QI to find out). // Call continue on this to resume the debuggee. - // - pThread - managed thread on which the debug event occured. If the MDA occurred on an unmanaged thread then + // - pThread - managed thread on which the debug event occurred. If the MDA occurred on an unmanaged thread then // this will be null. Get the OS thread ID from the MDA object itself. // - pMDA is an object containing MDA information. // Suggested usage is that the client does not keep a reference to the MDA object after returning from this callback @@ -2013,7 +2013,7 @@ interface ICorDebugController : IUnknown * will return TRUE if there are currently managed callbacks * queued for any thread. * - * Note that once debug events have been queued, they've already occured, + * Note that once debug events have been queued, they've already occurred, * and so the debugger must drain the entire queue to be sure of the state * of the debuggee. For example, if the queue contains 2 debug events on thread X, * and the debugger suspends thread X after the 1st debug event and then calls continue, @@ -3032,7 +3032,7 @@ interface ICorDebugDebugEvent : IUnknown HRESULT GetEventKind([out]CorDebugDebugEventKind *pDebugEventKind); /* - * Gets the thread on which the event occured + * Gets the thread on which the event occurred */ HRESULT GetThread([out]ICorDebugThread **ppThread); } diff --git a/src/inc/ex.h b/src/inc/ex.h index 644e19eea3..795c353fd8 100644 --- a/src/inc/ex.h +++ b/src/inc/ex.h @@ -62,7 +62,7 @@ inline HRESULT OutOfMemory() */ #define COMPlusThrowNonLocalized(key, msg) throw msg -// Set if fatal error (like stack overflow or out of memory) occured in this process. +// Set if fatal error (like stack overflow or out of memory) occurred in this process. extern HRESULT g_hrFatalError; #endif //CLR_STANDALONE_BINDER @@ -1558,7 +1558,7 @@ inline HRESULT IfTransientFailThrow(HRESULT hr) return hr; } -// Set if fatal error (like stack overflow or out of memory) occured in this process. +// Set if fatal error (like stack overflow or out of memory) occurred in this process. GVAL_DECL(HRESULT, g_hrFatalError); #endif // !CLR_STANDALONE_BINDER diff --git a/src/inc/genericstackprobe.h b/src/inc/genericstackprobe.h index cac6f457b8..4206530518 100644 --- a/src/inc/genericstackprobe.h +++ b/src/inc/genericstackprobe.h @@ -175,7 +175,7 @@ extern void (*g_fpHandleSoftStackOverflow)(BOOL fSkipDebugger); class SOIntolerantTransitionHandler { private: - bool m_exceptionOccured; + bool m_exceptionOccurred; void * m_pPreviousHandler; public: @@ -200,12 +200,12 @@ public: void SetNoException() { - m_exceptionOccured = false; + m_exceptionOccurred = false; } bool DidExceptionOccur() { - return m_exceptionOccured; + return m_exceptionOccurred; } }; @@ -349,7 +349,7 @@ public: unsigned int m_depth; // How deep is this guard in the list of guards for this thread? BOOL m_fProtectedStackPage; // TRUE if we protected a stack page with PAGE_NOACCESS. BOOL m_fEHInProgress; // Is an EH in progress? This is cleared on a catch. - BOOL m_exceptionOccured; // Did an exception occur through this probe? + BOOL m_exceptionOccurred; // Did an exception occur through this probe? protected: BaseStackGuardGeneric() @@ -365,7 +365,7 @@ public: m_eInitialized(cPartialInit), m_fDisabled(FALSE), m_isBoundaryGuard(FALSE), m_fEHInProgress(FALSE), - m_exceptionOccured(FALSE) + m_exceptionOccurred(FALSE) { STATIC_CONTRACT_LEAF; } @@ -407,12 +407,12 @@ public: void SetNoException() { - m_exceptionOccured = FALSE; + m_exceptionOccurred = FALSE; } BOOL DidExceptionOccur() { - return m_exceptionOccured; + return m_exceptionOccurred; } BOOL Enabled() diff --git a/src/inc/shimload.h b/src/inc/shimload.h index 7f51916c33..6df05b5767 100644 --- a/src/inc/shimload.h +++ b/src/inc/shimload.h @@ -18,11 +18,11 @@ #ifndef FEATURE_CORECLR #include <delayimp.h> -extern FARPROC __stdcall ShimDelayLoadHook(unsigned dliNotify, // What event has occured, dli* flag. +extern FARPROC __stdcall ShimDelayLoadHook(unsigned dliNotify, // What event has occurred, dli* flag. DelayLoadInfo *pdli); // Description of the event. //and one for safe mode -extern FARPROC __stdcall ShimSafeModeDelayLoadHook(unsigned dliNotify, // What event has occured, dli* flag. +extern FARPROC __stdcall ShimSafeModeDelayLoadHook(unsigned dliNotify, // What event has occurred, dli* flag. DelayLoadInfo *pdli); // Description of the event. #endif diff --git a/src/md/enc/imptlb.cpp b/src/md/enc/imptlb.cpp index 62eba2c523..30ab319f80 100644 --- a/src/md/enc/imptlb.cpp +++ b/src/md/enc/imptlb.cpp @@ -4169,7 +4169,7 @@ HRESULT CImportTlb::CompareSigsIgnoringRetType( return S_OK; ErrExit: - // An error occured. + // An error occurred. return hr; } // HRESULT CImportTlb::CompareSigsIgnoringRetType() diff --git a/src/mscorlib/src/Microsoft/Win32/RegistryKey.cs b/src/mscorlib/src/Microsoft/Win32/RegistryKey.cs index 028ab19cd8..7a8a446ff3 100644 --- a/src/mscorlib/src/Microsoft/Win32/RegistryKey.cs +++ b/src/mscorlib/src/Microsoft/Win32/RegistryKey.cs @@ -1353,7 +1353,7 @@ namespace Microsoft.Win32 { /** * Retrieves the current state of the dirty property. * - * A key is marked as dirty if any operation has occured that modifies the + * A key is marked as dirty if any operation has occurred that modifies the * contents of the key. * * @return <b>true</b> if the key has been modified. diff --git a/src/mscorlib/src/System/Runtime/InteropServices/CriticalHandle.cs b/src/mscorlib/src/System/Runtime/InteropServices/CriticalHandle.cs index f36ab28d61..9d142b5066 100644 --- a/src/mscorlib/src/System/Runtime/InteropServices/CriticalHandle.cs +++ b/src/mscorlib/src/System/Runtime/InteropServices/CriticalHandle.cs @@ -265,7 +265,7 @@ public abstract class CriticalHandle : CriticalFinalizerObject, IDisposable // that no jit allocations etc. will occur, but don't allocate memory unless // you can deal with the failure and still free the handle). // The boolean returned should be true for success and false if a - // catastrophic error occured and you wish to trigger a diagnostic for + // catastrophic error occurred and you wish to trigger a diagnostic for // debugging purposes (the SafeHandleCriticalFailure MDA). [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] protected abstract bool ReleaseHandle(); diff --git a/src/mscorlib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMarshal.cs b/src/mscorlib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMarshal.cs index dbf1a8a1f1..b59ebb2e62 100644 --- a/src/mscorlib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMarshal.cs +++ b/src/mscorlib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMarshal.cs @@ -1128,7 +1128,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime private static Guid s_iidIErrorInfo = new Guid(0x1CF2B120, 0x547D, 0x101B, 0x8E, 0x65, 0x08, 0x00, 0x2B, 0x2B, 0xD1, 0x19); /// <summary> - /// Report that an exception has occured which went user unhandled. This allows the global error handler + /// Report that an exception has occurred which went user unhandled. This allows the global error handler /// for the application to be invoked to process the error. /// </summary> /// <returns>true if the error was reported, false if not (ie running on Win8)</returns> diff --git a/src/mscorlib/src/System/Security/Cryptography/CapiNative.cs b/src/mscorlib/src/System/Security/Cryptography/CapiNative.cs index 4582653743..d346c0ea11 100644 --- a/src/mscorlib/src/System/Security/Cryptography/CapiNative.cs +++ b/src/mscorlib/src/System/Security/Cryptography/CapiNative.cs @@ -464,7 +464,7 @@ namespace System.Security.Cryptography { // Do the signature verification. A TRUE result means that the signature was valid. A FALSE // result either means an invalid signature or some other error, so we need to check the last - // error to see which occured. + // error to see which occurred. if (UnsafeNativeMethods.CryptVerifySignature(hashHandle, signatureValue, signatureValue.Length, diff --git a/src/mscorlib/src/System/Threading/CancellationTokenRegistration.cs b/src/mscorlib/src/System/Threading/CancellationTokenRegistration.cs index 9ca4157086..3191710fbc 100644 --- a/src/mscorlib/src/System/Threading/CancellationTokenRegistration.cs +++ b/src/mscorlib/src/System/Threading/CancellationTokenRegistration.cs @@ -62,7 +62,7 @@ namespace System.Threading { // Remove the entry from the array. // This call includes a full memory fence which prevents potential reorderings of the reads below - bool deregisterOccured = TryDeregister(); + bool deregisterOccurred = TryDeregister(); // We guarantee that we will not return if the callback is being executed (assuming we are not currently called by the callback itself) // We achieve this by the following rules: @@ -79,7 +79,7 @@ namespace System.Threading var tokenSource = callbackInfo.CancellationTokenSource; if (tokenSource.IsCancellationRequested && //running callbacks has commenced. !tokenSource.IsCancellationCompleted && //running callbacks hasn't finished - !deregisterOccured && //deregistration failed (ie the callback is missing from the list) + !deregisterOccurred && //deregistration failed (ie the callback is missing from the list) tokenSource.ThreadIDExecutingCallbacks != Thread.CurrentThread.ManagedThreadId) //the executingThreadID is not this threadID. { // Callback execution is in progress, the executing thread is different to us and has taken the callback for execution diff --git a/src/mscorlib/src/System/Threading/CancellationTokenSource.cs b/src/mscorlib/src/System/Threading/CancellationTokenSource.cs index 0b09a2e4a4..9adb9976a1 100644 --- a/src/mscorlib/src/System/Threading/CancellationTokenSource.cs +++ b/src/mscorlib/src/System/Threading/CancellationTokenSource.cs @@ -124,7 +124,7 @@ namespace System.Threading } /// <summary> - /// A simple helper to determine whether disposal has occured. + /// A simple helper to determine whether disposal has occurred. /// </summary> internal bool IsDisposed { @@ -1216,7 +1216,7 @@ namespace System.Threading // only removes the item at the specified index if it is still the expected one. // Returns the prevailing value. - // The remove occured successfully if the return value == expected element + // The remove occurred successfully if the return value == expected element // otherwise the remove did not occur. internal T SafeAtomicRemove(int index, T expectedElement) { diff --git a/src/pal/inc/strsafe.h b/src/pal/inc/strsafe.h index 65fb8b7f74..2fcfb0aa67 100644 --- a/src/pal/inc/strsafe.h +++ b/src/pal/inc/strsafe.h @@ -3514,7 +3514,7 @@ Return Value: STRSAFE_E_END_OF_FILE - this return value indicates an error or end-of-file condition, - use feof or ferror to determine which one has occured. + use feof or ferror to determine which one has occurred. STRSAFE_E_INSUFFICIENT_BUFFER / HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER @@ -3625,7 +3625,7 @@ Return Value: STRSAFE_E_END_OF_FILE - this return value indicates an error or end-of-file condition, - use feof or ferror to determine which one has occured. + use feof or ferror to determine which one has occurred. STRSAFE_E_INSUFFICIENT_BUFFER / HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER @@ -3761,7 +3761,7 @@ Return Value: STRSAFE_E_END_OF_FILE - this return value indicates an error or end-of-file condition, - use feof or ferror to determine which one has occured. + use feof or ferror to determine which one has occurred. STRSAFE_E_INSUFFICIENT_BUFFER / HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER @@ -3899,7 +3899,7 @@ Return Value: STRSAFE_E_END_OF_FILE - this return value indicates an error or end-of-file condition, - use feof or ferror to determine which one has occured. + use feof or ferror to determine which one has occurred. STRSAFE_E_INSUFFICIENT_BUFFER / HRESULT_CODE(hr) == ERROR_INSUFFICIENT_BUFFER diff --git a/src/pal/src/cruntime/file.cpp b/src/pal/src/cruntime/file.cpp index cd064af1c3..2ef4ad05bf 100644 --- a/src/pal/src/cruntime/file.cpp +++ b/src/pal/src/cruntime/file.cpp @@ -418,12 +418,12 @@ _wfopen( } else { - ERROR( "An error occured while converting mode to ANSI.\n" ); + ERROR( "An error occurred while converting mode to ANSI.\n" ); } } else { - ERROR( "An error occured while converting" + ERROR( "An error occurred while converting" " fileName to ANSI string.\n" ); } LOGEXIT("_wfopen returning FILE* %p\n", filePtr); diff --git a/src/pal/src/cruntime/path.cpp b/src/pal/src/cruntime/path.cpp index c30ebf484e..d1227dd0dc 100644 --- a/src/pal/src/cruntime/path.cpp +++ b/src/pal/src/cruntime/path.cpp @@ -473,7 +473,7 @@ _wmakepath( if ((dir != NULL) && WideCharToMultiByte( CP_ACP, 0, dir, -1, Dir, _MAX_DIR, NULL, NULL ) == 0 ) { - ASSERT( "An error occured while converting dir to multibyte." + ASSERT( "An error occurred while converting dir to multibyte." "Possible error: Length of dir is greater than _MAX_DIR.\n" ); goto error; } @@ -481,7 +481,7 @@ _wmakepath( if ((fname != NULL) && WideCharToMultiByte( CP_ACP, 0, fname, -1, FileName, _MAX_FNAME, NULL, NULL ) == 0 ) { - ASSERT( "An error occured while converting fname to multibyte." + ASSERT( "An error occurred while converting fname to multibyte." "Possible error: Length of fname is greater than _MAX_FNAME.\n" ); goto error; } @@ -489,7 +489,7 @@ _wmakepath( if ((ext != NULL) && WideCharToMultiByte( CP_ACP, 0, ext, -1, Ext, _MAX_EXT, NULL, NULL ) == 0 ) { - ASSERT( "An error occured while converting ext to multibyte." + ASSERT( "An error occurred while converting ext to multibyte." "Possible error: Length of ext is greater than _MAX_EXT.\n" ); goto error; } @@ -499,7 +499,7 @@ _wmakepath( if ( MultiByteToWideChar( CP_ACP, 0, Path, -1, path, _MAX_PATH ) == 0 ) { - ASSERT( "An error occured while converting the back wide char." + ASSERT( "An error occurred while converting the back wide char." "Possible error: The length of combined path is greater " "than _MAX_PATH.\n" ); goto error; diff --git a/src/pal/src/cruntime/wchar.cpp b/src/pal/src/cruntime/wchar.cpp index 17442d3de8..526a570d1e 100644 --- a/src/pal/src/cruntime/wchar.cpp +++ b/src/pal/src/cruntime/wchar.cpp @@ -1527,7 +1527,7 @@ PAL_wcstod( const wchar_16 * nptr, wchar_16 **endptr ) /* See if strtod failed. */ if ( RetVal == 0.0 && ScanStop == lpStringRep ) { - ASSERT( "An error occured in the conversion.\n" ); + ASSERT( "An error occurred in the conversion.\n" ); lpEndOfExpression = (LPWSTR)nptr; } } diff --git a/src/pal/src/file/path.cpp b/src/pal/src/file/path.cpp index e54f243299..0ad1e62a08 100644 --- a/src/pal/src/file/path.cpp +++ b/src/pal/src/file/path.cpp @@ -580,7 +580,7 @@ GetTempPathW( if ( 0 == MultiByteToWideChar( CP_ACP, 0, TempBuffer, -1, lpBuffer, dwRetVal + 1 ) ) { - ASSERT( "An error occured while converting the string to wide.\n" ); + ASSERT( "An error occurred while converting the string to wide.\n" ); SetLastError( ERROR_INTERNAL_ERROR ); dwRetVal = 0; } diff --git a/src/pal/src/loader/modulename.cpp b/src/pal/src/loader/modulename.cpp index f758003f3a..3c440dc4db 100644 --- a/src/pal/src/loader/modulename.cpp +++ b/src/pal/src/loader/modulename.cpp @@ -155,7 +155,7 @@ Return value: Pointer to string with the fullpath to the librotor_pal.so being used. - NULL if error occured. + NULL if error occurred. Notes: The string returned by this function is owned by the OS. diff --git a/src/pal/src/misc/fmtmessage.cpp b/src/pal/src/misc/fmtmessage.cpp index 97f505ad16..86f91657c7 100644 --- a/src/pal/src/misc/fmtmessage.cpp +++ b/src/pal/src/misc/fmtmessage.cpp @@ -689,7 +689,7 @@ exit: /* Function clean-up and exit. */ LocalFree( lpReturnString ); } } - else /* Error, something occured. */ + else /* Error, something occurred. */ { if ( lpReturnString ) { diff --git a/src/pal/tests/palsuite/DisabledTests.txt b/src/pal/tests/palsuite/DisabledTests.txt index 0d9e5edcf5..12bee55c8a 100644 --- a/src/pal/tests/palsuite/DisabledTests.txt +++ b/src/pal/tests/palsuite/DisabledTests.txt @@ -172,17 +172,17 @@ networking/gethostbyaddr/gethostbyaddr_neg2 ======================================= This test case is written according to the MSDN doc: testing gethostbyaddr with an invalid type, an error WSAEAFNOSUPPORT is expected, the test result is: -no error occured with PAL library. -no error occured with win32 base library. +no error occurred with PAL library. +no error occurred with win32 base library. networking/gethostbyaddr/gethostbyaddr_neg3 ======================================= This test case is written according to the MSDN doc: testing gethostbyaddr with a small len parameter, an error WSAEFAULT is expected, the test result is: -no error occured with PAL library +no error occurred with PAL library and correct hostent struct data is retrieved -no error occured with win32 base library +no error occurred with win32 base library and correct hostent struct data is retrieved @@ -192,9 +192,9 @@ This test case is written according to the MSDN doc: testing closesocket to close a non-blocking stream socket with SO_LINGER setting to a nonzero time-out value, an error WSAEWOULDBLOCK is expected, the test result is: -no error occured with PAL library +no error occurred with PAL library -no error occured with win32 base library +no error occurred with win32 base library networking/send_recv/recv_neg7 diff --git a/src/pal/tests/palsuite/c_runtime/ferror/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/ferror/test1/testinfo.dat index e102e4fd7f..fa9bff3d32 100644 --- a/src/pal/tests/palsuite/c_runtime/ferror/test1/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/ferror/test1/testinfo.dat @@ -11,6 +11,6 @@ EXE1 = test1 Description = Tests the PAL implementation of the ferror function. = Open a file, and read some characters. Check that ferror states that -= no error has occured. Then close the file pointer. Attempt to read += no error has occurred. Then close the file pointer. Attempt to read = some more. Check ferror now, and it should indicate that an error has -= occured. += occurred. diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/sscanf.h b/src/pal/tests/palsuite/c_runtime/sscanf/sscanf.h index 5e6ec00ffa..1e76829f29 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf/sscanf.h +++ b/src/pal/tests/palsuite/c_runtime/sscanf/sscanf.h @@ -169,7 +169,7 @@ void DoCharTest(char *inputstr, char *formatstr, char* checkchars, int numchars) if (buf[numchars] != (char)-1) { - Fail("ERROR: overflow occured in scanning character(s) from \"%s\" " + Fail("ERROR: overflow occurred in scanning character(s) from \"%s\" " "using \"%s\".\nExpected %d character(s)\n", inputstr, formatstr, numchars); } @@ -202,7 +202,7 @@ void DoWCharTest(char *inputstr, char *formatstr, WCHAR* checkchars, int numchar if (buf[numchars] != (WCHAR)-1) { - Fail("ERROR: overflow occured in scanning wide character(s) from \"%s\" " + Fail("ERROR: overflow occurred in scanning wide character(s) from \"%s\" " "using \"%s\".\nExpected %d character(s)\n", inputstr, formatstr, numchars); } @@ -237,7 +237,7 @@ void DoFloatTest(char *inputstr, char *formatstr, float checkval) if (buf[4] != (char)-1) { - Fail("ERROR: overflow occured in scanning float from \"%s\" " + Fail("ERROR: overflow occurred in scanning float from \"%s\" " "using \"%s\".\n", inputstr, formatstr); } diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h b/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h index 3848feeb1d..2801e8e86f 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h +++ b/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h @@ -182,7 +182,7 @@ void DoCharTest(WCHAR *inputstr, WCHAR*formatstr, char* checkchars, int numchars if (buf[numchars] != (char)-1) { - Fail("ERROR: overflow occured in scanning character(s) from \"%s\" " + Fail("ERROR: overflow occurred in scanning character(s) from \"%s\" " "using \"%s\".\nExpected %d character(s)\n", convertC(inputstr), convertC(formatstr), numchars); } @@ -217,7 +217,7 @@ void DoWCharTest(WCHAR *inputstr, WCHAR *formatstr, WCHAR *checkchars, int numch if (buf[numchars] != (WCHAR)-1) { - Fail("ERROR: overflow occured in scanning wide character(s) from \"%s\" " + Fail("ERROR: overflow occurred in scanning wide character(s) from \"%s\" " "using \"%s\".\nExpected %d character(s)\n", convertC(inputstr), convertC(formatstr), numchars); } @@ -253,7 +253,7 @@ void DoFloatTest(WCHAR *inputstr, WCHAR *formatstr, float checkval) if (buf[4] != (char)-1) { - Fail("ERROR: overflow occured in scanning float from \"%s\" " + Fail("ERROR: overflow occurred in scanning float from \"%s\" " "using \"%s\".\n", convertC(inputstr), convertC(formatstr)); } diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.c index 843ff6cb9d..cbcf994997 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.c +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.c @@ -67,7 +67,7 @@ int __cdecl main(int argc, char *argv[]) if(NULL != FileMappingHandle || ERROR_FILE_INVALID != GetLastError()) - {//no error occured + {//no error occurred Trace("\nFailed to call CreateFileMapping API for a negative test!\n"); err = CloseHandle(FileHandle); if(0 == err) diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.c index 4375b70f5c..c2a1ed284a 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.c +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.c @@ -52,7 +52,7 @@ int __cdecl main(int argc, char *argv[]) { /* Exchanged, these should be equal now */ if(BaseVariableToManipulate != ValueToExchange) { - Fail("ERROR: A successful compare and exchange should have occured, " + Fail("ERROR: A successful compare and exchange should have occurred, " "making the variable have the value of %d, as opposed to the " "current value of %d.", ValueToExchange,BaseVariableToManipulate); diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.c index 128af1a984..2fa6e3232f 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.c +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.c @@ -57,12 +57,12 @@ int __cdecl main(int argc, char *argv[]) { if(BaseVariableToManipulate != ValueToExchange) { #ifdef PLATFORM_UNIX - Fail("ERROR: A successful compare and exchange should have occured, " + Fail("ERROR: A successful compare and exchange should have occurred, " "making the variable have the value of %ll, as opposed to the " "current value of %ll.", ValueToExchange,BaseVariableToManipulate); #else - Fail("ERROR: A successful compare and exchange should have occured, " + Fail("ERROR: A successful compare and exchange should have occurred, " "making the variable have the value of %I64, as opposed to the " "current value of %d.", ValueToExchange,BaseVariableToManipulate); diff --git a/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.c b/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.c index 7e86ee182c..a5bf030144 100644 --- a/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.c +++ b/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.c @@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[]) if( NULL != pFile ) { Trace("\nFailed to call fopen to open a not exist for reading, " - "an error is expected, but no error occured\n"); + "an error is expected, but no error occurred\n"); if( EOF == fclose( pFile ) ) { diff --git a/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.c b/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.c index a22d08c1c8..1af4f07935 100644 --- a/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.c +++ b/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.c @@ -66,7 +66,7 @@ BOOL ResumeThreadTest() else { /* Check to ensure the parameter hasn't changed. The - function shouldn't have occured yet. + function shouldn't have occurred yet. */ if (dwResumeThreadTestParameter != 0) { diff --git a/src/tools/util/consoleargs.cpp b/src/tools/util/consoleargs.cpp index 1473206721..e2529e9b5d 100644 --- a/src/tools/util/consoleargs.cpp +++ b/src/tools/util/consoleargs.cpp @@ -373,7 +373,7 @@ void ConsoleArgs::SetErrorMessage(__in LPCWSTR pwzMessage) { delete[] m_lastErrorMessage; } - m_errorOccured = true; + m_errorOccurred = true; m_lastErrorMessage = new WCHAR[wcslen(pwzMessage) + 1]; if (m_lastErrorMessage == nullptr) { @@ -709,7 +709,7 @@ bool ConsoleArgs::ExpandResponseFiles(__in int argc, __deref_in_ecount(argc) con // Process Response Files ProcessResponseArgs(); - if (m_errorOccured) + if (m_errorOccurred) return false; // Now convert to an argc/argv form for remaining processing. @@ -739,7 +739,7 @@ bool ConsoleArgs::ExpandResponseFiles(__in int argc, __deref_in_ecount(argc) con *pargc2 = newArgc; *pppargv2 = m_rgArgs; - return !m_errorOccured; + return !m_errorOccurred; } // @@ -885,7 +885,7 @@ void ConsoleArgs::ProcessResponseArgs() WCHAR szFilename[MAX_LONGPATH]; for (WStrList * listCurArg = m_listArgs; - listCurArg != NULL && !m_errorOccured; + listCurArg != NULL && !m_errorOccurred; listCurArg = listCurArg->next) { WCHAR * szArg = listCurArg->arg; diff --git a/src/tools/util/consoleargs.h b/src/tools/util/consoleargs.h index ed4a85659e..f59ace5d37 100644 --- a/src/tools/util/consoleargs.h +++ b/src/tools/util/consoleargs.h @@ -26,7 +26,7 @@ public: ConsoleArgs() : m_rgArgs(NULL), m_listArgs(NULL), - m_errorOccured(false), + m_errorOccurred(false), m_lastErrorMessage(nullptr) { }; @@ -44,7 +44,7 @@ public: LPCWSTR ErrorMessage() { - if (m_errorOccured) + if (m_errorOccurred) { return m_lastErrorMessage; } @@ -66,7 +66,7 @@ private: LPWSTR * m_rgArgs; WStrList * m_listArgs; - bool m_errorOccured; + bool m_errorOccurred; LPCWSTR m_lastErrorMessage; }; diff --git a/src/utilcode/ex.cpp b/src/utilcode/ex.cpp index 1fd997fd60..d3e0393a16 100644 --- a/src/utilcode/ex.cpp +++ b/src/utilcode/ex.cpp @@ -25,7 +25,7 @@ #define MAX_EXCEPTION_MSG 200 -// Set if fatal error (like stack overflow or out of memory) occured in this process. +// Set if fatal error (like stack overflow or out of memory) occurred in this process. GVAL_IMPL_INIT(HRESULT, g_hrFatalError, S_OK); // Helper function to get an exception object from outside the exception. In diff --git a/src/utilcode/genericstackprobe.cpp b/src/utilcode/genericstackprobe.cpp index 23e7726a8f..383453751e 100644 --- a/src/utilcode/genericstackprobe.cpp +++ b/src/utilcode/genericstackprobe.cpp @@ -72,7 +72,7 @@ void HandleStackOverflowAfterCatch() NOINLINE void SOIntolerantTransitionHandler::CtorImpl() { - m_exceptionOccured = true; + m_exceptionOccurred = true; m_pPreviousHandler = ClrFlsGetValue(TlsIdx_SOIntolerantTransitionHandler); g_fpSetSOIntolerantTransitionMarker(); } @@ -84,7 +84,7 @@ NOINLINE void SOIntolerantTransitionHandler::DtorImpl() // limit. Checking for the guard page being present is too much overhead during // exception handling (if you can believe that) and impacts perf. - if (m_exceptionOccured) + if (m_exceptionOccurred) { g_fpCheckForSOInSOIntolerantCode(); } diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index aed588c61d..8327adf243 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -8014,7 +8014,7 @@ BOOL AppDomain::AddAssemblyToCache(AssemblySpec* pSpec, DomainAssembly *pAssembl // check for context propagation if (bRetVal && pSpec->GetParentLoadContext() == LOADCTX_TYPE_LOADFROM && pAssembly->GetFile()->GetLoadContext() == LOADCTX_TYPE_DEFAULT) { - // LoadFrom propagation occured, store it in a way reachable by Load() (the "post-policy" one) + // LoadFrom propagation occurred, store it in a way reachable by Load() (the "post-policy" one) AssemblySpec loadSpec; loadSpec.CopyFrom(pSpec); loadSpec.SetParentAssembly(NULL); diff --git a/src/vm/clsload.cpp b/src/vm/clsload.cpp index 2798ce2c77..145da42e6e 100644 --- a/src/vm/clsload.cpp +++ b/src/vm/clsload.cpp @@ -5078,7 +5078,7 @@ void AccessCheckOptions::ThrowAccessException( // If the caller and target method are non-null and the same, then this means that we're checking to see // if the method has access to itself in order to validate that it has access to its parameter types, // containing type, and return type. In this case, throw a more informative TypeAccessException to - // describe the error that occured (for instance, "this method doesn't have access to one of its + // describe the error that occurred (for instance, "this method doesn't have access to one of its // parameter types", rather than "this method doesn't have access to itself"). // We only want to do this if we know the exact type that caused the problem, otherwise fall back to // throwing the standard MethodAccessException. diff --git a/src/vm/domainfile.h b/src/vm/domainfile.h index f55f9fa009..c6e4cdd473 100644 --- a/src/vm/domainfile.h +++ b/src/vm/domainfile.h @@ -254,7 +254,7 @@ class DomainFile // Throws if a load error has occurred void ThrowIfError(FileLoadLevel targetLevel) DAC_EMPTY(); - // Checks that a load error has not occured before the given level + // Checks that a load error has not occurred before the given level CHECK CheckNoError(FileLoadLevel targetLevel) DAC_EMPTY_RET(CHECK::OK()); // IsNotified means that the profiler API notification has been delivered diff --git a/src/vm/dwreport.cpp b/src/vm/dwreport.cpp index 9fe8ca76be..115b422952 100644 --- a/src/vm/dwreport.cpp +++ b/src/vm/dwreport.cpp @@ -1873,7 +1873,7 @@ HRESULT GetManagedBucketParametersForIp( // probably inside of mscorwks // // Note that while there may be an actual managed exception that - // occured, we can live without the managed bucket parameters. For + // occurred, we can live without the managed bucket parameters. For // exceptions coming from within mscorwks.dll, the native bucket // parameters will do just fine. diff --git a/src/vm/excep.cpp b/src/vm/excep.cpp index 2bad8d7729..5847fc45ef 100644 --- a/src/vm/excep.cpp +++ b/src/vm/excep.cpp @@ -105,11 +105,11 @@ BOOL IsExceptionFromManagedCode(const EXCEPTION_RECORD * pExceptionRecord) UINT_PTR address = reinterpret_cast<UINT_PTR>(pExceptionRecord->ExceptionAddress); // An exception code of EXCEPTION_COMPLUS indicates a managed exception - // has occured (most likely due to executing a "throw" instruction). + // has occurred (most likely due to executing a "throw" instruction). // // Also, a hardware level exception may not have an exception code of // EXCEPTION_COMPLUS. In this case, an exception address that resides in - // managed code indicates a managed exception has occured. + // managed code indicates a managed exception has occurred. return (IsComPlusException(pExceptionRecord) || (ExecutionManager::IsManagedCode((PCODE)address))); } @@ -5206,7 +5206,7 @@ LONG InternalUnhandledExceptionFilter_Worker( // // This needs to be done before the check for TSNC_ProcessedUnhandledException because it is perfectly // legitimate (though rare) for the debugger to be inspecting exceptions which are nested in finally - // clauses that run after an unhandled exception has already occured on the thread + // clauses that run after an unhandled exception has already occurred on the thread if ((pThread != NULL) && pThread->IsExceptionInProgress()) { LOG((LF_EH, LL_INFO1000, "InternalUnhandledExceptionFilter_Worker: Set unhandled exception flag at %p\n", @@ -7054,7 +7054,7 @@ LONG FilterAccessViolation(PEXCEPTION_POINTERS pExceptionPointers, LPVOID lpvPar * Returns whether this is an exception the EE knows how to intercept and continue from. * * Parameters: - * pThread - The thread the exception occured on. + * pThread - The thread the exception occurred on. * * Returns: * TRUE if the exception on the thread is interceptable or not. @@ -7182,7 +7182,7 @@ IsDebuggerFault(EXCEPTION_RECORD *pExceptionRecord, // to fixup the state before any other part of the system uses it (we do it here since only the debugger // uses single step functionality). - // First ask the emulation itself whether this exception occured while single stepping was enabled. If so + // First ask the emulation itself whether this exception occurred while single stepping was enabled. If so // it will fix up the context to be consistent again and return true. If so and the exception was // EXCEPTION_BREAKPOINT then we translate it to EXCEPTION_SINGLE_STEP (otherwise we leave it be, e.g. the // instruction stepped caused an access violation). since this is called from our VEH there might not @@ -7704,7 +7704,7 @@ LONG WINAPI CLRVectoredExceptionHandler(PEXCEPTION_POINTERS pExceptionInfo) // not already have one allocated. Thus, if we OOM during the setting up of the // thread, the log buffer will not be allocated and this will try to do so. Thus, // all STRESS_LOGs in here need to be after you have guaranteed the allocation has - // already occured. + // already occurred. // Thread *pThread; @@ -7808,7 +7808,7 @@ LONG WINAPI CLRVectoredExceptionHandlerPhase2(PEXCEPTION_POINTERS pExceptionInfo // not already have one allocated. Thus, if we OOM during the setting up of the // thread, the log buffer will not be allocated and this will try to do so. Thus, // all STRESS_LOGs in here need to be after you have guaranteed the allocation has - // already occured. + // already occurred. // PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord; @@ -7989,7 +7989,7 @@ VEH_ACTION WINAPI CLRVectoredExceptionHandlerPhase3(PEXCEPTION_POINTERS pExcepti // not already have one allocated. Thus, if we OOM during the setting up of the // thread, the log buffer will not be allocated and this will try to do so. Thus, // all STRESS_LOGs in here need to be after you have guaranteed the allocation has - // already occured. + // already occurred. // // Handle special cases which are common amongst all filters. @@ -13828,7 +13828,7 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrowSO() if (breakOnSO != 0) { - _ASSERTE(!"SO occured"); + _ASSERTE(!"SO occurred"); } #endif diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index 42f5fa582c..4818fe27ae 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -788,7 +788,7 @@ ProcessCLRException(IN PEXCEPTION_RECORD pExceptionRecord // relies on transition frame, we still cannot let an exception be handled // by an unprotected managed frame. // - // This code below checks to see if a SO has occured outside of managed code. + // This code below checks to see if a SO has occurred outside of managed code. // If it has, and if we don't have a transition frame higher up the stack, then // we don't handle the SO. if (!(dwExceptionFlags & EXCEPTION_UNWINDING)) diff --git a/src/vm/exinfo.h b/src/vm/exinfo.h index 73f8c1205c..328a3d7e3a 100644 --- a/src/vm/exinfo.h +++ b/src/vm/exinfo.h @@ -57,7 +57,7 @@ public: // Reference to the topmost handler we saw during an SO that goes past us PTR_EXCEPTION_REGISTRATION_RECORD m_pTopMostHandlerDuringSO; - LPVOID m_dEsp; // Esp when fault occured, OR esp to restore on endcatch + LPVOID m_dEsp; // Esp when fault occurred, OR esp to restore on endcatch StackTraceInfo m_StackTraceInfo; diff --git a/src/vm/frames.h b/src/vm/frames.h index dcaa4403ff..32bd3188af 100644 --- a/src/vm/frames.h +++ b/src/vm/frames.h @@ -431,7 +431,7 @@ public: FRAME_ATTR_OUT_OF_LINE = 2, // The exception out of line (IP of the frame is not correct) FRAME_ATTR_FAULTED = 4, // Exception caused by Win32 fault FRAME_ATTR_RESUMABLE = 8, // We may resume from this frame - FRAME_ATTR_CAPTURE_DEPTH_2 = 0x10, // This is a helperMethodFrame and the capture occured at depth 2 + FRAME_ATTR_CAPTURE_DEPTH_2 = 0x10, // This is a helperMethodFrame and the capture occurred at depth 2 FRAME_ATTR_EXACT_DEPTH = 0x20, // This is a helperMethodFrame and a jit helper, but only crawl to the given depth FRAME_ATTR_NO_THREAD_ABORT = 0x40, // This is a helperMethodFrame that should not trigger thread aborts on entry }; diff --git a/src/vm/i386/excepx86.cpp b/src/vm/i386/excepx86.cpp index 7de7b43e0d..cda353c62f 100644 --- a/src/vm/i386/excepx86.cpp +++ b/src/vm/i386/excepx86.cpp @@ -322,7 +322,7 @@ void VerifyValidTransitionFromManagedCode(Thread *pThread, CrawlFrame *pCF) "setting up the proper exception handling.\n\n" "Get a good unmanaged stack trace for this thread. All FS:0 records are on the stack, " "so you can see who installed the last handler. Somewhere between that function and " - "where the thread is now is where the bad transition occured.\n\n" + "where the thread is now is where the bad transition occurred.\n\n" "A little extra info: FS:0 = 0x%p, pEHR->Handler = 0x%p\n", GetRegdisplaySP(pCF->GetRegisterSet()), pFunction ->m_pszDebugClassName, @@ -1375,7 +1375,7 @@ CPFH_FirstPassHandler(EXCEPTION_RECORD *pExceptionRecord, { // If we ever get here in preemptive mode, we're in trouble. We've // changed the thread's IP to point at a little function that throws ... if - // the thread were to be in preemptive mode and a GC occured, the stack + // the thread were to be in preemptive mode and a GC occurred, the stack // crawl would have been all messed up (becuase we have no frame that points // us back to the right place in managed code). _ASSERTE(disabled); diff --git a/src/vm/interoputil.cpp b/src/vm/interoputil.cpp index 4d198a5c0f..945707f27f 100644 --- a/src/vm/interoputil.cpp +++ b/src/vm/interoputil.cpp @@ -1446,7 +1446,7 @@ void SafeRelease_OnException(IUnknown* pUnk, RCW* pRCW #endif // MDA_SUPPORTED #ifdef FEATURE_COMINTEROP - LogInterop(W("An exception occured during release")); + LogInterop(W("An exception occurred during release")); LogInteropLeak(pUnk); #endif // FEATURE_COMINTEROP diff --git a/src/vm/jitinterface.cpp b/src/vm/jitinterface.cpp index 6c6692e6fe..fae4cce8f8 100644 --- a/src/vm/jitinterface.cpp +++ b/src/vm/jitinterface.cpp @@ -10231,7 +10231,7 @@ int CEEInfo::FilterException(struct _EXCEPTION_POINTERS *pExceptionPointers) { _ASSERTE(!"Access violation while Jitting!"); // If you set the debugger to catch access violations and 'go' - // you will get back to the point at which the access violation occured + // you will get back to the point at which the access violation occurred result = EXCEPTION_CONTINUE_EXECUTION; } else diff --git a/src/vm/mdaBoilerplate.exe.mda.config b/src/vm/mdaBoilerplate.exe.mda.config index 2906d788dd..1cbd20037e 100644 --- a/src/vm/mdaBoilerplate.exe.mda.config +++ b/src/vm/mdaBoilerplate.exe.mda.config @@ -739,7 +739,7 @@ ACTIVATION\REPORTING SCENARIOS: in SafeHandle cleanup. CAUSE: - An unexpected error occured while cleaning up temporary structures. Review all SafeHandle destructor / finalizer implementations and + An unexpected error occurred while cleaning up temporary structures. Review all SafeHandle destructor / finalizer implementations and custom-marshaler implementations for errors. OUTPUT: diff --git a/src/vm/object.cpp b/src/vm/object.cpp index 648cbf99b5..3b07a12543 100644 --- a/src/vm/object.cpp +++ b/src/vm/object.cpp @@ -2681,7 +2681,7 @@ int OBJECTREF::operator==(const OBJECTREF &objref) const _ASSERTE(Thread::IsObjRefValid(&objref)); VALIDATEOBJECT(m_asObj); // If this assert fires, you probably did not protect - // your OBJECTREF and a GC might have occured. To + // your OBJECTREF and a GC might have occurred. To // where the possible GC was, set a breakpoint in Thread::TriggersGC _ASSERTE(Thread::IsObjRefValid(this)); @@ -2719,7 +2719,7 @@ int OBJECTREF::operator!=(const OBJECTREF &objref) const _ASSERTE(Thread::IsObjRefValid(&objref)); VALIDATEOBJECT(m_asObj); // If this assert fires, you probably did not protect - // your OBJECTREF and a GC might have occured. To + // your OBJECTREF and a GC might have occurred. To // where the possible GC was, set a breakpoint in Thread::TriggersGC _ASSERTE(Thread::IsObjRefValid(this)); @@ -2743,7 +2743,7 @@ Object* OBJECTREF::operator->() VALIDATEOBJECT(m_asObj); // If this assert fires, you probably did not protect - // your OBJECTREF and a GC might have occured. To + // your OBJECTREF and a GC might have occurred. To // where the possible GC was, set a breakpoint in Thread::TriggersGC _ASSERTE(Thread::IsObjRefValid(this)); @@ -2768,7 +2768,7 @@ const Object* OBJECTREF::operator->() const VALIDATEOBJECT(m_asObj); // If this assert fires, you probably did not protect - // your OBJECTREF and a GC might have occured. To + // your OBJECTREF and a GC might have occurred. To // where the possible GC was, set a breakpoint in Thread::TriggersGC _ASSERTE(Thread::IsObjRefValid(this)); diff --git a/src/vm/objectclone.cpp b/src/vm/objectclone.cpp index 43ce79f497..51a7308215 100644 --- a/src/vm/objectclone.cpp +++ b/src/vm/objectclone.cpp @@ -2190,7 +2190,7 @@ DWORD ObjectClone::CloneField(FieldDesc *pSrcField, FieldDesc *pDstField) STRINGREF refStr = (STRINGREF) *pSrc; refStr = m_cbInterface->AllocateString(refStr); - // Get dest addr again, as a GC might have occured + // Get dest addr again, as a GC might have occurred pDest = (OBJECTREF *)(m_newObject->GetData() + dstOffset); _ASSERTE(GetAppDomain()==m_toDomain); SetObjectReference(pDest, refStr, GetAppDomain()); diff --git a/src/vm/reflectioninvocation.cpp b/src/vm/reflectioninvocation.cpp index da0f51c7ce..777b120ad4 100644 --- a/src/vm/reflectioninvocation.cpp +++ b/src/vm/reflectioninvocation.cpp @@ -2732,7 +2732,7 @@ LONG SODetectionFilter(EXCEPTION_POINTERS *ep, void* pv) return EXCEPTION_CONTINUE_EXECUTION; } - // Record the fact that an exception occured while running the try code. + // Record the fact that an exception occurred while running the try code. ECWGC_Param *pParam= (ECWGC_Param *)pv; pParam->fExceptionThrownInTryCode = TRUE; @@ -2832,7 +2832,7 @@ void ExecuteCodeWithGuaranteedCleanupHelper (ECWGC_GC *gc) // ExecuteCodeWithGuaranteedCleanup ensures that we will call the backout code delegate even if an SO occurs. We do this by calling the // try delegate from within an EX_TRY/EX_CATCH block that will catch any thrown exceptions and thus cause the stack to be unwound. This // guarantees that the backout delegate is called with at least DEFAULT_ENTRY_PROBE_SIZE pages of stack. After the backout delegate is called, -// we re-raise any exceptions that occured inside the try delegate. Note that any CER that uses large or arbitraty amounts of stack in +// we re-raise any exceptions that occurred inside the try delegate. Note that any CER that uses large or arbitraty amounts of stack in // it's try block must use ExecuteCodeWithGuaranteedCleanup. // // ExecuteCodeWithGuaranteedCleanup also guarantees that the backount code will be run before any filters higher up on the stack. This diff --git a/src/vm/rejit.cpp b/src/vm/rejit.cpp index 0233da062e..0e2a0d3495 100644 --- a/src/vm/rejit.cpp +++ b/src/vm/rejit.cpp @@ -607,7 +607,7 @@ HRESULT ReJitManager::RequestReJIT( // later when the runtime is suspended. // //BUGBUG: Its not clear to me why it is safe to hold ReJitInfo* lists - // outside the table locks. If an AppDomain unload occured I don't see anything + // outside the table locks. If an AppDomain unload occurred I don't see anything // that prevents them from being deleted. If this is a bug it is a pre-existing // condition and nobody has reported it as an issue yet. AppDomainExit probably // needs to synchronize with something. @@ -2991,7 +2991,7 @@ HRESULT ReJitManager::GetReJITIDs(PTR_MethodDesc pMD, ULONG cReJitIds, ULONG * p // * methodDef - The MethodDef in the module/MethodDef identifier pair for the method which // had an error during rejit // * pMD - If available, the specific method instance which had an error during rejit -// * hrStatus - HRESULT for the rejit error that occured +// * hrStatus - HRESULT for the rejit error that occurred // * pErrors - the list of error records that this method will append to // // Return Value: @@ -3028,7 +3028,7 @@ HRESULT ReJitManager::AddReJITError(Module* pModule, mdMethodDef methodDef, Meth // // Arguments: // * pReJitInfo - The method which had an error during rejit -// * hrStatus - HRESULT for the rejit error that occured +// * hrStatus - HRESULT for the rejit error that occurred // * pErrors - the list of error records that this method will append to // // Return Value: @@ -3863,7 +3863,7 @@ ReJitPublishMethodHolder::~ReJitPublishMethodHolder() // This method can't have a contract because leaving the table lock // below decrements GCNoTrigger count. Contracts always revert these changes // at the end of the method but we need the decremented count to flow out of the - // method. The balancing increment occured in the constructor. + // method. The balancing increment occurred in the constructor. STATIC_CONTRACT_NOTHROW; STATIC_CONTRACT_GC_TRIGGERS; // NOTRIGGER until we leave the lock STATIC_CONTRACT_CAN_TAKE_LOCK; @@ -3932,7 +3932,7 @@ ReJitPublishMethodTableHolder::~ReJitPublishMethodTableHolder() // This method can't have a contract because leaving the table lock // below decrements GCNoTrigger count. Contracts always revert these changes // at the end of the method but we need the decremented count to flow out of the - // method. The balancing increment occured in the constructor. + // method. The balancing increment occurred in the constructor. STATIC_CONTRACT_NOTHROW; STATIC_CONTRACT_GC_TRIGGERS; // NOTRIGGER until we leave the lock STATIC_CONTRACT_CAN_TAKE_LOCK; diff --git a/src/vm/stackingallocator.cpp b/src/vm/stackingallocator.cpp index 24b8763262..ba23c51464 100644 --- a/src/vm/stackingallocator.cpp +++ b/src/vm/stackingallocator.cpp @@ -334,7 +334,7 @@ void * __cdecl operator new[](size_t n, StackingAllocator * alloc) // size_t's too big on 64-bit platforms so we check for overflow if(n > (size_t)(1<<31)) ThrowOutOfMemory(); #else - if(n == (size_t)-1) ThrowOutOfMemory(); // overflow occured + if(n == (size_t)-1) ThrowOutOfMemory(); // overflow occurred #endif void *retval = alloc->UnsafeAllocNoThrow((unsigned)n); @@ -368,7 +368,7 @@ void * __cdecl operator new[](size_t n, StackingAllocator * alloc, const NoThrow // size_t's too big on 64-bit platforms so we check for overflow if(n > (size_t)(1<<31)) return NULL; #else - if(n == (size_t)-1) return NULL; // overflow occured + if(n == (size_t)-1) return NULL; // overflow occurred #endif return alloc->UnsafeAllocNoThrow((unsigned)n); diff --git a/src/vm/stackprobe.cpp b/src/vm/stackprobe.cpp index 201c12c855..8e16963689 100644 --- a/src/vm/stackprobe.cpp +++ b/src/vm/stackprobe.cpp @@ -150,7 +150,7 @@ void ReportStackOverflow() // We should only ever get in this situation on a probe from managed code. From within the EE, // we will never let our probe point get this close. Either way, we'd rip the process if a hard - // SO occured. + // SO occurred. UINT_PTR stackGuarantee = pThread->GetStackGuarantee(); @@ -1005,8 +1005,8 @@ BOOL BaseStackGuard::RequiresNStackPagesInternal(unsigned int n, BOOL fThrowOnSO BOOL fRet; - // Temporarily initialize the exception occured flag - m_exceptionOccured = FALSE; + // Temporarily initialize the exception occurred flag + m_exceptionOccurred = FALSE; // Code below checks if there's a Thread, and exits immediately if not. // So the rest of the function rightly assumes there is a Thread @@ -1181,8 +1181,8 @@ BOOL BaseStackGuard::DoProbe(unsigned int n, BOOL fThrowOnSO) // Mark that we're initialized (and didn't get interupted from an exception) m_eInitialized = cInit; - // Initialize the exception occured flag - m_exceptionOccured = TRUE; + // Initialize the exception occurred flag + m_exceptionOccurred = TRUE; // setup flag to tell if we're unwinding due to an exception m_fEHInProgress = FALSE; @@ -1269,7 +1269,7 @@ void BaseStackGuard::CheckStack() // if we aren't being unwound during EH, then we shouldn't have our EHInProgress bit set. That // means we caught the exception in the EE and didn't call RestoreGuard or we missed a SO-tolerant - // transition out of the EE and the exception occured above us. + // transition out of the EE and the exception occurred above us. _ASSERTE(m_fEHInProgress == FALSE); // we should only ever be popping ourselves if we are not on the EH unwind path @@ -1617,7 +1617,7 @@ DEBUG_NOINLINE void BoundaryStackGuard::Push() m_eInitialized = cInit; // setup flag to tell if we're unwinding due to an exception - m_exceptionOccured = TRUE; + m_exceptionOccurred = TRUE; SetCurrentGuard(this); } @@ -1699,7 +1699,7 @@ BOOL IsBackoutCalledForEH(BYTE *origSP, // Caveats: // // 1) If there is less than a context on the stack on the EH path, we will miss the fact that - // an exception occured + // an exception occurred // // 2) If the CRT uses near the size of a context before calling the destructor in the normal case, // we will assume we've got an exception and ASSERT. @@ -1746,7 +1746,7 @@ DebugSOIntolerantTransitionHandlerBeginOnly::~DebugSOIntolerantTransitionHandler // Caveats: // // 1) If there is less than a context on the stack on the EH path, we will miss the fact that - // an exception occured + // an exception occurred // // 2) If the CRT uses near the size of a context before calling the destructor in the normal case, // we will assume we've got an exception and ASSERT. diff --git a/src/vm/threads.cpp b/src/vm/threads.cpp index e90a220c64..065c396929 100644 --- a/src/vm/threads.cpp +++ b/src/vm/threads.cpp @@ -4903,7 +4903,7 @@ BOOL Thread::Block(INT32 timeOut, PendingSync *syncState) } -// Return whether or not a timeout occured. TRUE=>we waited successfully +// Return whether or not a timeout occurred. TRUE=>we waited successfully DWORD Thread::Wait(HANDLE *objs, int cntObjs, INT32 timeOut, PendingSync *syncInfo) { WRAPPER_NO_CONTRACT; @@ -4928,7 +4928,7 @@ DWORD Thread::Wait(HANDLE *objs, int cntObjs, INT32 timeOut, PendingSync *syncIn return dwResult; } -// Return whether or not a timeout occured. TRUE=>we waited successfully +// Return whether or not a timeout occurred. TRUE=>we waited successfully DWORD Thread::Wait(CLREvent *pEvent, INT32 timeOut, PendingSync *syncInfo) { WRAPPER_NO_CONTRACT; diff --git a/src/vm/util.hpp b/src/vm/util.hpp index 0b5cf5fe85..b444357124 100644 --- a/src/vm/util.hpp +++ b/src/vm/util.hpp @@ -357,7 +357,7 @@ HRESULT VMPostError( // Returned error. ...); // Error arguments. //===================================================================== -// Displays the messaage box or logs the message, corresponding to the last COM+ error occured +// Displays the messaage box or logs the message, corresponding to the last COM+ error occurred void VMDumpCOMErrors(HRESULT hrErr); HRESULT LoadMscorsn(); diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.cs b/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.cs index eda345049a..36362f7c3c 100644 --- a/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.cs +++ b/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.cs @@ -33,7 +33,7 @@ public class TestClass } catch (ApplicationException) //This is the expected behavior. { - Console.WriteLine("correct exception occured."); + Console.WriteLine("correct exception occurred."); } catch (Exception e) { |