diff options
346 files changed, 1196 insertions, 1245 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index dc0f12a0a86..436beacbff7 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -34,9 +34,9 @@ RUN sudo apt-get install libnss3 -y \ && apt-get install libgbm-dev -y \ && apt-get install libpango-1.0-0 -y \ && apt-get install libcairo2 -y \ - && apt-get install libasound2 -y + && apt-get install libasound2 -y -#install firefox dependecies to run debugger tests: +# install firefox dependencies to run debugger tests: RUN sudo apt-get install libdbus-glib-1-2 -y \ && apt-get install libgtk-3-0 -y \ - && apt-get install libx11-xcb-dev -y
\ No newline at end of file + && apt-get install libx11-xcb-dev -y diff --git a/docs/coding-guidelines/clr-code-guide.md b/docs/coding-guidelines/clr-code-guide.md index 0401300c73f..85987de5b04 100644 --- a/docs/coding-guidelines/clr-code-guide.md +++ b/docs/coding-guidelines/clr-code-guide.md @@ -912,7 +912,7 @@ It depends. If you initialize the crst as CRST_HOST_BREAKABLE, any attempt to acquire the lock can trigger an exception (intended to kill your thread to break the deadlock.) Otherwise, you are guaranteed not to get an exception or failure. Regardless of the flag setting, releasing a lock will never fail. -You can only use a non host-breakable lock if you can guarantee that that lock will never participate in a deadlock. If you cannot guarantee this, you must use a host-breakable lock and handle the exception. Otherwise, a CLR host will not be able to break deadlocks cleanly. +You can only use a non host-breakable lock if you can guarantee that the lock will never participate in a deadlock. If you cannot guarantee this, you must use a host-breakable lock and handle the exception. Otherwise, a CLR host will not be able to break deadlocks cleanly. There are several ways we enforce this. diff --git a/docs/design/coreclr/botr/readytorun-overview.md b/docs/design/coreclr/botr/readytorun-overview.md index a405f4e9724..fc43502c2e9 100644 --- a/docs/design/coreclr/botr/readytorun-overview.md +++ b/docs/design/coreclr/botr/readytorun-overview.md @@ -265,7 +265,7 @@ Experiments with disabled cross-module inlining with the selectively enabled inl ## Non-Virtual calls as the baseline solution to all other versioning issues -It is important to observe that once you have a mechanism for doing non-virtual function calls in a version resilient way (by having an indirect CALL through a slot that that can be fixed lazily at runtime, all other versioning problems _can_ be solved in that way by calling back to the 'definer' module, and having the operation occur there instead. Issues associated with this technique +It is important to observe that once you have a mechanism for doing non-virtual function calls in a version resilient way (by having an indirect CALL through a slot that can be fixed lazily at runtime, all other versioning problems _can_ be solved in that way by calling back to the 'definer' module, and having the operation occur there instead. Issues associated with this technique 1. You will pay the cost of a true indirection function call and return, as well as any argument setup cost. This cost may be visible in constructs that do not contain a call naturally, like fetching string literals or other constants. You may be able to get better performance from another technique (for example, we did so with instance field access). 2. It introduces a lot of indirect calls. It is not friendly to systems that disallow on the fly code generation. A small helper stub has to be created at runtime in the most straightforward implementation, or there has to be a scheme how to pre-create or recycle the stubs. diff --git a/docs/design/coreclr/botr/xplat-minidump-generation.md b/docs/design/coreclr/botr/xplat-minidump-generation.md index d2bfeb20921..9160b673d0f 100644 --- a/docs/design/coreclr/botr/xplat-minidump-generation.md +++ b/docs/design/coreclr/botr/xplat-minidump-generation.md @@ -4,7 +4,7 @@ Dump generation on Windows, Linux and other non-Windows platforms has several ch Our goal is to generate core dumps that are on par with WER (Windows Error Reporting) crash dumps on any supported Linux platform. To the very least we want to enable the following: - automatic generation of minimal size minidumps. The quality and quantity of the information contained in the dump should be on par with the information contained in a traditional Windows mini-dump. -- simple configurabilty by the user (not _su_!). +- simple configurability by the user (not _su_!). Our solution at this time is to intercept any unhandled exception in the PAL layer of the runtime and have coreclr itself trigger and generate a "mini" core dump. diff --git a/docs/design/coreclr/jit/object-stack-allocation.md b/docs/design/coreclr/jit/object-stack-allocation.md index 91401387800..0101d5b4425 100644 --- a/docs/design/coreclr/jit/object-stack-allocation.md +++ b/docs/design/coreclr/jit/object-stack-allocation.md @@ -137,7 +137,7 @@ but without field edges in the connection graph. * Only simple objects are stack allocated, arrays of constant size are not analyzed. * Only objects that are allocated unconditionally in the method are moved to the stack. An improvement here would be allocating other objects dynamically on the stack. -* If at least one object in a method is stack allocated, all objects are conservatively reported as as TYPE_GC_BYREF +* If at least one object in a method is stack allocated, all objects are conservatively reported as TYPE_GC_BYREF and a checked write barrier is used in the method. * All objects allocated on the stack also have a pre-header allocated. Pre-header is used for synchronization and hashing so we could eliminate it if we proved the object wasn't used for synchronization and hashing. diff --git a/docs/design/coreclr/profiling/Profiler Loading.md b/docs/design/coreclr/profiling/Profiler Loading.md index f6b603844ab..140323e9827 100644 --- a/docs/design/coreclr/profiling/Profiler Loading.md +++ b/docs/design/coreclr/profiling/Profiler Loading.md @@ -4,7 +4,7 @@ To enable profiling set the following environment variables: - `CORECLR_PROFILER={_CLSID of profiler_}` # Finding the profiler library -Once profiling is enabled there are two ways we load your profiler, with enviroment variables (cross-plat) or through the registry (Windows only) +Once profiling is enabled there are two ways we load your profiler, with environment variables (cross-plat) or through the registry (Windows only) ## Environment Variable (cross-plat) Set one of the following (if all are set, the bitness-specific variables take precedence). The 32/64 ones specify which bitness of profiler is loaded diff --git a/docs/design/coreclr/profiling/ReJIT on Attach.md b/docs/design/coreclr/profiling/ReJIT on Attach.md index d4769c9a4c9..ae68a630e3b 100644 --- a/docs/design/coreclr/profiling/ReJIT on Attach.md +++ b/docs/design/coreclr/profiling/ReJIT on Attach.md @@ -14,7 +14,7 @@ To enable ReJIT on attach there is a new API `ICorProfilerInfo10::RequestReJITWi [in, size_is(cFunctions)] mdMethodDef methodIds[]); ``` -Conceptually this works the same as `ICorProfilerInfo4::RequestReJIT` except it will automatically ReJIT any methods that have inlined the target method(s) in the past. The arguments are the same except for the additon of `dwRejitFlags` as the first parameter. The valid values for this argument come from this enum: +Conceptually this works the same as `ICorProfilerInfo4::RequestReJIT` except it will automatically ReJIT any methods that have inlined the target method(s) in the past. The arguments are the same except for the addition of `dwRejitFlags` as the first parameter. The valid values for this argument come from this enum: ```cpp typedef enum diff --git a/docs/design/coreclr/profiling/davbr-blog-archive/Attach2.md b/docs/design/coreclr/profiling/davbr-blog-archive/Attach2.md index 6ff0409ebeb..8704cb8c466 100644 --- a/docs/design/coreclr/profiling/davbr-blog-archive/Attach2.md +++ b/docs/design/coreclr/profiling/davbr-blog-archive/Attach2.md @@ -15,7 +15,7 @@ Drawing by Magdalena Hermawan There are two fundamental ways your profiler can catch up on the current state of an application: -- Lazy catch-up—as the profiler encounters new IDs, the profiler queries information about those IDs as it needs them, rather than assuming it has a full cache that’s always built up as the IDs are first created. This is analogous to Dorothy meeting a new grown-up, and gracefully accepting the fact that that person exists. +- Lazy catch-up—as the profiler encounters new IDs, the profiler queries information about those IDs as it needs them, rather than assuming it has a full cache that’s always built up as the IDs are first created. This is analogous to Dorothy meeting a new grown-up, and gracefully accepting the fact that the person exists. - Enumeration—for certain kinds of IDs, the profiler can (at attach time) request a complete list of the currently active IDs and query information about them at that time. Sort of like Dorothy first going to the Oz City Hall and looking up the birth records for everyone. Lazy catch-up is fairly self-explanatory. For example, if your sampling profiler encounters an IP in a FunctionID you’ve never seen before, just look up whatever info you need about that FunctionID the first time you encounter it, rather than assuming you’d already built up a cache when the function was first JITted. And if you discover that FunctionID resides in a module you’ve never seen before, then just look up whatever info you need about that ModuleID at that point, rather than assuming you already have a complete cache of all modules. Many of you are already doing something like this today if you support sampling against regular NGENd images (since you don’t get JIT notifications of those functions anyway). diff --git a/docs/design/features/COM-activation.md b/docs/design/features/COM-activation.md index 4cb22c28aa0..9bdb937110e 100644 --- a/docs/design/features/COM-activation.md +++ b/docs/design/features/COM-activation.md @@ -104,7 +104,7 @@ When `DllGetClassObject()` is called in a COM activation scenario, the following } ``` Note this API is not exposed outside of `System.Private.CoreLib` and is subject to change at any time. - * The loading of the assembly will take place in a new [`AssemblyLoadContext`](https://docs.microsoft.com/dotnet/api/system.runtime.loader.assemblyloadcontext) for dependency isolation. Each assembly path will get a seperate `AssemblyLoadContext`. This means that if an assembly provides multiple COM servers all of the servers from that assembly will reside in the same `AssemblyLoadContext`. + * The loading of the assembly will take place in a new [`AssemblyLoadContext`](https://docs.microsoft.com/dotnet/api/system.runtime.loader.assemblyloadcontext) for dependency isolation. Each assembly path will get a separate `AssemblyLoadContext`. This means that if an assembly provides multiple COM servers all of the servers from that assembly will reside in the same `AssemblyLoadContext`. * The created `AssemblyLoadContext` will use an [`AssemblyDependencyResolver`](https://github.com/dotnet/runtime/issues/27787) that was supplied with the path to the assembly to load assemblies. 1) The `IClassFactory` instance is returned to the caller of `DllGetClassObject()` to attempt class activation. diff --git a/docs/design/features/crossgen2-compilation-structure-enhancements.md b/docs/design/features/crossgen2-compilation-structure-enhancements.md index 7f993df95e8..2c6676100db 100644 --- a/docs/design/features/crossgen2-compilation-structure-enhancements.md +++ b/docs/design/features/crossgen2-compilation-structure-enhancements.md @@ -50,7 +50,7 @@ There are 3 sets of files to pass to crossgen2: ### Principles 1. Ahead of time generated code exists to improve startup, and for some scenarios will be retained for the lifetime of the process. -2. Our default scenario relies on on tiered compilation rejit for best performance. +2. Our default scenario relies on tiered compilation rejit for best performance. 3. Too much pregenerated code will negatively affect applications. Startup is the critical detail for most pregeneration scenarios, and for those, there is a blend of time to pull the file to the CPU (from disk, over the network, etc.) and to compile functions. Striking the right blend has been discovered to be critical. ### Proposed approach diff --git a/docs/design/features/source-generator-com.md b/docs/design/features/source-generator-com.md index 0a4b47e8750..0b068d1b7e5 100644 --- a/docs/design/features/source-generator-com.md +++ b/docs/design/features/source-generator-com.md @@ -620,7 +620,7 @@ Cons: #### Option 5 (Selected Design): Only `GeneratedComInterfaceAttribute` attribute with Generated `ComWrappers`-derived type -The built-in `ComImport` and `ComVisible` attributes have a lot of history and weird runtime behavior associated with them. Additionally the built-in `ComVisible` attribute actually takes a `bool` to determine if the applied to type is visible and it can be applied to methods as well to enable/disable COM visbility for the legacy automatic COM vtable generation that the .NET runtime has supported since .NET Framework 1.0. This option proposes introducing a single new attribute to cover the expected scenarios: +The built-in `ComImport` and `ComVisible` attributes have a lot of history and weird runtime behavior associated with them. Additionally the built-in `ComVisible` attribute actually takes a `bool` to determine if the applied to type is visible and it can be applied to methods as well to enable/disable COM visibility for the legacy automatic COM vtable generation that the .NET runtime has supported since .NET Framework 1.0. This option proposes introducing a single new attribute to cover the expected scenarios: ```csharp [AttributeUsage(AttributeTargets.Interface)] diff --git a/docs/design/mono/components.md b/docs/design/mono/components.md index ef17836c864..db4d3017e74 100644 --- a/docs/design/mono/components.md +++ b/docs/design/mono/components.md @@ -24,7 +24,7 @@ time, instead of requiring custom builds of the runtime. For example, each of the following experiences requires different runtime capabilities: -- Developer inner loop on on a mobile or WebAssembly workload: The runtime +- Developer inner loop on a mobile or WebAssembly workload: The runtime should include support for the interpreter, hot reload, and the diagnostic server. - Release build iPhone app for the app store: The runtime should not include the diff --git a/docs/project/glossary.md b/docs/project/glossary.md index 86a2c596f82..68c9a3f8c53 100644 --- a/docs/project/glossary.md +++ b/docs/project/glossary.md @@ -49,7 +49,7 @@ terminology. | TFM | [Target Framework Moniker](https://docs.microsoft.com/dotnet/standard/frameworks) such as `net6.0` or `netstandard2.0`. | | TPA | Trusted Platform Assemblies used to be a special set of assemblies that comprised the platform assemblies, when it was originally designed. As of today, it is simply the set of assemblies known to constitute the application. | | URT | Universal Runtime. Ancient name for what ended up being .NET, is used in the WinError facility name FACILITY_URT. | -| UTC | [Universal Tuple Compiler](https://blogs.msdn.microsoft.com/vcblog/2013/06/12/optimizing-c-code-overview/). The Microsoft C++ optimizer back-end that that starts by converting the information from the FrontEnd into tuples – a binary stream of instructions. | +| UTC | [Universal Tuple Compiler](https://blogs.msdn.microsoft.com/vcblog/2013/06/12/optimizing-c-code-overview/). The Microsoft C++ optimizer back-end that starts by converting the information from the FrontEnd into tuples – a binary stream of instructions. | | UWP | [Universal Windows Platform (UWP)](https://docs.microsoft.com/en-us/windows/uwp/get-started/universal-application-platform-guide) is a platform-homogeneous application architecture available on every device that runs Windows 10. | | VSD | [Virtual Stub Dispatch](../design/coreclr/botr/virtual-stub-dispatch.md). Technique of using stubs for virtual method invocations instead of the traditional virtual method table. | | VM | Virtual machine. | diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index 082008f0e49..f331dafd067 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -133,7 +133,7 @@ elseif (CLR_CMAKE_HOST_UNIX) message("Address Sanitizer (asan) enabled") endif () if (${__UBSAN_POS} GREATER -1) - # all sanitizier flags are enabled except alignment (due to heavy use of __unaligned modifier) + # all sanitizer flags are enabled except alignment (due to heavy use of __unaligned modifier) list(APPEND CLR_CXX_SANITIZERS "bool" bounds diff --git a/eng/packaging.targets b/eng/packaging.targets index 91d72a574c7..b5bfb5dd52c 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -31,7 +31,7 @@ <PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'"> <!-- If no servicing version is set we need to default to 0 in order for dependency versions to - be calculated propertly, if we don't set it to 0, we would get the dependency version using the + be calculated properly, if we don't set it to 0, we would get the dependency version using the product Patch Version --> <ServicingVersion Condition="'$(ServicingVersion)' == ''">0</ServicingVersion> @@ -260,13 +260,13 @@ </ItemGroup> </Target> - <Target Name="ValidateAssemblyVersionsInRefPack" + <Target Name="ValidateAssemblyVersionsInRefPack" Condition="'$(SkipValidateAssemblyVersion)' != 'true' and '$(_AssemblyInTargetingPack)' == 'true' and '$(PreReleaseVersionLabel)' == 'servicing'" AfterTargets="CoreCompile" > <Error Condition="'$(AssemblyVersion)' != '$(LastReleasedStableAssemblyVersion)'" Text="AssemblyVersion should match last released assembly version $(LastReleasedStableAssemblyVersion)" /> </Target> - <Target Name="ValidateServicingVersionIsPropertlySet" + <Target Name="ValidateServicingVersionIsProperlySet" Condition="'$(PreReleaseVersionLabel)' == 'servicing' and '$(DotNetBuildFromSource)' != 'true'" AfterTargets="GenerateNuspec"> <Error Condition="'$(ServicingVersion)' == '0'" Text="ServicingVersion is set to 0 and it should be an increment of the patch version from the last released package." /> diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml index 4d07037c413..addebb94903 100644 --- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml @@ -58,7 +58,7 @@ jobs: - name: buildProductArtifactName value: 'MonoProduct__${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' - # minijit and monointerpreter do not use seperate product builds. + # minijit and monointerpreter do not use separate product builds. - ${{ if or(eq(parameters.runtimeVariant, 'minijit'), eq(parameters.runtimeVariant, 'monointerpreter')) }}: - name : buildProductArtifactName value : 'MonoProduct___$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' @@ -107,7 +107,7 @@ jobs: value: 'Checked' ${{ if eq(parameters.liveRuntimeBuildConfig, 'debug') }}: value: 'Debug' - + - name: priorityArg value: '' diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/LoaderAllocator.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/LoaderAllocator.cs index 08da273763e..166485dc95b 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Reflection/LoaderAllocator.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Reflection/LoaderAllocator.cs @@ -10,7 +10,7 @@ namespace System.Reflection // We can destroy the unmanaged part of collectible type only after the managed part is definitely gone and thus // nobody can call/allocate/reference anything related to the collectible assembly anymore. A call to finalizer // alone does not guarantee that the managed part is gone. A malicious code can keep a reference to some object - // in a way that that survives finalization, or we can be running during shutdown where everything is finalized. + // in a way that it survives finalization, or we can be running during shutdown where everything is finalized. // // The unmanaged LoaderAllocator keeps a reference to the managed LoaderAllocator in long weak handle. If the long // weak handle is null, we can be sure that the managed part of the LoaderAllocator is definitely gone and that it diff --git a/src/coreclr/classlibnative/bcltype/objectnative.cpp b/src/coreclr/classlibnative/bcltype/objectnative.cpp index 711d5c343f1..a2756657a42 100644 --- a/src/coreclr/classlibnative/bcltype/objectnative.cpp +++ b/src/coreclr/classlibnative/bcltype/objectnative.cpp @@ -193,7 +193,7 @@ NOINLINE static Object* GetClassHelper(OBJECTREF objRef) return OBJECTREFToObject(refType); } -// This routine is called by the Object.GetType() routine. It is a major way to get the Sytem.Type +// This routine is called by the Object.GetType() routine. It is a major way to get the System.Type FCIMPL1(Object*, ObjectNative::GetClass, Object* pThis) { CONTRACTL diff --git a/src/coreclr/classlibnative/bcltype/varargsnative.cpp b/src/coreclr/classlibnative/bcltype/varargsnative.cpp index 8862bbc5072..fe6367ba308 100644 --- a/src/coreclr/classlibnative/bcltype/varargsnative.cpp +++ b/src/coreclr/classlibnative/bcltype/varargsnative.cpp @@ -91,7 +91,7 @@ static void InitCommon(VARARGS *data, VASigCookie** cookie) // += sizeOfArgs // / // <arg1> / - // * <this> ;; if an instance method (note: <this> is usally passed in + // * <this> ;; if an instance method (note: <this> is usually passed in // ;; a register and wouldn't appear on the stack frame) // ;; higher memory // diff --git a/src/coreclr/debug/createdump/crashreportwriter.cpp b/src/coreclr/debug/createdump/crashreportwriter.cpp index 6f1dd3a3548..b643fa81a05 100644 --- a/src/coreclr/debug/createdump/crashreportwriter.cpp +++ b/src/coreclr/debug/createdump/crashreportwriter.cpp @@ -309,7 +309,7 @@ CrashReportWriter::Indent(std::string& text) } void -CrashReportWriter::WriteSeperator(std::string& text) +CrashReportWriter::WriteSeparator(std::string& text) { if (m_comma) { @@ -323,7 +323,7 @@ void CrashReportWriter::OpenValue(const char* key, char marker) { std::string text; - WriteSeperator(text); + WriteSeparator(text); if (key != nullptr) { text.append("\""); @@ -354,7 +354,7 @@ void CrashReportWriter::WriteValue(const char* key, const char* value) { std::string text; - WriteSeperator(text); + WriteSeparator(text); text.append("\""); text.append(key); text.append("\" : \""); diff --git a/src/coreclr/debug/createdump/crashreportwriter.h b/src/coreclr/debug/createdump/crashreportwriter.h index e5f0f618d94..ef712ba8a9a 100644 --- a/src/coreclr/debug/createdump/crashreportwriter.h +++ b/src/coreclr/debug/createdump/crashreportwriter.h @@ -31,7 +31,7 @@ private: void Write(const std::string& text); void Write(const char* buffer); void Indent(std::string& text); - void WriteSeperator(std::string& text); + void WriteSeparator(std::string& text); void OpenValue(const char* key, char marker); void CloseValue(char marker); bool OpenWriter(const char* fileName); diff --git a/src/coreclr/debug/daccess/daccess.cpp b/src/coreclr/debug/daccess/daccess.cpp index caa95fb75de..564aa84cd68 100644 --- a/src/coreclr/debug/daccess/daccess.cpp +++ b/src/coreclr/debug/daccess/daccess.cpp @@ -33,7 +33,7 @@ extern "C" bool TryGetSymbol(ICorDebugDataTarget* dataTarget, uint64_t baseAddre #include "dwbucketmanager.hpp" #include "gcinterface.dac.h" -// To include definiton of IsThrowableThreadAbortException +// To include definition of IsThrowableThreadAbortException // #include <exstatecommon.h> CRITICAL_SECTION g_dacCritSec; @@ -269,7 +269,7 @@ SplitFullName(_In_z_ PCWSTR fullName, memberStart = memberEnd; - for (;;) + while (true) { while (memberStart >= fullName && *memberStart != W('.')) @@ -547,7 +547,7 @@ MetaEnum::NextDomainToken(AppDomain** appDomain, // Splay tokens across all app domains. // - for (;;) + while (true) { if (m_lastToken == mdTokenNil) { @@ -583,7 +583,7 @@ MetaEnum::NextTokenByName(_In_opt_ LPCUTF8 namespaceName, HRESULT status; LPCUTF8 tokNamespace, tokName; - for (;;) + while (true) { if ((status = NextToken(token, &tokNamespace, &tokName)) != S_OK) { @@ -626,7 +626,7 @@ MetaEnum::NextDomainTokenByName(_In_opt_ LPCUTF8 namespaceName, // Splay tokens across all app domains. // - for (;;) + while (true) { if (m_lastToken == mdTokenNil) { @@ -1370,7 +1370,7 @@ SplitName::CdNextDomainField(ClrDataAccess* dac, // Splay fields across all app domains. // - for (;;) + while (true) { if (!split->m_lastField) { @@ -1994,7 +1994,7 @@ void DacInstanceManager::Flush(bool fSaveBlock) // forget all the internal pointers. // - for (;;) + while (true) { FreeAllBlocks(fSaveBlock); @@ -5335,7 +5335,7 @@ ClrDataAccess::FollowStub2( Thread* thread = task ? ((ClrDataTask*)task)->GetThread() : NULL; ULONG32 loops = 4; - for (;;) + while (true) { if ((status = FollowStubStep(thread, inFlags, diff --git a/src/coreclr/debug/daccess/enummem.cpp b/src/coreclr/debug/daccess/enummem.cpp index 366a26f0663..0fda825fe90 100644 --- a/src/coreclr/debug/daccess/enummem.cpp +++ b/src/coreclr/debug/daccess/enummem.cpp @@ -99,7 +99,7 @@ HRESULT ClrDataAccess::EnumMemCollectImages() ulSize = assembly->GetLoadedLayout()->GetSize(); } - // memory are mapped in in GetOsPageSize() size. + // memory are mapped in GetOsPageSize() size. // Some memory are mapped in but some are not. You cannot // write all in one block. So iterating through page size // @@ -787,7 +787,7 @@ HRESULT ClrDataAccess::EnumMemWalkStackHelper(CLRDataEnumMemoryFlags flags, if (!pThread->IsAddressInStack(currentSP)) { - _ASSERTE(!"Target stack has been corrupted, SP must in in the stack range."); + _ASSERTE(!"Target stack has been corrupted, SP must in the stack range."); break; } } diff --git a/src/coreclr/debug/daccess/inspect.cpp b/src/coreclr/debug/daccess/inspect.cpp index 0a3138c5b77..70753777a96 100644 --- a/src/coreclr/debug/daccess/inspect.cpp +++ b/src/coreclr/debug/daccess/inspect.cpp @@ -2822,7 +2822,7 @@ ClrDataTypeInstance::EnumMethodInstance( EX_TRY { - for (;;) + while (true) { mdMethodDef token; @@ -2938,7 +2938,7 @@ ClrDataTypeInstance::EnumMethodInstanceByName( EX_TRY { - for (;;) + while (true) { mdMethodDef token; @@ -3556,7 +3556,7 @@ ClrDataTypeInstance::GetDefinition( // XXX Microsoft - Generics issues? // Question - what does the GetCl return return here? The underlying element type? - // If so, we are lossing informaiton. + // If so, we are lossing information. // defType = m_typeHandle; *typeDefinition = new (nothrow) diff --git a/src/coreclr/debug/daccess/request.cpp b/src/coreclr/debug/daccess/request.cpp index 4ddb16fa36a..4f850593d41 100644 --- a/src/coreclr/debug/daccess/request.cpp +++ b/src/coreclr/debug/daccess/request.cpp @@ -33,7 +33,7 @@ typedef DPTR(InteropLib::ABI::ManagedObjectWrapperLayout) PTR_ManagedObjectWrapp #include <msodw.h> #endif // TARGET_UNIX -// To include definiton of IsThrowableThreadAbortException +// To include definition of IsThrowableThreadAbortException #include <exstatecommon.h> #include "rejit.h" diff --git a/src/coreclr/debug/di/divalue.cpp b/src/coreclr/debug/di/divalue.cpp index 5e79a5ee1c9..6819f1ae36e 100644 --- a/src/coreclr/debug/di/divalue.cpp +++ b/src/coreclr/debug/di/divalue.cpp @@ -3529,7 +3529,7 @@ HRESULT CordbBoxValue::GetMonitorEventWaitList(ICorDebugThreadEnum **ppThreadEnu #define ARRAY_CACHE_SIZE (1000) #else // For release, guess 4 pages should be enough. Subtract some bytes to store -// the header so that that doesn't push us onto another page. (We guess a reasonable +// the header so that it doesn't push us onto another page. (We guess a reasonable // header size, but it's ok if it's larger). #define ARRAY_CACHE_SIZE (4 * 4096 - 24) #endif diff --git a/src/coreclr/debug/di/module.cpp b/src/coreclr/debug/di/module.cpp index 3e6da64f89b..ad5cf926c4e 100644 --- a/src/coreclr/debug/di/module.cpp +++ b/src/coreclr/debug/di/module.cpp @@ -2646,7 +2646,7 @@ void CordbModule::SetLoadEventContinueMarker() // The comparison is done via continue counters. The counter of the load // event is cached via code:CordbModule::SetLoadEventContinueMarker. // -// This state is currently stored on the RS. Alternatively, it could likely be retreived from the LS state as +// This state is currently stored on the RS. Alternatively, it could likely be retrieved from the LS state as // well. One disadvantage of the current model is that if we detach during the load-module callback and // then reattach, the RS state is flushed and we lose the fact that we can toggle the jit flags. HRESULT CordbModule::EnsureModuleIsInLoadCallback() @@ -3529,7 +3529,7 @@ HRESULT CordbReJitILCode::Init(DacSharedReJitInfo* pSharedReJitInfo) m_pClauses[i].TryLength = pClauses[i].TryLength; m_pClauses[i].HandlerOffset = pClauses[i].HandlerOffset; m_pClauses[i].HandlerLength = pClauses[i].HandlerLength; - // these two fields are a union in the image, but are seperate in the struct ICorDebug returns + // these two fields are a union in the image, but are separate in the struct ICorDebug returns m_pClauses[i].ClassToken = isFilter ? 0 : pClauses[i].ClassToken; m_pClauses[i].FilterOffset = isFilter ? pClauses[i].FilterOffset : 0; } @@ -3564,7 +3564,7 @@ HRESULT CordbReJitILCode::Init(DacSharedReJitInfo* pSharedReJitInfo) m_pClauses[i].TryLength = pClauses[i].TryLength; m_pClauses[i].HandlerOffset = pClauses[i].HandlerOffset; m_pClauses[i].HandlerLength = pClauses[i].HandlerLength; - // these two fields are a union in the image, but are seperate in the struct ICorDebug returns + // these two fields are a union in the image, but are separate in the struct ICorDebug returns m_pClauses[i].ClassToken = isFilter ? 0 : pClauses[i].ClassToken; m_pClauses[i].FilterOffset = isFilter ? pClauses[i].FilterOffset : 0; } diff --git a/src/coreclr/debug/di/process.cpp b/src/coreclr/debug/di/process.cpp index aa1f844ffc3..578b114c165 100644 --- a/src/coreclr/debug/di/process.cpp +++ b/src/coreclr/debug/di/process.cpp @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. + //***************************************************************************** // File: process.cpp // - -// //***************************************************************************** + #include "stdafx.h" #include "primitives.h" #include "safewrap.h" @@ -604,7 +604,7 @@ void CordbProcess::Free(void * p) // runtime then DBI matches DAC. Technically because the DBI only matches runtime on major version number // runtime and DAC could be from different builds. However because we service all three binaries together // and DBI always loads the DAC that is sitting in the same directory DAC and DBI generally get tight -// version coupling. A user with admin privleges could put different builds together and no version check +// version coupling. A user with admin privileges could put different builds together and no version check // would ever fail though. // // - Desktop and Windows CoreCLR (new architecture) @@ -6406,7 +6406,7 @@ HRESULT CordbProcess::SafeWriteThreadContext(LSPTR_CONTEXT pContext, const DT_CO #endif // 64 bit windows puts space for the first 6 stack parameters in the CONTEXT structure so that -// kernel to usermode transitions don't have to allocate a CONTEXT and do a seperate sub rsp +// kernel to usermode transitions don't have to allocate a CONTEXT and do a separate sub rsp // to allocate stack spill space for the arguments. This means that writing to P1Home - P6Home // will overwrite the arguments of some function higher on the stack, very bad. Conceptually you // can think of these members as not being part of the context, ie they don't represent something diff --git a/src/coreclr/debug/di/rsfunction.cpp b/src/coreclr/debug/di/rsfunction.cpp index c7109e34003..b45c65567c7 100644 --- a/src/coreclr/debug/di/rsfunction.cpp +++ b/src/coreclr/debug/di/rsfunction.cpp @@ -1169,7 +1169,7 @@ HRESULT CordbFunction::GetArgumentType(DWORD dwIndex, // that they will return when asked for native code. The 1:1 mapping between // function and code was invalidated by generics but debuggers continue to use // the old API. When they do we need to have some code to hand them back even -// though it is an arbitrary instantiation. Note that that the cannonical code +// though it is an arbitrary instantiation. Note that the cannonical code // here is merely the first one that a user inspects... it is not guaranteed to // be the same in each debugging session but once set it will never change. It is // also definately NOT guaranteed to be the instantation over the runtime type diff --git a/src/coreclr/debug/di/rsmain.cpp b/src/coreclr/debug/di/rsmain.cpp index 0439152372e..3923fee52c9 100644 --- a/src/coreclr/debug/di/rsmain.cpp +++ b/src/coreclr/debug/di/rsmain.cpp @@ -1,12 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. + //***************************************************************************** // File: RsMain.cpp // - -// Random RS utility stuff, plus root ICorCordbug implementation +// Random RS utility stuff, plus root ICorDebug implementation // //***************************************************************************** + #include "stdafx.h" #include "primitives.h" #include "safewrap.h" diff --git a/src/coreclr/debug/di/rsthread.cpp b/src/coreclr/debug/di/rsthread.cpp index 57af1f53042..7bd63544a0d 100644 --- a/src/coreclr/debug/di/rsthread.cpp +++ b/src/coreclr/debug/di/rsthread.cpp @@ -3526,7 +3526,7 @@ HRESULT CordbUnmanagedThread::GetThreadContext(DT_CONTEXT* pContext) // 3) The original context present when the hijack was started // // Both #1 and #3 are stored in the GetHijackCtx() space so of course you can't - // have them both. You have have #1 if IsContextSet() is true, otherwise it holds #3 + // have them both. You have #1 if IsContextSet() is true, otherwise it holds #3. // // GenericHijack, FirstChanceHijackForSync, and RaiseExceptionHijack use #1 if available // and fallback to #3 if not. In other words they use GetHijackCtx() regardless of which thing it holds diff --git a/src/coreclr/debug/di/shimprocess.cpp b/src/coreclr/debug/di/shimprocess.cpp index 21fe29b3aed..76fd64731dd 100644 --- a/src/coreclr/debug/di/shimprocess.cpp +++ b/src/coreclr/debug/di/shimprocess.cpp @@ -932,7 +932,7 @@ CordbWin32EventThread * ShimProcess::GetWin32EventThread() // Trivial accessor to mark whether we're interop-debugging. -// Retreived via code:ShimProcess::IsInteropDebugging +// Retrieved via code:ShimProcess::IsInteropDebugging void ShimProcess::SetIsInteropDebugging(bool fIsInteropDebugging) { m_fIsInteropDebugging = fIsInteropDebugging; diff --git a/src/coreclr/debug/ee/controller.cpp b/src/coreclr/debug/ee/controller.cpp index 05de07a9c91..6be73bc8be2 100644 --- a/src/coreclr/debug/ee/controller.cpp +++ b/src/coreclr/debug/ee/controller.cpp @@ -11,6 +11,8 @@ // **************************************************************************** // Putting code & #includes, #defines, etc, before the stdafx.h will // cause the code,etc, to be silently ignored +// + #include "stdafx.h" #include "openum.h" #include "../inc/common.h" @@ -23,10 +25,6 @@ const char *GetTType( TraceType tt); #define IsSingleStep(exception) ((exception) == EXCEPTION_SINGLE_STEP) - - - - // ------------------------------------------------------------------------- // DebuggerController routines // ------------------------------------------------------------------------- @@ -126,7 +124,7 @@ LOG((LF_CORDB, LL_EVERYTHING, "DPT::SPIPL GetNextPatch passed\n")); // If we decide to reorder the list, we'll need to keep the element // indexed by the hash function as the (sorted)first item. Everything else - // chains off this element, can can thus stay put. + // chains off this element, can thus stay put. // Thus, either the element we just added is already sorted, or else we'll // have to move it elsewhere in the list, meaning that we'll have to swap // the second item & the new item, so that the index points to the proper @@ -383,12 +381,13 @@ StackWalkAction ControllerStackInfo::WalkStack(FrameInfo *pInfo, void *data) ControllerStackInfo *i = (ControllerStackInfo *) data; - //save this info away for later use + // save this info away for later use. if (i->m_bottomFP == LEAF_MOST_FRAME) i->m_bottomFP = pInfo->fp; - // This is part of the targetted fix for issue 650903. (See the other - // parts in in code:TrackUMChain and code:DebuggerStepper::TrapStepOut.) + // This is part of the targetted fix for issue 650903 (see the other + // parts in code:TrackUMChain and code:DebuggerStepper::TrapStepOut). + // // pInfo->fIgnoreThisFrameIfSuppressingUMChainFromComPlusMethodFrameGeneric has been // set by TrackUMChain to help us remember that the current frame we're looking at is // ComPlusMethodFrameGeneric (we can't rely on looking at pInfo->frame to check @@ -396,6 +395,7 @@ StackWalkAction ControllerStackInfo::WalkStack(FrameInfo *pInfo, void *data) // dude initiating this walk to remind us that our goal in life is to do a Step Out // during managed-only debugging. These two things together tell us we should ignore // this frame, rather than erroneously identifying it as the target frame. + // #ifdef FEATURE_COMINTEROP if(i->m_suppressUMChainFromComPlusMethodFrameGeneric && (pInfo->chainReason == CHAIN_ENTER_UNMANAGED) && @@ -1483,9 +1483,9 @@ bool DebuggerController::UnapplyPatch(DebuggerControllerPatch *patch) CORDbgSetInstruction((CORDB_ADDRESS_TYPE *)patch->address, patch->opcode); - //VERY IMPORTANT to zero out opcode, else we might mistake - //this patch for an active on on ReadMem/WriteMem (see - //header file comment) + // VERY IMPORTANT to zero out opcode, else we might mistake + // this patch for an active one on ReadMem/WriteMem (see + // header file comment). InitializePRD(&(patch->opcode)); #if !defined(HOST_OSX) || !defined(HOST_ARM64) @@ -1525,9 +1525,10 @@ bool DebuggerController::UnapplyPatch(DebuggerControllerPatch *patch) *(unsigned short *) (breakpointWriterHolder.GetRW()+1) = (unsigned short) patch->opcode; #endif //this makes no sense on anything but X86 - //VERY IMPORTANT to zero out opcode, else we might mistake - //this patch for an active on on ReadMem/WriteMem (see - //header file comment + + // VERY IMPORTANT to zero out opcode, else we might mistake + // this patch for an active one on ReadMem/WriteMem (see + // header file comment. InitializePRD(&(patch->opcode)); if (!VirtualProtect((void *) patch->address, 2, oldProt, &oldProt)) @@ -1879,7 +1880,7 @@ BOOL DebuggerController::AddBindAndActivateILSlavePatch(DebuggerControllerPatch SIZE_T masterILOffset = master->offset; // Loop through all the native offsets mapped to the given IL offset. On x86 the mapping - // should be 1:1. On WIN64, because there are funclets, we have have an 1:N mapping. + // should be 1:1. On WIN64, because there are funclets, we have a 1:N mapping. DebuggerJitInfo::ILToNativeOffsetIterator it; for (dji->InitILToNativeOffsetIterator(it, masterILOffset); !it.IsAtEnd(); it.Next()) { @@ -4571,7 +4572,7 @@ void DebuggerPatchSkip::DebuggerDetachClean() // -// We have to have a whole seperate function for this because you +// We have to have a whole separate function for this because you // can't use __try in a function that requires object unwinding... // diff --git a/src/coreclr/debug/ee/debugger.cpp b/src/coreclr/debug/ee/debugger.cpp index b6a48499f50..615fd152d62 100644 --- a/src/coreclr/debug/ee/debugger.cpp +++ b/src/coreclr/debug/ee/debugger.cpp @@ -3281,7 +3281,7 @@ void Debugger::getBoundaries(MethodDesc * md, return; } - // LCG methods have their own resolution scope that is seperate from a module + // LCG methods have their own resolution scope that is separate from a module // so they shouldn't have their symbols looked up in the module PDB. Right now // LCG methods have no symbols so we can just early out, but if they ever // had some symbols attached we would need a different way of getting to them. @@ -5104,7 +5104,7 @@ void Debugger::SendSyncCompleteIPCEvent(bool isEESuspendedForGC) STRESS_LOG0(LF_CORDB, LL_INFO10000, "D::SSCIPCE: sync complete.\n"); - // Synchronizing while in in rude shutdown should be extremely rare b/c we don't + // Synchronizing during the rude shutdown should be extremely rare b/c we don't // TART in rude shutdown. Shutdown must have started after we started to sync. // We know we're not on the shutdown thread here. // And we also know we can't block the shutdown thread (b/c it has the TSL and will @@ -7223,7 +7223,7 @@ void Debugger::JitAttach(Thread * pThread, EXCEPTION_POINTERS * pExceptionInfo, // - Failed to spawn jit-attach debugger. // // Ultimately, the only thing that matters at the end is whether a debugger -// is now attached, which is retreived via CORDebuggerAttached(). +// is now attached, which is retrieved via CORDebuggerAttached(). //----------------------------------------------------------------------------- void Debugger::EnsureDebuggerAttached(Thread * pThread, EXCEPTION_POINTERS * pExceptionInfo, BOOL willSendManagedEvent, BOOL explicitUserRequest) { @@ -10096,7 +10096,7 @@ void Debugger::FuncEvalComplete(Thread* pThread, DebuggerEval *pDE) // Note: it's possible that the AppDomain has (or is about to be) unloaded, which could lead to a // crash when we use the DebuggerModule. Ideally we'd only be using AppDomain IDs here. // We can't easily convert our ADID to an AppDomain* (SystemDomain::GetAppDomainFromId) - // because we can't proove that that the AppDomain* would be valid (not unloaded). + // because we can't proove that the AppDomain* would be valid (not unloaded). // AppDomain *pDomain = pThread->GetDomain(); AppDomain *pResultDomain = ((pDE->m_debuggerModule == NULL) ? pDomain : pDE->m_debuggerModule->GetAppDomain()); @@ -13785,10 +13785,10 @@ void Debugger::SignalHijackStarted(void) } // -// This is the function that is called when we determine that a first chance exception really belongs to the Runtime, -// and that that exception is due to a managed->unmanaged transition. This notifies the Right Side of this and the Right -// Side fixes up the thread's execution state from there, making sure to remember that it needs to continue to hide the -// hijack state of the thread. +// This function is called when we determine that a first chance exception really belongs to the Runtime, +// and that the exception is due to a managed->unmanaged transition. This notifies the Right Side which +// fixes up the thread's execution state from there, making sure to remember that it needs to continue +// to hide the hijack state of the thread. // void Debugger::ExceptionForRuntimeHandoffStart(void) { @@ -14977,7 +14977,7 @@ HRESULT Debugger::FuncEvalSetup(DebuggerIPCE_FuncEvalInfo *pEvalInfo, return CORDBG_E_FUNC_EVAL_BAD_START_POINT; } - // Allocate the breakpoint instruction info for the debugger info in in executable memory. + // Allocate the breakpoint instruction info for the debugger info in executable memory. DebuggerHeap *pHeap = g_pDebugger->GetInteropSafeExecutableHeap_NoThrow(); if (pHeap == NULL) { diff --git a/src/coreclr/debug/ee/debugger.h b/src/coreclr/debug/ee/debugger.h index 7e0d1805ec0..ad8ced4892d 100644 --- a/src/coreclr/debug/ee/debugger.h +++ b/src/coreclr/debug/ee/debugger.h @@ -3251,7 +3251,7 @@ struct DebuggerMethodInfoEntry }; // class DebuggerMethodInfoTable: Hash table to hold all the non-JIT related -// info for each method we see. The JIT infos live in a seperate table +// info for each method we see. The JIT infos live in a separate table // keyed by MethodDescs - there may be multiple // JITted realizations of each MethodDef, e.g. under different generic // assumptions. Hangs off of the Debugger object. diff --git a/src/coreclr/debug/ee/funceval.cpp b/src/coreclr/debug/ee/funceval.cpp index c4c87251563..88495632c5d 100644 --- a/src/coreclr/debug/ee/funceval.cpp +++ b/src/coreclr/debug/ee/funceval.cpp @@ -3155,7 +3155,7 @@ static void RecordFuncEvalException(DebuggerEval *pDE, * * Does the main body of work (steps 1c onward) for the normal func-eval algorithm detailed at the * top of this file. The args have already been GC protected and we've transitioned into the appropriate - * domain (steps 1a & 1b). This has to be a seperate function from GCProtectArgsAndDoNormalFuncEval + * domain (steps 1a & 1b). This has to be a separate function from GCProtectArgsAndDoNormalFuncEval * because otherwise we can't reliably find the right GCFrames to pop when unwinding the stack due to * an exception on 64-bit platforms (we have some GCFrames outside of the TRY, and some inside, * and they won't necesarily be layed out sequentially on the stack if they are all in the same function). diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp index e42d29365f7..0780703e7ac 100644 --- a/src/coreclr/gc/gc.cpp +++ b/src/coreclr/gc/gc.cpp @@ -43310,7 +43310,7 @@ void gc_heap::verify_heap (BOOL begin_gc_p) uint8_t* e_high = 0; uint8_t* next_boundary = 0; #else //USE_REGIONS - // For no regions the gen number is seperately reduced when we detect the ephemeral seg. + // For no regions the gen number is separately reduced when we detect the ephemeral seg. int gen_num_to_stop = max_generation; uint8_t* e_high = ephemeral_high; uint8_t* next_boundary = generation_allocation_start (generation_of (max_generation - 1)); diff --git a/src/coreclr/gc/gcscan.h b/src/coreclr/gc/gcscan.h index 7ddb3badf96..009241251a3 100644 --- a/src/coreclr/gc/gcscan.h +++ b/src/coreclr/gc/gcscan.h @@ -70,7 +70,7 @@ class GCScan // scan. static bool GcDhUnpromotedHandlesExist(ScanContext* sc); - // Rescan the handles for additonal primaries that have been promoted since the last scan. Return true if + // Rescan the handles for additional primaries that have been promoted since the last scan. Return true if // any objects were promoted as a result. static bool GcDhReScan(ScanContext* sc); diff --git a/src/coreclr/gc/unix/gcenv.unix.cpp b/src/coreclr/gc/unix/gcenv.unix.cpp index 74a7d746bce..8b536ad9dd7 100644 --- a/src/coreclr/gc/unix/gcenv.unix.cpp +++ b/src/coreclr/gc/unix/gcenv.unix.cpp @@ -949,8 +949,8 @@ static size_t GetLogicalProcessorCacheSizeFromOS() int64_t cacheSizeFromSysctl = 0; size_t sz = sizeof(cacheSizeFromSysctl); const bool success = false - // macOS-arm64: Since macOS 12.0, Apple added ".perflevelX." to determinate cache sizes for efficiency - // and performance cores separetely. "perflevel0" stands for "performance" + // macOS-arm64: Since macOS 12.0, Apple added ".perflevelX." to determinate cache sizes for efficiency + // and performance cores separately. "perflevel0" stands for "performance" || sysctlbyname("hw.perflevel0.l2cachesize", &cacheSizeFromSysctl, &sz, nullptr, 0) == 0 // macOS-arm64: these report cache sizes for efficiency cores only: || sysctlbyname("hw.l3cachesize", &cacheSizeFromSysctl, &sz, nullptr, 0) == 0 diff --git a/src/coreclr/hosts/coreshim/CoreShim.cpp b/src/coreclr/hosts/coreshim/CoreShim.cpp index 23265e5872b..de8d8d3f19d 100644 --- a/src/coreclr/hosts/coreshim/CoreShim.cpp +++ b/src/coreclr/hosts/coreshim/CoreShim.cpp @@ -359,8 +359,8 @@ coreclr::~coreclr() HRESULT coreclr::Initialize( _In_ int propertyCount, - _In_reads_(propertCount) const char **keys, - _In_reads_(propertCount) const char **values, + _In_reads_(propertyCount) const char **keys, + _In_reads_(propertyCount) const char **values, _In_opt_z_ const char *appDomainName) { if (_clrInst != nullptr) diff --git a/src/coreclr/ilasm/writer.cpp b/src/coreclr/ilasm/writer.cpp index 969eb120e5f..e95ebcdc4df 100644 --- a/src/coreclr/ilasm/writer.cpp +++ b/src/coreclr/ilasm/writer.cpp @@ -82,7 +82,7 @@ HRESULT Assembler::CreateTLSDirectory() { DWORD offsetofAddressOfIndex = (DWORD)offsetof(IMAGE_TLS_DIRECTORY32, AddressOfIndex); DWORD offsetofAddressOfCallBacks = (DWORD)offsetof(IMAGE_TLS_DIRECTORY32, AddressOfCallBacks); - // Get memory for for the TLS directory block,as well as a spot for callback chain + // Get memory for the TLS directory block,as well as a spot for callback chain IMAGE_TLS_DIRECTORY32* tlsDir; if(FAILED(hr=m_pCeeFileGen->GetSectionBlock(tlsDirSec, sizeofdir + sizeofptr, sizeofptr, (void**) &tlsDir))) return(hr); DWORD* callBackChain = (DWORD*) &tlsDir[1]; @@ -138,7 +138,7 @@ HRESULT Assembler::CreateTLSDirectory() { DWORD offsetofAddressOfIndex = (DWORD)offsetof(IMAGE_TLS_DIRECTORY64, AddressOfIndex); DWORD offsetofAddressOfCallBacks = (DWORD)offsetof(IMAGE_TLS_DIRECTORY64, AddressOfCallBacks); - // Get memory for for the TLS directory block,as well as a spot for callback chain + // Get memory for the TLS directory block,as well as a spot for callback chain IMAGE_TLS_DIRECTORY64* tlsDir; if(FAILED(hr=m_pCeeFileGen->GetSectionBlock(tlsDirSec, sizeofdir + sizeofptr, sizeofptr, (void**) &tlsDir))) return(hr); __int64* callBackChain = (__int64*) &tlsDir[1]; diff --git a/src/coreclr/ildasm/dasm.cpp b/src/coreclr/ildasm/dasm.cpp index d3cbac67aa4..03999e3c618 100644 --- a/src/coreclr/ildasm/dasm.cpp +++ b/src/coreclr/ildasm/dasm.cpp @@ -1917,7 +1917,7 @@ BYTE* PrettyPrintCABlobValue(PCCOR_SIGNATURE &typePtr, if(n) appendStr(out," "); _gcvt_s(str,64,*((float*)dataPtr), 8); float df = (float)atof(str); - // Must compare as underlying bytes, not floating point otherwise optmizier will + // Must compare as underlying bytes, not floating point otherwise optimizer will // try to enregister and comapre 80-bit precision number with 32-bit precision number!!!! if((*(ULONG*)&df != (ULONG)GET_UNALIGNED_VAL32(dataPtr))||IsSpecialNumber(str)) sprintf_s(str, 64,"0x%08X",(ULONG)GET_UNALIGNED_VAL32(dataPtr)); @@ -1936,7 +1936,7 @@ BYTE* PrettyPrintCABlobValue(PCCOR_SIGNATURE &typePtr, char *pch; _gcvt_s(str,64,*((double*)dataPtr), 17); double df = strtod(str, &pch); - // Must compare as underlying bytes, not floating point otherwise optmizier will + // Must compare as underlying bytes, not floating point otherwise optimizer will // try to enregister and comapre 80-bit precision number with 64-bit precision number!!!! if((*(ULONGLONG*)&df != (ULONGLONG)GET_UNALIGNED_VAL64(dataPtr))||IsSpecialNumber(str)) sprintf_s(str, 64, "0x%I64X",(ULONGLONG)GET_UNALIGNED_VAL64(dataPtr)); @@ -2608,7 +2608,7 @@ void DumpDefaultValue(mdToken tok, __inout __nullterminated char* szString, void char szf[32]; _gcvt_s(szf,32,MDDV.m_fltValue, 8); float df = (float)atof(szf); - // Must compare as underlying bytes, not floating point otherwise optmizier will + // Must compare as underlying bytes, not floating point otherwise optimizer will // try to enregister and comapre 80-bit precision number with 32-bit precision number!!!! if((*(ULONG*)&df == MDDV.m_ulValue)&&!IsSpecialNumber(szf)) szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," = %s(%s)",KEYWORD("float32"),szf); @@ -2623,7 +2623,7 @@ void DumpDefaultValue(mdToken tok, __inout __nullterminated char* szString, void _gcvt_s(szf,32,MDDV.m_dblValue, 17); double df = strtod(szf, &pch); //atof(szf); szf[31]=0; - // Must compare as underlying bytes, not floating point otherwise optmizier will + // Must compare as underlying bytes, not floating point otherwise optimizer will // try to enregister and comapre 80-bit precision number with 64-bit precision number!!!! if((*(ULONGLONG*)&df == MDDV.m_ullValue)&&!IsSpecialNumber(szf)) szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," = %s(%s)",KEYWORD("float64"),szf); diff --git a/src/coreclr/ildasm/dis.cpp b/src/coreclr/ildasm/dis.cpp index 92a45790cd1..2ec464e6a9a 100644 --- a/src/coreclr/ildasm/dis.cpp +++ b/src/coreclr/ildasm/dis.cpp @@ -1568,7 +1568,7 @@ BOOL Disassemble(IMDInternalImport *pImport, BYTE *ILHeader, void *GUICookie, md else _gcvt_s(szf,32,(double)f, 8); float fd = (float)atof(szf); - // Must compare as underlying bytes, not floating point otherwise optmizier will + // Must compare as underlying bytes, not floating point otherwise optimizer will // try to enregister and comapre 80-bit precision number with 32-bit precision number!!!! if(((__int32&)fd == v)&&!IsSpecialNumber(szf)) szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), "%-10s %s", pszInstrName, szf); @@ -1607,7 +1607,7 @@ BOOL Disassemble(IMDInternalImport *pImport, BYTE *ILHeader, void *GUICookie, md else _gcvt_s(szf,32,d, 17); double df = strtod(szf, &pch); //atof(szf); - // Must compare as underlying bytes, not floating point otherwise optmizier will + // Must compare as underlying bytes, not floating point otherwise optimizer will // try to enregister and comapre 80-bit precision number with 64-bit precision number!!!! if (((__int64&)df == v)&&!IsSpecialNumber(szf)) szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), "%-10s %s", pszInstrName, szf); diff --git a/src/coreclr/inc/bitvector.h b/src/coreclr/inc/bitvector.h index 469b1d44728..df06b4c75c6 100644 --- a/src/coreclr/inc/bitvector.h +++ b/src/coreclr/inc/bitvector.h @@ -198,7 +198,7 @@ public: } } - // Note that that is set difference, not subtration + // Note that this is set difference, not subtration void operator -=(const BitVector& arg) { WRAPPER_NO_CONTRACT; diff --git a/src/coreclr/inc/clrinternal.idl b/src/coreclr/inc/clrinternal.idl index 57ba59f8a5a..e350ac7da32 100644 --- a/src/coreclr/inc/clrinternal.idl +++ b/src/coreclr/inc/clrinternal.idl @@ -32,7 +32,7 @@ cpp_quote("EXTERN_GUID(CLR_ID_V4_DESKTOP, 0x267f3989, 0xd786, 0x4b9a, 0x9a, 0xf6 // GUID CLR_ID_CORECLR : uuid{8CB8E075-0A91-408E-9228-D66E00A3BFF6} cpp_quote("EXTERN_GUID(CLR_ID_CORECLR, 0x8CB8E075, 0x0A91, 0x408E, 0x92, 0x28, 0xD6, 0x6E, 0x00, 0xA3, 0xBF, 0xF6 );") -// This guid first appears in the CoreCLR port to Windows Phone 8 - note that it is seperate from the CoreCLR id because it will +// This guid first appears in the CoreCLR port to Windows Phone 8 - note that it is separate from the CoreCLR id because it will // potentially have a different verioning lineage than CoreCLR // GUID CLR_ID_PHONE_CLR : uuid{E7237E9C-31C0-488C-AD48-324D3E7ED92A} cpp_quote("EXTERN_GUID(CLR_ID_PHONE_CLR, 0xE7237E9C, 0x31C0, 0x488C, 0xAD, 0x48, 0x32, 0x4D, 0x3E, 0x7E, 0xD9, 0x2A);") diff --git a/src/coreclr/inc/clrnt.h b/src/coreclr/inc/clrnt.h index 7bd582640df..c72111deb47 100644 --- a/src/coreclr/inc/clrnt.h +++ b/src/coreclr/inc/clrnt.h @@ -163,7 +163,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemContextSwitchInformation, SystemRegistryQuotaInformation, SystemExtendServiceTableInformation, - SystemPrioritySeperation, + SystemPrioritySeparation, SystemVerifierAddDriverInformation, SystemVerifierRemoveDriverInformation, SystemProcessorIdleInformation, diff --git a/src/coreclr/inc/contract.h b/src/coreclr/inc/contract.h index a880d77c29d..ae0656dce71 100644 --- a/src/coreclr/inc/contract.h +++ b/src/coreclr/inc/contract.h @@ -226,7 +226,7 @@ #define ENABLE_CONTRACTS #endif -// Finally, only define the implementaiton parts of contracts if this isn't a DAC build. +// Finally, only define the implementation parts of contracts if this isn't a DAC build. #if defined(_DEBUG_IMPL) && defined(ENABLE_CONTRACTS) #define ENABLE_CONTRACTS_IMPL #endif diff --git a/src/coreclr/inc/cordebug.idl b/src/coreclr/inc/cordebug.idl index adac762ccbb..8a1b441e1fa 100644 --- a/src/coreclr/inc/cordebug.idl +++ b/src/coreclr/inc/cordebug.idl @@ -997,7 +997,7 @@ interface ICorDebugManagedCallback : IUnknown { /* * All callbacks are called with the process in the synchronized state - * All callbacks are serialized, and are called in in the same thread. + * All callbacks are serialized, and are called in the same thread. * Each callback implementor must call Continue in a callback to * resume execution. * If Continue is not called before returning, the process will @@ -6276,7 +6276,7 @@ interface ICorDebugEval2 : IUnknown [in, size_is(nTypeArgs)] ICorDebugType *ppTypeArgs[]); /* - * NewParamaterizedArray allocates a new array whose elements may be instances + * NewParameterizedArray allocates a new array whose elements may be instances * of a generic type. The array is always created in the AppDomain the thread is * currently in. */ @@ -7358,7 +7358,7 @@ interface ICorDebugType : IUnknown * GetClass and the relevant metadata, but it is relatively painful: you would * have to lookup the class, then the metadata of that class * to find the "generic" base type, then instantiate this generic base type by - * looking up the type paramaters to the initial type, + * looking up the type parameters to the initial type, * and then perform the appropriate instantiation in the case where the class * happens to be either a generic class or a normal class with a constructed type * as its parent. Looking up the base types is useful to implement common diff --git a/src/coreclr/inc/corinfo.h b/src/coreclr/inc/corinfo.h index 90716f464a0..b390f3b911c 100644 --- a/src/coreclr/inc/corinfo.h +++ b/src/coreclr/inc/corinfo.h @@ -141,7 +141,7 @@ The first 4 options are mutually exclusive have managed thread local statics, which work through the HELPER. Support for this is considered legacy, and going forward, the EE should - * <NONE> This is a normal static field. Its address in in memory is determined by getFieldAddress. (see + * <NONE> This is a normal static field. Its address in memory is determined by getFieldAddress. (see also CORINFO_FLG_STATIC_IN_HEAP). diff --git a/src/coreclr/inc/corjit.h b/src/coreclr/inc/corjit.h index 5a16650bbe9..259ccdc8192 100644 --- a/src/coreclr/inc/corjit.h +++ b/src/coreclr/inc/corjit.h @@ -316,7 +316,7 @@ public: virtual bool logMsg(unsigned level, const char* fmt, va_list args) = 0; // do an assert. will return true if the code should retry (DebugBreak) - // returns false, if the assert should be igored. + // returns false, if the assert should be ignored. virtual int doAssert(const char* szFile, int iLine, const char* szExpr) = 0; virtual void reportFatalError(CorJitResult result) = 0; @@ -338,13 +338,14 @@ public: // // SAMPLE_INTERVAL must be >= SIZE. SAMPLE_INTERVAL / SIZE // gives the average number of calls between table updates. - // + // struct ClassProfile32 { - enum { - SIZE = 8, - SAMPLE_INTERVAL = 32, - CLASS_FLAG = 0x80000000, + enum + { + SIZE = 8, + SAMPLE_INTERVAL = 32, + CLASS_FLAG = 0x80000000, INTERFACE_FLAG = 0x40000000, OFFSET_MASK = 0x3FFFFFFF }; @@ -447,7 +448,7 @@ public: // 3. The JIT may mark a schema item with an alignment flag. This may be used to increase the alignment of a field. // 4. Each data entry shall be laid out without extra padding. // - // The intention here is that it becomes possible to describe a C data structure with the alignment for ease of use with + // The intention here is that it becomes possible to describe a C data structure with the alignment for ease of use with // instrumentation helper functions virtual JITINTERFACE_HRESULT allocPgoInstrumentationBySchema( CORINFO_METHOD_HANDLE ftnHnd, diff --git a/src/coreclr/inc/corprof.idl b/src/coreclr/inc/corprof.idl index 80985fcb2d8..9c2c3a987d8 100644 --- a/src/coreclr/inc/corprof.idl +++ b/src/coreclr/inc/corprof.idl @@ -4046,7 +4046,7 @@ interface ICorProfilerInfo8 : ICorProfilerInfo7 [out] ReJITID * pReJitId); /* - * Retrieves informaiton about dynamic methods + * Retrieves information about dynamic methods * * Certain methods like IL Stubs or LCG do not have * associated metadata that can be retrieved using the IMetaDataImport APIs. diff --git a/src/coreclr/inc/corsym.idl b/src/coreclr/inc/corsym.idl index 0afc1ea41e4..3299c3f089d 100644 --- a/src/coreclr/inc/corsym.idl +++ b/src/coreclr/inc/corsym.idl @@ -1403,7 +1403,7 @@ interface ISymUnmanagedWriter : IUnknown /* * Same as Initialize except that the final path name is the path string to - * name the final location of the pdb file. This is used in build enviroments in + * name the final location of the pdb file. This is used in build environments in * which the pdb is built in a temporary location and moved when the build is * complete. */ diff --git a/src/coreclr/inc/dacprivate.h b/src/coreclr/inc/dacprivate.h index f1e2d2b67fe..b5574a50ae4 100644 --- a/src/coreclr/inc/dacprivate.h +++ b/src/coreclr/inc/dacprivate.h @@ -725,7 +725,7 @@ struct MSLAYOUT DacpGenerationAllocData struct MSLAYOUT DacpGcHeapDetails { - CLRDATA_ADDRESS heapAddr = 0; // Only filled in in server mode, otherwise NULL + CLRDATA_ADDRESS heapAddr = 0; // Only filled in server mode, otherwise NULL CLRDATA_ADDRESS alloc_allocated = 0; CLRDATA_ADDRESS mark_array = 0; @@ -780,7 +780,7 @@ struct MSLAYOUT DacpHeapSegmentData CLRDATA_ADDRESS mem = 0; // pass this to request if non-null to get the next segments. CLRDATA_ADDRESS next = 0; - CLRDATA_ADDRESS gc_heap = 0; // only filled in in server mode, otherwise NULL + CLRDATA_ADDRESS gc_heap = 0; // only filled in server mode, otherwise NULL // computed field: if this is the ephemeral segment highMark includes the ephemeral generation CLRDATA_ADDRESS highAllocMark = 0; @@ -881,7 +881,7 @@ struct MSLAYOUT DacpGCInterestingInfoData struct MSLAYOUT DacpGcHeapAnalyzeData { - CLRDATA_ADDRESS heapAddr = 0; // Only filled in in server mode, otherwise NULL + CLRDATA_ADDRESS heapAddr = 0; // Only filled in server mode, otherwise NULL CLRDATA_ADDRESS internal_root_array = 0; ULONG64 internal_root_array_index = 0; diff --git a/src/coreclr/inc/metadata.h b/src/coreclr/inc/metadata.h index 85da85f96f5..4606f76aac1 100644 --- a/src/coreclr/inc/metadata.h +++ b/src/coreclr/inc/metadata.h @@ -271,7 +271,7 @@ typedef struct // -// structure use to retrieve class layout informaiton +// structure use to retrieve class layout information // typedef struct { @@ -626,7 +626,7 @@ DECLARE_INTERFACE_(IMDInternalImport, IUnknown) DWORD *pdwFlags) PURE; //***************************************** - // return method implementation informaiton, like RVA and implflags + // return method implementation information, like RVA and implflags //***************************************** // returned void in v1.0/v1.1 __checkReturn @@ -636,7 +636,7 @@ DECLARE_INTERFACE_(IMDInternalImport, IUnknown) DWORD *pdwImplFlags) PURE; // [OUT] Impl. Flags //***************************************** - // return method implementation informaiton, like RVA and implflags + // return method implementation information, like RVA and implflags //***************************************** __checkReturn STDMETHOD(GetFieldRVA)( diff --git a/src/coreclr/inc/staticcontract.h b/src/coreclr/inc/staticcontract.h index 4cb71b7b5d3..ecb528829b7 100644 --- a/src/coreclr/inc/staticcontract.h +++ b/src/coreclr/inc/staticcontract.h @@ -23,7 +23,7 @@ #endif // -// PDB annotations for the static contract analysis tool. These are seperated +// PDB annotations for the static contract analysis tool. These are separated // from Contract.h to allow their inclusion in any part of the system. // diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h index e7b26005af0..2642659ca81 100644 --- a/src/coreclr/jit/compiler.h +++ b/src/coreclr/jit/compiler.h @@ -8754,19 +8754,19 @@ private: } // Ensure that code will not execute if an instruction set is usable. Call only - // if the instruction set has previously reported as unusable, but when - // that that status has not yet been recorded to the AOT compiler + // if the instruction set has previously reported as unusable, but the status + // has not yet been recorded to the AOT compiler. void compVerifyInstructionSetUnusable(CORINFO_InstructionSet isa) { - // use compExactlyDependsOn to capture are record the use of the isa + // use compExactlyDependsOn to capture are record the use of the ISA. bool isaUsable = compExactlyDependsOn(isa); // Assert that the is unusable. If true, this function should never be called. assert(!isaUsable); } // Answer the question: Is a particular ISA allowed to be used implicitly by optimizations? - // The result of this api call will match the target machine if the result is true - // If the result is false, then the target machine may have support for the instruction + // The result of this api call will match the target machine if the result is true. + // If the result is false, then the target machine may have support for the instruction. bool compOpportunisticallyDependsOn(CORINFO_InstructionSet isa) const { if ((opts.compSupportsISA & (1ULL << isa)) != 0) diff --git a/src/coreclr/jit/compiler.hpp b/src/coreclr/jit/compiler.hpp index db0d382131e..4fe2afe238e 100644 --- a/src/coreclr/jit/compiler.hpp +++ b/src/coreclr/jit/compiler.hpp @@ -4579,7 +4579,7 @@ inline unsigned short LclVarDsc::lvRefCnt(RefCountState state) const // state: the requestor's expected ref count state; defaults to RCS_NORMAL // // Notes: -// It is currently the caller's responsibilty to ensure this increment +// It is currently the caller's responsibility to ensure this increment // will not cause overflow. inline void LclVarDsc::incLvRefCnt(unsigned short delta, RefCountState state) @@ -4653,7 +4653,7 @@ inline weight_t LclVarDsc::lvRefCntWtd(RefCountState state) const // state: the requestor's expected ref count state; defaults to RCS_NORMAL // // Notes: -// It is currently the caller's responsibilty to ensure this increment +// It is currently the caller's responsibility to ensure this increment // will not cause overflow. inline void LclVarDsc::incLvRefCntWtd(weight_t delta, RefCountState state) diff --git a/src/coreclr/jit/fgprofile.cpp b/src/coreclr/jit/fgprofile.cpp index f5c8093503e..bfd7000486c 100644 --- a/src/coreclr/jit/fgprofile.cpp +++ b/src/coreclr/jit/fgprofile.cpp @@ -2975,7 +2975,7 @@ void EfficientEdgeCountReconstructor::MarkInterestingSwitches(BasicBlock* block, // By default, we're guaranteed to see at least 30 calls to instrumented method, for dynamic PGO. // Hence we require at least 30 observed switch executions. // - // The profitabilty of peeling is related to the dominant fraction. The cost has a constant portion + // The profitability of peeling is related to the dominant fraction. The cost has a constant portion // (at a minimum the cost of a not-taken branch) and a variable portion, plus increased code size. // So we don't want to peel in cases where the dominant fraction is too small. // diff --git a/src/coreclr/jit/gcencode.cpp b/src/coreclr/jit/gcencode.cpp index 0f488747819..f9a5e65b601 100644 --- a/src/coreclr/jit/gcencode.cpp +++ b/src/coreclr/jit/gcencode.cpp @@ -4791,7 +4791,7 @@ void GCInfo::gcInfoRecordGCStackArgLive(GcInfoEncoder* gcInfoEncoder, MakeRegPtr assert(genStackPtr->rpdArg); assert(genStackPtr->rpdArgTypeGet() == rpdARG_PUSH); - // We only need to report these when we're doing fuly-interruptible + // We only need to report these when we're doing fully-interruptible assert(compiler->codeGen->GetInterruptible()); GCENCODER_WITH_LOGGING(gcInfoEncoderWithLog, gcInfoEncoder); @@ -4828,7 +4828,7 @@ void GCInfo::gcInfoRecordGCStackArgsDead(GcInfoEncoder* gcInfoEncoder, // Re-walk that list and mark all outgoing arguments that we're marked as live // earlier, as going dead after the call. - // We only need to report these when we're doing fuly-interruptible + // We only need to report these when we're doing fully-interruptible assert(compiler->codeGen->GetInterruptible()); GCENCODER_WITH_LOGGING(gcInfoEncoderWithLog, gcInfoEncoder); diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp index be00ec67fd7..6d53b566959 100644 --- a/src/coreclr/jit/gentree.cpp +++ b/src/coreclr/jit/gentree.cpp @@ -3703,7 +3703,7 @@ void Compiler::gtWalkOp(GenTree** op1WB, GenTree** op2WB, GenTree* base, bool co */ GenTree* Compiler::gtWalkOpEffectiveVal(GenTree* op) { - for (;;) + while (true) { op = op->gtEffectiveVal(); @@ -13247,7 +13247,7 @@ GenTree* Compiler::gtFoldExprSpecial(GenTree* tree) op = op2->AsColon()->ElseNode(); } - // Clear colon flags only if the qmark itself is not conditionaly executed + // Clear colon flags only if the qmark itself is not conditionally executed if ((tree->gtFlags & GTF_COLON_COND) == 0) { fgWalkTreePre(&op, gtClearColonCond); @@ -15685,7 +15685,7 @@ void dispNodeList(GenTree* list, bool verbose) return; } - for (;;) + while (true) { next = list->gtNext; diff --git a/src/coreclr/jit/gentree.h b/src/coreclr/jit/gentree.h index e2ece66db8c..f9feed9291d 100644 --- a/src/coreclr/jit/gentree.h +++ b/src/coreclr/jit/gentree.h @@ -2208,7 +2208,7 @@ public: // }); // // This function is generally more efficient that the operand iterator and should be preferred over that API for - // hot code, as it affords better opportunities for inlining and acheives shorter dynamic path lengths when + // hot code, as it affords better opportunities for inlining and achieves shorter dynamic path lengths when // deciding how operands need to be accessed. // // Note that this function does not respect `GTF_REVERSE_OPS`. This is always safe in LIR, but may be dangerous @@ -8541,7 +8541,7 @@ inline GenTree* GenTree::gtGetOp2IfPresent() const inline GenTree* GenTree::gtEffectiveVal(bool commaOnly /* = false */) { GenTree* effectiveVal = this; - for (;;) + while (true) { if (effectiveVal->gtOper == GT_COMMA) { diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp index e2360e7f7c8..513460cd63e 100644 --- a/src/coreclr/jit/importer.cpp +++ b/src/coreclr/jit/importer.cpp @@ -8261,7 +8261,7 @@ bool Compiler::impCanPInvokeInlineCallSite(BasicBlock* block) // Sets GTF_CALL_M_PINVOKE on the call for pinvokes. // // Also sets GTF_CALL_UNMANAGED on call for inline pinvokes if the -// call passes a combination of legality and profitabilty checks. +// call passes a combination of legality and profitability checks. // // If GTF_CALL_UNMANAGED is set, increments info.compUnmanagedCallCountWithGCTransition diff --git a/src/coreclr/jit/lowerxarch.cpp b/src/coreclr/jit/lowerxarch.cpp index 65124bfc355..e3b40f19a00 100644 --- a/src/coreclr/jit/lowerxarch.cpp +++ b/src/coreclr/jit/lowerxarch.cpp @@ -5693,7 +5693,7 @@ bool Lowering::TryGetContainableHWIntrinsicOp(GenTreeHWIntrinsic* containingNode case NI_AVX_InsertVector128: case NI_AVX2_InsertVector128: { - // InsertVector128 is special in that that it returns a TYP_SIMD32 but takes a TYP_SIMD16 + // InsertVector128 is special in that it returns a TYP_SIMD32 but takes a TYP_SIMD16. assert(!supportsSIMDScalarLoads); const unsigned expectedSize = 16; diff --git a/src/coreclr/jit/lsra.cpp b/src/coreclr/jit/lsra.cpp index 8c5d0acc180..6ed24c6dbd9 100644 --- a/src/coreclr/jit/lsra.cpp +++ b/src/coreclr/jit/lsra.cpp @@ -2270,7 +2270,7 @@ void LinearScan::checkLastUses(BasicBlock* block) // // Arguments: // block - The block for which we're selecting a predecesor. -// prevBlock - The previous block in in allocation order. +// prevBlock - The previous block in allocation order. // pPredBlockIsAllocated - A debug-only argument that indicates whether any of the predecessors have been seen // in allocation order. // @@ -10272,7 +10272,7 @@ bool LinearScan::IsResolutionMove(GenTree* node) // bool LinearScan::IsResolutionNode(LIR::Range& containingRange, GenTree* node) { - for (;;) + while (true) { if (IsResolutionMove(node)) { diff --git a/src/coreclr/jit/lsra.h b/src/coreclr/jit/lsra.h index 89549dfbf60..32d06c99502 100644 --- a/src/coreclr/jit/lsra.h +++ b/src/coreclr/jit/lsra.h @@ -1359,7 +1359,7 @@ private: // tree nodes are consumed. // - In LSRA_DUMP_REFPOS, which is after the intervals are built, but before // register allocation, each node is dumped, along with all of the RefPositions, - // The Intervals are identifed as Lnnn for lclVar intervals, Innn for for other + // The Intervals are identifed as Lnnn for lclVar intervals, Innn for other // intervals, and Tnnn for internal temps. // - In LSRA_DUMP_POST, which is after register allocation, the registers are // shown. @@ -2222,7 +2222,7 @@ public: // Used by RefTypeDef/Use positions of a multi-reg call node. // Indicates the position of the register that this ref position refers to. // The max bits needed is based on max value of MAX_RET_REG_COUNT value - // across all targets and that happens 4 on on Arm. Hence index value + // across all targets and that happened to be 4 on Arm. Hence index value // would be 0..MAX_RET_REG_COUNT-1. unsigned char multiRegIdx : 2; diff --git a/src/coreclr/jit/lsraarm.cpp b/src/coreclr/jit/lsraarm.cpp index f783134873d..06d807772f3 100644 --- a/src/coreclr/jit/lsraarm.cpp +++ b/src/coreclr/jit/lsraarm.cpp @@ -173,7 +173,7 @@ int LinearScan::BuildShiftLongCarry(GenTree* tree) } //------------------------------------------------------------------------ -// BuildNode: Build the RefPositions for for a node +// BuildNode: Build the RefPositions for a node // // Arguments: // treeNode - the node of interest diff --git a/src/coreclr/jit/lsraarm64.cpp b/src/coreclr/jit/lsraarm64.cpp index f9a5bfa98d5..d0961b2785d 100644 --- a/src/coreclr/jit/lsraarm64.cpp +++ b/src/coreclr/jit/lsraarm64.cpp @@ -26,7 +26,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX #include "lower.h" //------------------------------------------------------------------------ -// BuildNode: Build the RefPositions for for a node +// BuildNode: Build the RefPositions for a node // // Arguments: // treeNode - the node of interest diff --git a/src/coreclr/jit/lsraloongarch64.cpp b/src/coreclr/jit/lsraloongarch64.cpp index b00b9c27b16..e040ada477d 100644 --- a/src/coreclr/jit/lsraloongarch64.cpp +++ b/src/coreclr/jit/lsraloongarch64.cpp @@ -26,7 +26,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX #include "lower.h" //------------------------------------------------------------------------ -// BuildNode: Build the RefPositions for for a node +// BuildNode: Build the RefPositions for a node // // Arguments: // treeNode - the node of interest diff --git a/src/coreclr/jit/lsraxarch.cpp b/src/coreclr/jit/lsraxarch.cpp index 1e5f03463c8..f85ad2aa72b 100644 --- a/src/coreclr/jit/lsraxarch.cpp +++ b/src/coreclr/jit/lsraxarch.cpp @@ -26,7 +26,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX #include "lower.h" //------------------------------------------------------------------------ -// BuildNode: Build the RefPositions for for a node +// BuildNode: Build the RefPositions for a node // // Arguments: // treeNode - the node of interest diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp index bf6dd801857..b709065e65c 100644 --- a/src/coreclr/jit/morph.cpp +++ b/src/coreclr/jit/morph.cpp @@ -1606,7 +1606,7 @@ void CallArgs::EvalArgsToTemps(Compiler* comp, GenTreeCall* call) // For GT_MKREFANY, typically the actual struct copying does // not have any side-effects and can be delayed. So instead // of using a temp for the whole struct, we can just use a temp - // for operand that that has a side-effect + // for operand that has a side-effect. GenTree* operand; if ((argx->AsOp()->gtOp2->gtFlags & GTF_ALL_EFFECT) == 0) { diff --git a/src/coreclr/jit/morphblock.cpp b/src/coreclr/jit/morphblock.cpp index 882a67c2304..0cd61f5830a 100644 --- a/src/coreclr/jit/morphblock.cpp +++ b/src/coreclr/jit/morphblock.cpp @@ -290,7 +290,7 @@ void MorphInitBlockHelper::PrepareSrc() //------------------------------------------------------------------------ // TrySpecialCases: check special cases that require special transformations. -// We don't have any for for init block. +// We don't have any for init block. // void MorphInitBlockHelper::TrySpecialCases() { diff --git a/src/coreclr/jit/optcse.cpp b/src/coreclr/jit/optcse.cpp index 335a4c1d4fb..096b7eaeb54 100644 --- a/src/coreclr/jit/optcse.cpp +++ b/src/coreclr/jit/optcse.cpp @@ -1218,7 +1218,7 @@ public: } // At the end of the merge store results of the dataflow equations, in a postmerge state. - // We also handle the case where calls conditionally kill CSE availabilty. + // We also handle the case where calls conditionally kill CSE availability. // bool EndMerge(BasicBlock* block) { @@ -1251,9 +1251,9 @@ public: // If it is 'true' then the initial value of m_preMergeOut was different than the final value that // we computed for bbCseOut. When it is true we will visit every the successor of 'block' // - // This is also why we need to allocate an extra bit in our cseLivenessTrair BitVecs. - // We always need to visit our successor blocks once, thus we require that that the first time - // that we visit a block we have a bit set in m_preMergeOut that won't be set when we compute + // This is also why we need to allocate an extra bit in our cseLivenessTraits BitVecs. + // We always need to visit our successor blocks once, thus we require that the first time + // we visit a block we have a bit set in m_preMergeOut that won't be set when we compute // the new value of bbCseOut. // bool notDone = !BitVecOps::Equal(m_comp->cseLivenessTraits, block->bbCseOut, m_preMergeOut); @@ -1887,7 +1887,7 @@ public: // The enregCount only tracks the uses of integer registers // - // We could track floating point register usage seperately + // We could track floating point register usage separately // but it isn't worth the additional complexity as floating point CSEs // are rare and we typically have plenty of floating point register available. // diff --git a/src/coreclr/jit/simdintrinsiclist.h b/src/coreclr/jit/simdintrinsiclist.h index bb48b01e7f0..6b1b5f80f12 100644 --- a/src/coreclr/jit/simdintrinsiclist.h +++ b/src/coreclr/jit/simdintrinsiclist.h @@ -15,7 +15,7 @@ a) TYP_UNKNOWN means 'baseType' of SIMD vector which is not known apriori b) Each method maps to a unique intrinsic Id c) To facilitate argument types to be used as an array initializer, args are listed within "{}" braces. - d) Since comma is used as actual param seperator in a macro, TYP_UNDEF entries are added to keep param count constant. + d) Since comma is used as actual param separator in a macro, TYP_UNDEF entries are added to keep param count constant. e) TODO-Cleanup: when we plumb TYP_SIMD through front-end, replace TYP_STRUCT with TYP_SIMD. */ diff --git a/src/coreclr/jit/smallhash.h b/src/coreclr/jit/smallhash.h index 6f72b1e9ab6..a8df1b89569 100644 --- a/src/coreclr/jit/smallhash.h +++ b/src/coreclr/jit/smallhash.h @@ -94,7 +94,7 @@ struct HashTableInfo<unsigned> // // Resolving collisions using a bucket chain avoids the primary clustering // issue common in linearly-probed open addressed hash tables, while using -// buckets as chain nodes avoids the allocaiton traffic typical of chained +// buckets as chain nodes avoids the allocation traffic typical of chained // tables. Applying the hopscotch algorithm in the aforementioned paper // could further improve performance by optimizing access patterns for // better cache usage. diff --git a/src/coreclr/jit/valuenum.h b/src/coreclr/jit/valuenum.h index 52733875119..734011625c0 100644 --- a/src/coreclr/jit/valuenum.h +++ b/src/coreclr/jit/valuenum.h @@ -22,7 +22,7 @@ // In addition to classical numbering, this implementation also performs disambiguation of heap writes, // using memory SSA and the following aliasing model: // -// 1. Arrays of different types do not alias - taking into account the array compatibilty rules, i. e. +// 1. Arrays of different types do not alias - taking into account the array compatibility rules, i. e. // "int[] <-> uint[]" and such being allowed. // 2. Different static fields do not alias (meaning mutable overlapping RVA statics are not supported). // 3. Different class fields do not alias. Struct fields are allowed to alias - this supports code that diff --git a/src/coreclr/md/compiler/regmeta_emit.cpp b/src/coreclr/md/compiler/regmeta_emit.cpp index ed57397560c..2f4b00be2b2 100644 --- a/src/coreclr/md/compiler/regmeta_emit.cpp +++ b/src/coreclr/md/compiler/regmeta_emit.cpp @@ -890,7 +890,7 @@ HRESULT RegMeta::RefToDefOptimization() } // In the case of global function, we have tkParent as m_tdModule. - // We will always do the optmization. + // We will always do the optimization. if (TypeFromToken(tkParent) == mdtTypeRef) { // If we're preserving local typerefs, skip this token diff --git a/src/coreclr/md/enc/metamodelrw.cpp b/src/coreclr/md/enc/metamodelrw.cpp index 0bf150e44e4..21fa4e0409a 100644 --- a/src/coreclr/md/enc/metamodelrw.cpp +++ b/src/coreclr/md/enc/metamodelrw.cpp @@ -528,7 +528,7 @@ private: int iLast; int nResult; - for (;;) + while (true) { // if less than two elements you're done. if (iLeft >= iRight) @@ -2861,7 +2861,7 @@ CMiniMdRW::PreSaveFull() m_bPreSaveDone = true; - // send the Ref->Def optmization notification to host + // send the Ref->Def optimization notification to host if (m_pHandler != NULL) { TOKENMAP * ptkmap = GetMemberRefToMemberDefMap(); @@ -5692,7 +5692,7 @@ CMiniMdRW::LookUpTableByCol( ridEnd = ridBegin + 1; // Search back to start of group. - for (;;) + while (true) { if (ridBegin <= 1) { @@ -5712,7 +5712,7 @@ CMiniMdRW::LookUpTableByCol( // If desired, search forward to end of group. if (pRidEnd != NULL) { - for (;;) + while (true) { if (ridEnd > GetCountRecs(ixTbl)) { @@ -7186,7 +7186,7 @@ VirtualSort::SortRange( HRESULT hr; int iLast; - for (;;) + while (true) { // if less than two elements you're done. if (iLeft >= iRight) diff --git a/src/coreclr/md/inc/mdinternalrw.h b/src/coreclr/md/inc/mdinternalrw.h index ad1dc9a6cc7..144d63b1189 100644 --- a/src/coreclr/md/inc/mdinternalrw.h +++ b/src/coreclr/md/inc/mdinternalrw.h @@ -353,7 +353,7 @@ public: mdMethodDef mb); // The method for which to get props. //***************************************** - // return method implementation informaiton, like RVA and implflags + // return method implementation information, like RVA and implflags //***************************************** __checkReturn STDMETHODIMP GetMethodImplProps( diff --git a/src/coreclr/md/inc/verifylayouts.h b/src/coreclr/md/inc/verifylayouts.h index efe3acee471..c5c0829089e 100644 --- a/src/coreclr/md/inc/verifylayouts.h +++ b/src/coreclr/md/inc/verifylayouts.h @@ -11,7 +11,7 @@ // The code in MD\DataSource\TargetTypes.* takes a direct dependency on // the layouts of types in MD. This is used by the debugger to read metadata -// from a seperate process by deserializing the memory for these datastructures. +// from a separate process by deserializing the memory for these datastructures. // // You are probably reading this comment because you changed a layout and // one of the static_asserts failed during build. This is what you should diff --git a/src/coreclr/md/runtime/mdinternalro.h b/src/coreclr/md/runtime/mdinternalro.h index 976a280ba1f..b76c2f40672 100644 --- a/src/coreclr/md/runtime/mdinternalro.h +++ b/src/coreclr/md/runtime/mdinternalro.h @@ -337,7 +337,7 @@ public: mdMethodDef mb); // The method for which to get props. //***************************************** - // return method implementation informaiton, like RVA and implflags + // return method implementation information, like RVA and implflags //***************************************** __checkReturn STDMETHODIMP GetMethodImplProps( diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Array.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Array.NativeAot.cs index 97cf9e23876..9c801d70b0e 100644 --- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Array.NativeAot.cs +++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Array.NativeAot.cs @@ -874,7 +874,7 @@ namespace System } } - // Allocate new multidimensional array of given dimensions. Assumes that that pLengths is immutable. + // Allocate new multidimensional array of given dimensions. Assumes that pLengths is immutable. internal static unsafe Array NewMultiDimArray(EETypePtr eeType, int* pLengths, int rank) { Debug.Assert(eeType.IsArray && !eeType.IsSzArray); diff --git a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallConverterThunk.cs b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallConverterThunk.cs index a806f6f660d..27dad91d460 100644 --- a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallConverterThunk.cs +++ b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallConverterThunk.cs @@ -1391,7 +1391,7 @@ namespace Internal.Runtime.TypeLoader { // X86 needs to pass callee pop information to the return value thunks, so, since it // only has 2 argument registers and may/may not need to return 8 bytes of data, put the return - // data in a seperate thread local store passed in the other available register (edx) + // data in a separate thread local store passed in the other available register (edx) fixed (ReturnBlock* actualReturnDataStructAddress = &t_NonArgRegisterReturnSpace) { diff --git a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/LazyVtableResolverThunk.cs b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/LazyVtableResolverThunk.cs index fb62bf13836..fad80851160 100644 --- a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/LazyVtableResolverThunk.cs +++ b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/LazyVtableResolverThunk.cs @@ -545,7 +545,7 @@ namespace Internal.Runtime.TypeLoader } /// <summary> - /// Does a method actually recieve a VTable slot. (Must not be called for interface methods) + /// Does a method actually receive a VTable slot. (Must not be called for interface methods) /// </summary> /// <param name="method"></param> /// <returns></returns> diff --git a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/ReferenceSource/amd64/cGenCpu.h b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/ReferenceSource/amd64/cGenCpu.h index 5dabbf7b190..b4e577da5e2 100644 --- a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/ReferenceSource/amd64/cGenCpu.h +++ b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/ReferenceSource/amd64/cGenCpu.h @@ -62,7 +62,7 @@ EXTERN_C void FastCallFinalizeWorker(Object *obj, PCODE funcPtr); #define HAS_THISPTR_RETBUF_PRECODE 1 #define CODE_SIZE_ALIGN 16 // must alloc code blocks on 8-byte boundaries; for perf reasons we use 16 byte boundaries -#define CACHE_LINE_SIZE 64 // Current AMD64 processors have 64-byte cache lines as per AMD64 optmization manual +#define CACHE_LINE_SIZE 64 // Current AMD64 processors have 64-byte cache lines as per AMD64 optimization manual #define LOG2SLOT LOG2_PTRSIZE #define ENREGISTERED_RETURNTYPE_MAXSIZE 8 // bytes @@ -124,7 +124,7 @@ ARG_SLOT FPSpillToR4(void* pSpillSlot) return *(DWORD*)pSpillSlot; } -inline +inline ARG_SLOT FPSpillToR8(void* pSpillSlot) { LIMITED_METHOD_CONTRACT; @@ -265,7 +265,7 @@ struct EHContext { // Exception handling //********************************************************************** -inline PCODE GetIP(const CONTEXT * context) +inline PCODE GetIP(const CONTEXT * context) { CONTRACTL { @@ -281,7 +281,7 @@ inline PCODE GetIP(const CONTEXT * context) return PCODE(context->Rip); } -inline void SetIP(CONTEXT* context, PCODE rip) +inline void SetIP(CONTEXT* context, PCODE rip) { CONTRACTL { @@ -305,14 +305,14 @@ inline TADDR GetSP(const CONTEXT * context) NOTHROW; GC_NOTRIGGER; SUPPORTS_DAC; - + PRECONDITION(CheckPointer(context)); } CONTRACTL_END; return (TADDR)context->Rsp; } -inline void SetSP(CONTEXT *context, TADDR rsp) +inline void SetSP(CONTEXT *context, TADDR rsp) { CONTRACTL { @@ -320,7 +320,7 @@ inline void SetSP(CONTEXT *context, TADDR rsp) NOTHROW; GC_NOTRIGGER; SUPPORTS_DAC; - + PRECONDITION(CheckPointer(context)); } CONTRACTL_END; @@ -397,7 +397,7 @@ extern "C" void getFPReturn(int fpSize, INT64 *retval); struct ComToManagedExRecord; // defined in cgencpu.cpp -inline BOOL IsUnmanagedValueTypeReturnedByRef(UINT sizeofvaluetype) +inline BOOL IsUnmanagedValueTypeReturnedByRef(UINT sizeofvaluetype) { LIMITED_METHOD_CONTRACT; @@ -422,7 +422,7 @@ DECLSPEC_ALIGN(8) struct UMEntryThunkCode BYTE m_padding[4]; BYTE m_movR10[2]; // MOV R10, LPVOID m_uet; // pointer to start of this structure - BYTE m_movRAX[2]; // MOV RAX, + BYTE m_movRAX[2]; // MOV RAX, DECLSPEC_ALIGN(8) const BYTE* m_execstub; // pointer to destination code // ensure this is qword aligned BYTE m_jmpRAX[3]; // JMP RAX @@ -442,7 +442,7 @@ DECLSPEC_ALIGN(8) struct UMEntryThunkCode LIMITED_METHOD_CONTRACT; return offsetof(UMEntryThunkCode, m_movR10); - } + } }; #include <poppack.h> @@ -456,7 +456,7 @@ DWORD GetOffsetAtEndOfFunction(ULONGLONG uImageBase, // ClrFlushInstructionCache is used when we want to call FlushInstructionCache // for a specific architecture in the common code, but not for other architectures. -// We call ClrFlushInstructionCache whenever we create or modify code in the heap. +// We call ClrFlushInstructionCache whenever we create or modify code in the heap. // Currently ClrFlushInstructionCache has no effect on AMD64 // diff --git a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/ReferenceSource/i386/asmhelpers.asm b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/ReferenceSource/i386/asmhelpers.asm index e95e0c67bde..82cbe6a4d9d 100644 --- a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/ReferenceSource/i386/asmhelpers.asm +++ b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/ReferenceSource/i386/asmhelpers.asm @@ -62,7 +62,7 @@ EXTERN _VarargPInvokeStubWorker@12:PROC EXTERN _GenericPInvokeCalliStubWorker@12:PROC ; To debug that LastThrownObjectException really is EXCEPTION_COMPLUS -ifdef TRACK_CXX_EXCEPTION_CODE_HACK +ifdef TRACK_CXX_EXCEPTION_CODE_HACK EXTERN __imp____CxxFrameHandler:PROC endif @@ -130,7 +130,7 @@ endif ; _DEBUG PUSH_CPFH_FOR_COM macro trashReg, pFrameBaseReg, pFrameOffset ; - ; Setup the FrameHandlerExRecord + ; Setup the FrameHandlerExRecord ; push dword ptr [pFrameBaseReg + pFrameOffset] push _COMPlusFrameHandlerRevCom @@ -257,7 +257,7 @@ ResetCurrentContext ENDP ;Incoming: ; ESP+4: Pointer to buffer to which FPU state should be saved _CaptureFPUContext@4 PROC public - + mov ecx, [esp+4] fnstenv [ecx] retn 4 @@ -267,7 +267,7 @@ _CaptureFPUContext@4 ENDP ; Incoming: ; ESP+4: Pointer to buffer from which FPU state should be restored _RestoreFPUContext@4 PROC public - + mov ecx, [esp+4] fldenv [ecx] retn 4 @@ -299,23 +299,23 @@ ___CxxFrameHandler3 PROC public mov edx, [esp + 0ch] ; grab the first argument mov edx, [edx] ; grab the SEH exception code - + mov dword ptr [eax + Thread_m_LastCxxSEHExceptionCode], edx -Chain: +Chain: pop edx ; [esp] contains the value of EAX we must restore. We would like ; [esp] to contain the address of the real imported CxxFrameHandler ; so we can chain to it. - + mov eax, [__imp____CxxFrameHandler] mov eax, [eax] xchg [esp], eax - + ret - + ___CxxFrameHandler3 ENDP endif ; _DEBUG endif ; FEATURE_CORECLR @@ -338,11 +338,11 @@ CallRtlUnwind ENDP _ResumeAtJitEHHelper@4 PROC public mov edx, [esp+4] ; edx = pContext (EHContext*) - + mov ebx, [edx+EHContext_Ebx] mov esi, [edx+EHContext_Esi] mov edi, [edx+EHContext_Edi] - mov ebp, [edx+EHContext_Ebp] + mov ebp, [edx+EHContext_Ebp] mov ecx, [edx+EHContext_Esp] mov eax, [edx+EHContext_Eip] mov [ecx-4], eax @@ -354,8 +354,8 @@ _ResumeAtJitEHHelper@4 PROC public mov [ecx-10h], eax lea esp, [ecx-10h] pop edx - pop ecx - pop eax + pop ecx + pop eax ret _ResumeAtJitEHHelper@4 ENDP @@ -431,14 +431,14 @@ ifdef _DEBUG nop ; Indicate that it is OK to call managed code directly from here endif - ; Reflect the changes to the context and only update non-volatile registers. + ; Reflect the changes to the context and only update non-volatile registers. ; This will be used later to update REGDISPLAY - mov edx, [esp+12+12] + mov edx, [esp+12+12] mov [edx+EHContext_Ebx], ebx mov [edx+EHContext_Esi], esi mov [edx+EHContext_Edi], edi mov [edx+EHContext_Ebp], ebp - + pop edi pop esi pop ebx @@ -458,7 +458,7 @@ _GetSpecificCpuTypeAsm@0 PROC public push ecx popfd ; Save the updated flags. pushfd - pop ecx ; Retrive the updated flags + pop ecx ; Retrieve the updated flags xor ecx, eax ; Test if it actually changed (bit set means yes) push eax popfd ; Restore the flags @@ -500,7 +500,7 @@ _GetSpecificCpuFeaturesAsm@4 PROC public push ecx popfd ; Save the updated flags. pushfd - pop ecx ; Retrive the updated flags + pop ecx ; Retrieve the updated flags xor ecx, eax ; Test if it actually changed (bit set means yes) push eax popfd ; Restore the flags @@ -648,7 +648,7 @@ cachemiss: pop edi pop esi pop edx - + ; jump back up to the epilog jmp complete @@ -670,7 +670,7 @@ complete: ; Jump to callsite jmp eax - + ; This will never be executed. It is just to help out stack-walking logic ; which disassembles the epilog to unwind the stack. ret @@ -1052,8 +1052,8 @@ endif ; FEATURE_HIJACK ; void __stdcall JIT_EndCatch(); JIT_EndCatch PROC stdcall public - ; make temp storage for return address, and push the address of that - ; as the last arg to COMPlusEndCatch + ; make temp storage for return address, and push the address of that + ; as the last arg to COMPlusEndCatch mov ecx, [esp] push ecx; push esp; @@ -1064,7 +1064,7 @@ JIT_EndCatch PROC stdcall public push ebx push ebp - call _COMPlusEndCatch@20 ; returns old esp value in eax, stores jump address + call _COMPlusEndCatch@20 ; returns old esp value in eax, stores jump address ; now eax = new esp, [esp] = new eip pop edx ; edx = new eip @@ -1310,7 +1310,7 @@ ifdef FEATURE_REMOTING _CRemotingServices__DispatchInterfaceCall@0 proc public ; push MethodDesc* passed in eax by precode and forward to the worker push eax - + ; NOTE: At this point the stack looks like ; ; esp---> saved MethodDesc of Interface method @@ -1470,10 +1470,10 @@ _ProfileEnterNaked@4 proc public push ebp ; Methods are always EBP framed add [esp], 8 ; Skip past the return IP, straight to the stack args that were passed to our caller ; Skip past saved EBP value: 4 bytes - ; - plus return address from caller's caller: 4 bytes + ; - plus return address from caller's caller: 4 bytes ; - ; Assuming Foo() calls Bar(), and Bar() calls ProfileEnterNake() as illustrated (stack - ; grows up). We want to get what Foo() passed on the stack to Bar(), so we need to pass + ; Assuming Foo() calls Bar(), and Bar() calls ProfileEnterNake() as illustrated (stack + ; grows up). We want to get what Foo() passed on the stack to Bar(), so we need to pass ; the return address from caller's caller which is Foo() in this example. ; ; ProfileEnterNaked() @@ -1494,8 +1494,8 @@ _ProfileEnterNaked@4 proc public mov edx, esp ; the address of the Platform structure mov ecx, [esp+52]; The functionIDOrClientID parameter that was pushed to FunctionEnter ; Skip past ProfilePlatformSpecificData we pushed: 40 bytes - ; - plus saved edi, esi : 8 bytes - ; - plus return address from caller: 4 bytes + ; - plus saved edi, esi : 8 bytes + ; - plus return address from caller: 4 bytes call @ProfileEnter@8 @@ -1523,10 +1523,10 @@ _ProfileLeaveNaked@4 proc public push ebp ; Methods are always EBP framed add [esp], 8 ; Skip past the return IP, straight to the stack args that were passed to our caller ; Skip past saved EBP value: 4 bytes - ; - plus return address from caller's caller: 4 bytes + ; - plus return address from caller's caller: 4 bytes ; - ; Assuming Foo() calls Bar(), and Bar() calls ProfileEnterNake() as illustrated (stack - ; grows up). We want to get what Foo() passed on the stack to Bar(), so we need to pass + ; Assuming Foo() calls Bar(), and Bar() calls ProfileEnterNake() as illustrated (stack + ; grows up). We want to get what Foo() passed on the stack to Bar(), so we need to pass ; the return address from caller's caller which is Foo() in this example. ; ; ProfileEnterNaked() @@ -1540,7 +1540,7 @@ _ProfileLeaveNaked@4 proc public push eax ; -- struct eax field ; Check if we need to save off any floating point registers - fstsw ax + fstsw ax and ax, 3800h ; Check the top-of-fp-stack bits cmp ax, 0 ; If non-zero, we have something to save jnz SaveFPReg @@ -1553,7 +1553,7 @@ _ProfileLeaveNaked@4 proc public SaveFPReg: push 1 ; mark that a float value is present -- struct floatingPointValuePresent field - sub esp, 4 ; Make room for the FP value + sub esp, 4 ; Make room for the FP value fst dword ptr [esp] ; Copy the FP value to the buffer as a float -- struct floatBuffer field sub esp, 8 ; Make room for the FP value fstp qword ptr [esp] ; Copy FP values to the buffer as a double -- struct doubleBuffer1 and doubleBuffer2 fields @@ -1564,8 +1564,8 @@ Continue: mov edx, esp ; the address of the Platform structure mov ecx, [esp+52]; The clientData that was pushed to FunctionEnter ; Skip past ProfilePlatformSpecificData we pushed: 40 bytes - ; - plus saved edx, ecx : 8 bytes - ; - plus return address from caller: 4 bytes + ; - plus saved edx, ecx : 8 bytes + ; - plus return address from caller: 4 bytes call @ProfileLeave@8 @@ -1601,10 +1601,10 @@ _ProfileTailcallNaked@4 proc public push ebp ; Methods are always EBP framed add [esp], 8 ; Skip past the return IP, straight to the stack args that were passed to our caller ; Skip past saved EBP value: 4 bytes - ; - plus return address from caller's caller: 4 bytes + ; - plus return address from caller's caller: 4 bytes ; - ; Assuming Foo() calls Bar(), and Bar() calls ProfileEnterNake() as illustrated (stack - ; grows up). We want to get what Foo() passed on the stack to Bar(), so we need to pass + ; Assuming Foo() calls Bar(), and Bar() calls ProfileEnterNake() as illustrated (stack + ; grows up). We want to get what Foo() passed on the stack to Bar(), so we need to pass ; the return address from caller's caller which is Foo() in this example. ; ; ProfileEnterNaked() @@ -1625,8 +1625,8 @@ _ProfileTailcallNaked@4 proc public mov edx, esp ; the address of the Platform structure mov ecx, [esp+52]; The clientData that was pushed to FunctionEnter ; Skip past ProfilePlatformSpecificData we pushed: 40 bytes - ; - plus saved edx, ecx : 8 bytes - ; - plus return address from caller: 4 bytes + ; - plus saved edx, ecx : 8 bytes + ; - plus return address from caller: 4 bytes call @ProfileTailcall@8 @@ -1642,25 +1642,25 @@ _ProfileTailcallNaked@4 endp ; EAX - the NDirectMethodDesc ; ECX - may be return buffer address ; [ESP + 4] - the VASigCookie -; +; _VarargPInvokeStub@0 proc public ; EDX <- VASigCookie mov edx, [esp + 4] ; skip retaddr mov edx, [edx + VASigCookie__StubOffset] test edx, edx - + jz GoCallVarargWorker ; --------------------------------------- - + ; EAX contains MD ptr for the IL stub jmp edx - + GoCallVarargWorker: ; ; MD ptr in EAX, VASigCookie ptr at [esp+4] ; - + STUB_PROLOG mov esi, esp @@ -1676,7 +1676,7 @@ GoCallVarargWorker: ; restore pMD pop eax - + STUB_EPILOG ; jump back to the helper - this time it won't come back here as the stub already exists @@ -1689,7 +1689,7 @@ _VarargPInvokeStub@0 endp ; EAX - the unmanaged target ; ECX, EDX - arguments ; [ESP + 4] - the VASigCookie -; +; _GenericPInvokeCalliHelper@0 proc public ; save the target push eax @@ -1699,10 +1699,10 @@ _GenericPInvokeCalliHelper@0 proc public mov eax, [eax + VASigCookie__StubOffset] test eax, eax - + jz GoCallCalliWorker ; --------------------------------------- - + push eax ; stack layout at this point: @@ -1718,11 +1718,11 @@ _GenericPInvokeCalliHelper@0 proc public ; +----------------------+ ; | stub entry point | ESP + 0 ; ------------------------ - + ; remove VASigCookie from the stack mov eax, [esp + 8] mov [esp + 12], eax - + ; move stub entry point below the RA mov eax, [esp] mov [esp + 8], eax @@ -1730,7 +1730,7 @@ _GenericPInvokeCalliHelper@0 proc public ; load EAX with the target address pop eax pop eax - + ; stack layout at this point: ; ; | ... | @@ -1743,7 +1743,7 @@ _GenericPInvokeCalliHelper@0 proc public ; CALLI target address is in EAX ret - + GoCallCalliWorker: ; the target is on the stack and will become m_Datum of PInvokeCalliFrame ; call the stub generating worker @@ -1752,7 +1752,7 @@ GoCallCalliWorker: ; ; target ptr in EAX, VASigCookie ptr in EDX ; - + STUB_PROLOG mov esi, esp @@ -1768,7 +1768,7 @@ GoCallCalliWorker: ; restore target pop eax - + STUB_EPILOG ; jump back to the helper - this time it won't come back here as the stub already exists @@ -1785,15 +1785,15 @@ ifdef MDA_SUPPORTED ; actual imbalance check is implemented. ; [ESP + 4] - the StackImbalanceCookie ; [EBP + 8] - stack arguments (EBP frame pushed by the calling stub) -; +; _PInvokeStackImbalanceHelper@0 proc public ; StackImbalanceCookie to EBX push ebx lea ebx, [esp + 8] - + push esi push edi - + ; copy stack args mov edx, ecx mov ecx, [ebx + StackImbalanceCookie__m_dwStackArgSize] @@ -1805,10 +1805,10 @@ _PInvokeStackImbalanceHelper@0 proc public cld rep movsd - + ; record pre-call ESP mov [ebx + StackImbalanceCookie__m_dwSavedEsp], esp - + ; call the target (restore ECX in case it's a thiscall) mov ecx, edx call [ebx + StackImbalanceCookie__m_pTarget] @@ -1821,9 +1821,9 @@ _PInvokeStackImbalanceHelper@0 proc public push eax push edx sub esp, 12 - + .errnz (StackImbalanceCookie__HAS_FP_RETURN_VALUE AND 00ffffffh), HAS_FP_RETURN_VALUE has changed - update asm code - + ; save top of the floating point stack if the target has FP retval test byte ptr [ebx + StackImbalanceCookie__m_callConv + 3], (StackImbalanceCookie__HAS_FP_RETURN_VALUE SHR 24) jz noFPURetVal @@ -1850,7 +1850,7 @@ noFPURetValToRestore: pop esi pop ebx - + ; EBP frame and original stack arguments will be removed by the caller ret _PInvokeStackImbalanceHelper@0 endp @@ -1863,7 +1863,7 @@ ifdef FEATURE_COMINTEROP ; This is a fast alternative to CallDescr* tailored specifically for ; COM to CLR calls. Stack arguments don't come in a continuous buffer ; and secret argument can be passed in EAX. -; +; ; extern "C" ARG_SLOT __fastcall COMToCLRDispatchHelper( ; INT_PTR dwArgECX, ; ecx @@ -1880,11 +1880,11 @@ FASTCALL_FUNC COMToCLRDispatchHelper, 32 ; ecx: dwArgECX ; edx: dwArgEDX - offset_pTarget equ 4 - offset_pSecretArg equ 8 - offset_pInputStack equ 0Ch + offset_pTarget equ 4 + offset_pSecretArg equ 8 + offset_pInputStack equ 0Ch offset_wOutputStackSlots equ 10h - offset_pOutputStackOffsets equ 14h + offset_pOutputStackOffsets equ 14h offset_pCurFrame equ 18h movzx eax, word ptr [esp + offset_wOutputStackSlots] @@ -1892,7 +1892,7 @@ FASTCALL_FUNC COMToCLRDispatchHelper, 32 jnz CopyStackArgs ; There are no stack args to copy and ECX and EDX are already setup - ; with the correct arguments for the callee, so we just have to + ; with the correct arguments for the callee, so we just have to ; push the CPFH and make the call. PUSH_CPFH_FOR_COM eax, esp, offset_pCurFrame ; trashes eax @@ -1975,11 +1975,11 @@ ifndef FEATURE_CORECLR _CopyCtorCallStub@0 proc public ; there may be an argument in ecx - save it push ecx - + ; push pointer to arguments lea edx, [esp + 8] push edx - + call _CopyCtorCallStubWorker@4 ; restore ecx and tail call to the target @@ -2005,7 +2005,7 @@ _StubDispatchFixupStub@0 proc public push esi ; pTransitionBlock call _StubDispatchFixupWorker@16 - + STUB_EPILOG _StubDispatchFixupPatchLabel@0: @@ -2047,14 +2047,14 @@ _ExternalMethodFixupStub@0 proc public ; NULL (it throws an exception if stub creation fails.) ; From here on, mustn't trash eax - + STUB_EPILOG _ExternalMethodFixupPatchLabel@0: public _ExternalMethodFixupPatchLabel@0 ; Tailcall target - jmp eax + jmp eax ; This will never be executed. It is just to help out stack-walking logic ; which disassembles the epilog to unwind the stack. @@ -2084,7 +2084,7 @@ _DelayLoad_MethodCall@0 proc public ; NULL (it throws an exception if stub creation fails.) ; From here on, mustn't trash eax - + STUB_EPILOG ; Share the patch label @@ -2101,7 +2101,7 @@ endif ; The call in softbound vtable slots initially points to this function. ; The pupose of this function is to transfer the control to right target and ; to optionally patch the target of the jump so that we do not take this slow path again. -; +; _VirtualMethodFixupStub@0 proc public pop eax ; Pop the return address. It points right after the call instruction in the thunk. @@ -2114,7 +2114,7 @@ _VirtualMethodFixupStub@0 proc public ; Preserve argument registers push ecx push edx - + push eax ; address of the thunk push ecx ; this ptr call _VirtualMethodFixupWorker@8 @@ -2148,10 +2148,10 @@ _ThePreStub@0 proc public mov esi, esp - ; EAX contains MethodDesc* from the precode. Push it here as argument - ; for PreStubWorker + ; EAX contains MethodDesc* from the precode. Push it here as argument + ; for PreStubWorker push eax - + push esi call _PreStubWorker@8 @@ -2160,12 +2160,12 @@ _ThePreStub@0 proc public ; NULL (it throws an exception if stub creation fails.) ; From here on, mustn't trash eax - + STUB_EPILOG - + ; Tailcall target jmp eax - + ; This will never be executed. It is just to help out stack-walking logic ; which disassembles the epilog to unwind the stack. ret @@ -2209,12 +2209,12 @@ _GenericComPlusCallStub@0 proc public ; Get pComPlusCallInfo for return thunk mov ecx, [ebx + ComPlusCallMethodDesc__m_pComPlusCallInfo] - + STUB_EPILOG_RETURN - + ; Tailcall return thunk jmp [ecx + ComPlusCallInfo__m_pRetThunk] - + ; This will never be executed. It is just to help out stack-walking logic ; which disassembles the epilog to unwind the stack. ret @@ -2292,7 +2292,7 @@ _TransparentProxyStub_CrossContext@0 proc public ; From here on, mustn't trash eax:edx mov ecx, ebx ; cbStackPop - + mov ebx, [esp+6*4] ; get retaddr mov [esp+6*4+ecx], ebx ; put it where it belongs @@ -2317,7 +2317,7 @@ endif ; FEATURE_REMOTING ifdef FEATURE_COMINTEROP ;-------------------------------------------------------------------------- -; This is the code that all com call method stubs run initially. +; This is the code that all com call method stubs run initially. ; Most of the real work occurs in ComStubWorker(), a C++ routine. ; The template only does the part that absolutely has to be in assembly ; language. @@ -2339,7 +2339,7 @@ _ComCallPreStub@0 proc public lea edi, [esp] lea esi, [esp+3*4] - + push edi ; pErrorReturn push esi ; pFrame call _ComPreStubWorker@8 @@ -2363,10 +2363,10 @@ _ComCallPreStub@0 proc public nostub: - ; Even though the ComPreStubWorker sets a 64 bit value as the error return code. - ; Only the lower 32 bits contain usefula data. The reason for this is that the + ; Even though the ComPreStubWorker sets a 64 bit value as the error return code. + ; Only the lower 32 bits contain usefula data. The reason for this is that the ; possible error return types are: failure HRESULT, 0 and floating point 0. - ; In each case, the data fits in 32 bits. Instead, we use the upper half of + ; In each case, the data fits in 32 bits. Instead, we use the upper half of ; the return value to store number of bytes to pop mov eax, [edi] mov edx, [edi+4] @@ -2383,7 +2383,7 @@ nostub: add esp, edx ; pop bytes of the stack push ecx ; return address - ; We need to deal with the case where the method is PreserveSig=true and has an 8 + ; We need to deal with the case where the method is PreserveSig=true and has an 8 ; byte return type. There are 2 types of 8 byte return types: integer and floating point. ; For integer 8 byte return types, we always return 0 in case of failure. For floating ; point return types, we return the value in the floating point register. In both cases @@ -2411,7 +2411,7 @@ _DelayLoad_Helper&suffix&@0 proc public push ecx ; module push edx ; section index - push eax ; indirection cell address. + push eax ; indirection cell address. push esi ; pTransitionBlock call _DynamicHelperWorker@20 diff --git a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.ConstructedGenericsRegistration.cs b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.ConstructedGenericsRegistration.cs index 1eea5e42b1b..6cee4bd31ab 100644 --- a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.ConstructedGenericsRegistration.cs +++ b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.ConstructedGenericsRegistration.cs @@ -52,7 +52,7 @@ namespace Internal.Runtime.TypeLoader foreach (TypeEntryToRegister typeEntry in registrationData.TypesToRegister) { - // Keep track of registered type handles so that that we can rollback the registration on exception + // Keep track of registered type handles so that we can rollback the registration on exception. registeredTypes[registeredTypesCount++] = typeEntry; // Information tracked in these dictionaries is (partially) redundant with information tracked by MRT. @@ -134,7 +134,7 @@ namespace Internal.Runtime.TypeLoader { Debug.Assert(methodEntry._methodDictionary != IntPtr.Zero); - // Keep track of registered method dictionaries so that that we can rollback the registration on exception + // Keep track of registered method dictionaries so that we can rollback the registration on exception registeredMethods[registeredMethodsCount++] = methodEntry; // Register method dictionary -> components mapping first so that we can use it during rollback below diff --git a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.FieldAccess.cs b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.FieldAccess.cs index dca219f10af..00afbd995bd 100644 --- a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.FieldAccess.cs +++ b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.FieldAccess.cs @@ -467,7 +467,7 @@ namespace Internal.Runtime.TypeLoader #endif { Environment.FailFast( - "Failed to locate statics table entry for for field '" + + "Failed to locate statics table entry for field '" + fieldName + "' on type " + type.ToString()); diff --git a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.cs b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.cs index 6ab6f7c4fb3..a0cfbfd6b26 100644 --- a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.cs +++ b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/TypeLoaderEnvironment.cs @@ -824,7 +824,7 @@ namespace Internal.Runtime.TypeLoader // This check looks for unboxing and instantiating stubs generated via the compiler backend if (TypeLoaderEnvironment.TryGetTargetOfUnboxingAndInstantiatingStub(exactTarget, out fatFunctionPointerTarget)) { - // If this is an unboxing and instantiating stub, use seperate table, find target, and create fat function pointer + // If this is an unboxing and instantiating stub, use separate table, find target, and create fat function pointer exactTarget = FunctionPointerOps.GetGenericMethodFunctionPointer(fatFunctionPointerTarget, declaringType.ToIntPtr()); } diff --git a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/TypeSystem/TypeDesc.Runtime.cs b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/TypeSystem/TypeDesc.Runtime.cs index fb7637e913a..66cd911473f 100644 --- a/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/TypeSystem/TypeDesc.Runtime.cs +++ b/src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/TypeSystem/TypeDesc.Runtime.cs @@ -26,7 +26,7 @@ namespace Internal.TypeSystem } /// <summary> - /// Setter for RuntimeTypeHandle. Seperate from normal property as all uses should be done with great care. + /// Setter for RuntimeTypeHandle. Separate from normal property as all uses should be done with great care. /// Must not be set with partially constructed type handles /// </summary> public void SetRuntimeTypeHandleUnsafe(RuntimeTypeHandle runtimeTypeHandle) diff --git a/src/coreclr/nativeresources/resourcestring.cpp b/src/coreclr/nativeresources/resourcestring.cpp index 41f11be7781..b3089043cc9 100644 --- a/src/coreclr/nativeresources/resourcestring.cpp +++ b/src/coreclr/nativeresources/resourcestring.cpp @@ -54,7 +54,7 @@ int LoadNativeStringResource(const NativeStringResourceTable &nativeStringResour const WCHAR undefMsg[] = W("Undefined resource string ID:0x"); wcscpy_s(szBuffer, iMax, undefMsg); - // Compute if there is enough space for the message and ID + // Compute if there is enough space for the message and ID. WCHAR* nxt = NULL; int extraSpace = iMax - (ARRAY_SIZE(undefMsg) - 1); if (0 < extraSpace) @@ -68,10 +68,10 @@ int LoadNativeStringResource(const NativeStringResourceTable &nativeStringResour } else { - // The only possible failure is that that string didn't fit the buffer. So the buffer contains - // partial string terminated by '\0' + // The only possible failure is that the string didn't fit the buffer. So the buffer contains + // partial string terminated by '\0'. // We could return ERROR_INSUFFICIENT_BUFFER, but we'll error on the side of caution here and - // actually show something (given that this is likely a scenario involving a bug/deployment issue) + // actually show something (given that this is likely a scenario involving a bug/deployment issue). len = iMax - 1; } } diff --git a/src/coreclr/pal/inc/pal.h b/src/coreclr/pal/inc/pal.h index 60504567ae4..f18bd3e9bae 100644 --- a/src/coreclr/pal/inc/pal.h +++ b/src/coreclr/pal/inc/pal.h @@ -28,8 +28,6 @@ Abstract: If you want to add a PAL_ wrapper function to a native function in here, you also need to edit palinternal.h and win32pal.h. - - --*/ #ifndef __PAL_H__ @@ -1596,7 +1594,7 @@ typedef struct _XMM_SAVE_AREA32 { // // If the context record is used as an input parameter, then for each // portion of the context record controlled by a flag whose value is -// set, it is assumed that that portion of the context record contains +// set, it is assumed that such portion of the context record contains // valid context. If the context record is being used to modify a threads // context, then only that portion of the threads context is modified. // @@ -1842,7 +1840,7 @@ typedef struct _NEON128 { // // If the context record is used as an input parameter, then for each // portion of the context record controlled by a flag whose value is -// set, it is assumed that that portion of the context record contains +// set, it is assumed that such portion of the context record contains // valid context. If the context record is being used to modify a threads // context, then only that portion of the threads context is modified. // @@ -2024,7 +2022,7 @@ typedef struct _IMAGE_ARM_RUNTIME_FUNCTION_ENTRY { // // If the context record is used as an input parameter, then for each // portion of the context record controlled by a flag whose value is -// set, it is assumed that that portion of the context record contains +// set, it is assumed that such portion of the context record contains // valid context. If the context record is being used to modify a threads // context, then only that portion of the threads context is modified. // @@ -2201,7 +2199,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS { // // If the context record is used as an input parameter, then for each // portion of the context record controlled by a flag whose value is -// set, it is assumed that that portion of the context record contains +// set, it is assumed that such portion of the context record contains // valid context. If the context record is being used to modify a threads // context, then only that portion of the threads context is modified. // diff --git a/src/coreclr/pal/src/cruntime/filecrt.cpp b/src/coreclr/pal/src/cruntime/filecrt.cpp index a3ddfe35600..4c5363402df 100644 --- a/src/coreclr/pal/src/cruntime/filecrt.cpp +++ b/src/coreclr/pal/src/cruntime/filecrt.cpp @@ -3,8 +3,6 @@ /*++ - - Module Name: filecrt.cpp @@ -14,8 +12,6 @@ Abstract: Implementation of the file functions in the C runtime library that are Windows specific. - - --*/ #include "pal/thread.hpp" @@ -97,7 +93,7 @@ _open_osfhandle( INT_PTR osfhandle, int flags ) } else /* the only file object with no unix_filename is a pipe */ { - /* check if the file pipe descrptor is for read or write */ + /* check if the file pipe descriptor is for read or write */ if (pLocalData->open_flags == O_WRONLY) { ERROR( "Couldn't open a write pipe on read mode\n"); diff --git a/src/coreclr/pal/src/cruntime/printf.cpp b/src/coreclr/pal/src/cruntime/printf.cpp index f08f6475daa..00c7d70c8af 100644 --- a/src/coreclr/pal/src/cruntime/printf.cpp +++ b/src/coreclr/pal/src/cruntime/printf.cpp @@ -229,11 +229,11 @@ PAL_fwprintf( Function: Internal_ScanfExtractFormatW -Paramaters: +Parameters: Fmt - format string to parse - first character must be a '%' - - paramater gets updated to point to the character after + - parameter gets updated to point to the character after the %<foo> format string Out - buffer will contain the %<foo> format string diff --git a/src/coreclr/pal/src/cruntime/printfcpp.cpp b/src/coreclr/pal/src/cruntime/printfcpp.cpp index fee79c91df1..e014fe015e2 100644 --- a/src/coreclr/pal/src/cruntime/printfcpp.cpp +++ b/src/coreclr/pal/src/cruntime/printfcpp.cpp @@ -112,16 +112,16 @@ static int Internal_Convertfwrite(CPalThread *pthrCurrent, const void *buffer, s Function: Internal_ExtractFormatA -Paramaters: +Parameters: Fmt - format string to parse - first character must be a '%' - - paramater gets updated to point to the character after + - parameter gets updated to point to the character after the %<foo> format string Out - buffer will contain the %<foo> format string Flags - - paramater will be set with the PRINTF_FORMAT_FLAGS defined above + - parameter will be set with the PRINTF_FORMAT_FLAGS defined above Width - will contain the width specified by the format string - -1 if none given diff --git a/src/coreclr/pal/src/file/file.cpp b/src/coreclr/pal/src/file/file.cpp index 71f35f810bc..c0630974b16 100644 --- a/src/coreclr/pal/src/file/file.cpp +++ b/src/coreclr/pal/src/file/file.cpp @@ -3,8 +3,6 @@ /*++ - - Module Name: file.cpp @@ -13,8 +11,6 @@ Abstract: Implementation of the file WIN API for the PAL - - --*/ #include "pal/dbgmsg.h" @@ -341,7 +337,7 @@ CorUnix::InternalCanonicalizeRealPath(LPCSTR lpUnixPath, PathCharString& lpBuffe // check if we are going to truncate the "/" corresponding to the // root folder (e.g. case of "/Volumes"). If so: // - // 1) Set the seperator to point to the NULL terminator of the specified + // 1) Set the separator to point to the NULL terminator of the specified // file/folder name. // // 2) Null terminate lpBuffer diff --git a/src/coreclr/pal/src/include/pal/init.h b/src/coreclr/pal/src/include/pal/init.h index 9544a369d30..e50528ee696 100644 --- a/src/coreclr/pal/src/include/pal/init.h +++ b/src/coreclr/pal/src/include/pal/init.h @@ -86,7 +86,7 @@ PALSetShutdownIntent(); Function: PALInitLock -Take the initializaiton critical section (init_critsec). necessary to serialize +Take the initialization critical section (init_critsec). necessary to serialize TerminateProcess along with PAL_Terminate and PAL_Initialize (no parameters) diff --git a/src/coreclr/pal/src/include/pal/palinternal.h b/src/coreclr/pal/src/include/pal/palinternal.h index b1793318bae..dc39af8f4d4 100644 --- a/src/coreclr/pal/src/include/pal/palinternal.h +++ b/src/coreclr/pal/src/include/pal/palinternal.h @@ -89,7 +89,7 @@ There are 2 types of namespace collisions that must be handled. implementation (with some_function) [side note : for the Win32 PAL, this can be accomplished without touching - pal.h. In Windows, symbols in in dynamic libraries are resolved at + pal.h. In Windows, symbols in dynamic libraries are resolved at compile time. if an application that uses some_function is only linked to pal.dll, some_function will be resolved to the version in that DLL, even if other DLLs in the system provide other implementations. In addition, diff --git a/src/coreclr/pal/src/init/pal.cpp b/src/coreclr/pal/src/init/pal.cpp index 2a24b158e0d..a5a6ac15743 100644 --- a/src/coreclr/pal/src/init/pal.cpp +++ b/src/coreclr/pal/src/init/pal.cpp @@ -1041,7 +1041,7 @@ void PALSetShutdownIntent() Function: PALInitLock -Take the initializaiton critical section (init_critsec). necessary to serialize +Take the initialization critical section (init_critsec). necessary to serialize TerminateProcess along with PAL_Terminate and PAL_Initialize (no parameters) diff --git a/src/coreclr/pal/src/misc/sysinfo.cpp b/src/coreclr/pal/src/misc/sysinfo.cpp index 704c6daa4b2..eb679d3d249 100644 --- a/src/coreclr/pal/src/misc/sysinfo.cpp +++ b/src/coreclr/pal/src/misc/sysinfo.cpp @@ -614,8 +614,8 @@ PAL_GetLogicalProcessorCacheSizeFromOS() int64_t cacheSizeFromSysctl = 0; size_t sz = sizeof(cacheSizeFromSysctl); const bool success = false - // macOS-arm64: Since macOS 12.0, Apple added ".perflevelX." to determinate cache sizes for efficiency - // and performance cores separetely. "perflevel0" stands for "performance" + // macOS-arm64: Since macOS 12.0, Apple added ".perflevelX." to determinate cache sizes for efficiency + // and performance cores separately. "perflevel0" stands for "performance" || sysctlbyname("hw.perflevel0.l2cachesize", &cacheSizeFromSysctl, &sz, nullptr, 0) == 0 // macOS-arm64: these report cache sizes for efficiency cores only: || sysctlbyname("hw.l3cachesize", &cacheSizeFromSysctl, &sz, nullptr, 0) == 0 diff --git a/src/coreclr/pal/src/safecrt/tsplitpath_s.inl b/src/coreclr/pal/src/safecrt/tsplitpath_s.inl index 0884b2fb3f4..4366ec3cebb 100644 --- a/src/coreclr/pal/src/safecrt/tsplitpath_s.inl +++ b/src/coreclr/pal/src/safecrt/tsplitpath_s.inl @@ -126,7 +126,7 @@ errno_t __cdecl _FUNC_NAME( } _TCSNCPY_S(_Dir, _DirSize, _Path, length); - // Normalize the path seperator + // Normalize the path separator size_t iIndex; for(iIndex = 0; iIndex < length; iIndex++) { diff --git a/src/coreclr/pal/src/thread/context.cpp b/src/coreclr/pal/src/thread/context.cpp index 80a5e3a90ff..5c9f89d03b2 100644 --- a/src/coreclr/pal/src/thread/context.cpp +++ b/src/coreclr/pal/src/thread/context.cpp @@ -3,8 +3,6 @@ /*++ - - Module Name: context.c @@ -14,8 +12,6 @@ Abstract: Implementation of GetThreadContext/SetThreadContext/DebugBreak. There are a lot of architecture specifics here. - - --*/ #include "pal/dbgmsg.h" @@ -332,7 +328,7 @@ CONTEXT_GetThreadContext( } /* How to consider the case when self is different from the current - thread of its owner process. Machine registers values could be retreived + thread of its owner process. Machine registers values could be retrieved by a ptrace(pid, ...) call or from the "/proc/%pid/reg" file content. Unfortunately, these two methods only depend on process ID, not on thread ID. */ @@ -405,7 +401,7 @@ CONTEXT_SetThreadContext( } /* How to consider the case when self is different from the current - thread of its owner process. Machine registers values could be retreived + thread of its owner process. Machine registers values could be retrieved by a ptrace(pid, ...) call or from the "/proc/%pid/reg" file content. Unfortunately, these two methods only depend on process ID, not on thread ID. */ @@ -625,7 +621,7 @@ void CONTEXTFromNativeContext(const native_context_t *native, LPCONTEXT lpContex ASSIGN_CONTROL_REGS #if defined(HOST_ARM) // WinContext assumes that the least bit of Pc is always 1 (denoting thumb) - // although the pc value retrived from native context might not have set the least bit. + // although the pc value retrieved from native context might not have set the least bit. // This becomes especially problematic if the context is on the JIT_WRITEBARRIER. lpContext->Pc |= 0x1; #endif @@ -1096,7 +1092,7 @@ CONTEXT_GetThreadContextFromPort( CONTEXT_GetThreadContextFromThreadState(StateFlavor, (thread_state_t)&State, lpContext); } - if (lpContext->ContextFlags & CONTEXT_ALL_FLOATING & CONTEXT_AREA_MASK) + if (lpContext->ContextFlags & CONTEXT_ALL_FLOATING & CONTEXT_AREA_MASK) { #if defined(HOST_AMD64) // The thread_get_state for floating point state can fail for some flavors when the processor is not diff --git a/src/coreclr/pal/tests/palsuite/CMakeLists.txt b/src/coreclr/pal/tests/palsuite/CMakeLists.txt index 464d861bece..4cef1073a89 100644 --- a/src/coreclr/pal/tests/palsuite/CMakeLists.txt +++ b/src/coreclr/pal/tests/palsuite/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(${PALTESTSUITE_SOURCE_DIR}/common) # All test will link against these libraries: # pthread and m are part of the Android C library (bionic), -# so we don't need to link them seperately +# so we don't need to link them separately if(NOT CLR_CMAKE_TARGET_ANDROID) list(APPEND COMMON_TEST_LIBRARIES pthread) list(APPEND COMMON_TEST_LIBRARIES m) diff --git a/src/coreclr/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp b/src/coreclr/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp index c4c245cd255..8b49147fd6b 100644 --- a/src/coreclr/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp +++ b/src/coreclr/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp @@ -5,17 +5,14 @@ ** ** Source: test1.c ** -** Purpose: Run through every possible character. For each time that +** Purpose: Run through every possible character. For each time that ** isxdigit returns: ** 1, check through a list of the known hex characters to ensure that it -** is really a hex char. Also, when it returns 0, ensure that that character +** is really a hex char. Also, when it returns 0, ensure that the character ** isn't a hex character. ** -** **==========================================================================*/ - - #include <palsuite.h> diff --git a/src/coreclr/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp b/src/coreclr/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp index d60d483ac50..656ebd91ee2 100644 --- a/src/coreclr/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp +++ b/src/coreclr/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp @@ -6,14 +6,11 @@ ** Source: test1.c ** ** Purpose: -** Test to that wcscat correctly concatanates wide strings, including placing +** Test to that wcscat correctly concatenates wide strings, including placing ** null pointers. ** -** **==========================================================================*/ - - #include <palsuite.h> /* diff --git a/src/coreclr/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp b/src/coreclr/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp index da99d5ef358..dce3ae3bd75 100644 --- a/src/coreclr/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp +++ b/src/coreclr/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. /* -Source Code: mainWrapper.c +Source Code: mainWrapper.c mainWrapper.c creates Composite Test Case Processes and waits for all processes to get over @@ -39,42 +39,42 @@ struct applicationStatistics{ int GetParameters( int argc, char **argv) { - if( (argc != 5) || ((argc == 1) && !strcmp(argv[1],"/?")) + if( (argc != 5) || ((argc == 1) && !strcmp(argv[1],"/?")) || !strcmp(argv[1],"/h") || !strcmp(argv[1],"/H")) { printf("Main Wrapper PAL -Composite Critical Section Test\n"); printf("Usage:\n"); - printf("\t[PROCESS_COUNT] Greater than or Equal to 1 \n"); - printf("\t[THREAD_COUNT] Greater than or Equal to 1 and Less than or Equal to 64 \n"); + printf("\t[PROCESS_COUNT] Greater than or Equal to 1 \n"); + printf("\t[THREAD_COUNT] Greater than or Equal to 1 and Less than or Equal to 64 \n"); printf("\t[REPEAT_COUNT] Greater than or Equal to 1\n"); - printf("\t[RELATION_ID [Greater than or Equal to 1]\n"); + printf("\t[RELATION_ID [Greater than or Equal to 1]\n"); return -1; } USE_PROCESS_COUNT = atoi(argv[1]); - if( USE_PROCESS_COUNT < 0) + if( USE_PROCESS_COUNT < 0) { printf("\nPROCESS_COUNT to greater than or equal to 1\n"); return -1; } THREAD_COUNT = atoi(argv[2]); - if( THREAD_COUNT < 1 || THREAD_COUNT > 64) + if( THREAD_COUNT < 1 || THREAD_COUNT > 64) { printf("\nTHREAD_COUNT to be greater than or equal to 1 or less than or equal to 64\n"); return -1; } REPEAT_COUNT = atoi(argv[3]); - if( REPEAT_COUNT < 1) + if( REPEAT_COUNT < 1) { printf("\nREPEAT_COUNT to greater than or equal to 1\n"); return -1; } RELATION_ID = atoi(argv[4]); - if( RELATION_ID < 1) + if( RELATION_ID < 1) { printf("\nMain Process:Invalid RELATION_ID number, Pass greater than 1\n"); return -1; @@ -91,13 +91,13 @@ PALTEST(composite_synchronization_criticalsection_paltest_synchronization_critic { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; //Array to hold Process handles - DWORD processReturnCode = 0; + DWORD processReturnCode = 0; int testReturnCode = PASS; STARTUPINFO si[MAXIMUM_WAIT_OBJECTS]; PROCESS_INFORMATION pi[MAXIMUM_WAIT_OBJECTS]; FILE *hFile; //handle to application results file char fileName[MAX_PATH]; //file name of the application results file - struct applicationStatistics appStats; + struct applicationStatistics appStats; DWORD dwStart=0; //to store the tick count char lpCommandLine[MAX_PATH] = ""; int returnCode = 0; @@ -123,18 +123,18 @@ PALTEST(composite_synchronization_criticalsection_paltest_synchronization_critic appStats.repeatCount = REPEAT_COUNT; appStats.buildNumber = getBuildNumber(); - + _snprintf(fileName, MAX_PATH, "main_criticalsection_%d_.txt", RELATION_ID); hFile = fopen(fileName, "w+"); if(hFile == NULL) - { + { Fail("Error in opening file to write application results for Critical Section Test, and error code is %d\n", GetLastError()); } //Start Process Time Capture -dwStart = GetTickCount(); +dwStart = GetTickCount(); for( i = 0; i < USE_PROCESS_COUNT; i++ ) { @@ -142,9 +142,9 @@ for( i = 0; i < USE_PROCESS_COUNT; i++ ) ZeroMemory( lpCommandLine, MAX_PATH ); if ( _snprintf( lpCommandLine, MAX_PATH-1, "criticalsection %d %d %d %d", i, THREAD_COUNT, REPEAT_COUNT, RELATION_ID) < 0 ) { - Trace ("Error: Insufficient commandline string length for for iteration [%d]\n", i); + Trace ("Error: Insufficient commandline string length for iteration [%d]\n", i); } - + /* Zero the data structure space */ ZeroMemory ( &pi[i], sizeof(pi[i]) ); ZeroMemory ( &si[i], sizeof(si[i]) ); @@ -154,7 +154,7 @@ for( i = 0; i < USE_PROCESS_COUNT; i++ ) //Printing the Command Line //Trace("Command Line \t %s \n", lpCommandLine); - + //Create Process if(!CreateProcess( NULL, /* lpApplicationName*/ lpCommandLine, /* lpCommandLine */ @@ -178,7 +178,7 @@ for( i = 0; i < USE_PROCESS_COUNT; i++ ) } - returnCode = WaitForMultipleObjects( USE_PROCESS_COUNT, hProcess, TRUE, INFINITE); + returnCode = WaitForMultipleObjects( USE_PROCESS_COUNT, hProcess, TRUE, INFINITE); if( WAIT_OBJECT_0 != returnCode ) { Trace("Wait for Object(s) @ Main thread for %d processes returned %d, and GetLastError value is %d\n", USE_PROCESS_COUNT, returnCode, GetLastError()); @@ -190,15 +190,15 @@ for( i = 0; i < USE_PROCESS_COUNT; i++ ) /* check the exit code from the process */ if( ! GetExitCodeProcess( pi[i].hProcess, &processReturnCode ) ) { - Trace( "GetExitCodeProcess call failed for iteration %d with error code %u\n", - i, GetLastError() ); - + Trace( "GetExitCodeProcess call failed for iteration %d with error code %u\n", + i, GetLastError() ); + testReturnCode = FAIL; } if(processReturnCode == FAIL) { - Trace( "Process [%d] failed and returned FAIL\n", i); + Trace( "Process [%d] failed and returned FAIL\n", i); testReturnCode = FAIL; } @@ -221,17 +221,17 @@ appStats.operationTime = GetTickCount() - dwStart; if( testReturnCode == PASS) { Trace("Test Passed\n"); - + } else { Fail("Test Failed\n"); - + } - + //Write Process Result Contents to File if(hFile!= NULL) - { + { fprintf(hFile, "%lu,%d,%d,%d,%d,%s\n", appStats.operationTime, appStats.relationId,appStats.processCount, appStats.threadCount, appStats.repeatCount, appStats.buildNumber); } diff --git a/src/coreclr/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp b/src/coreclr/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp index 72a1b3d9ce4..4ad713c8b44 100644 --- a/src/coreclr/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp +++ b/src/coreclr/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. /* -Source Code: mainWrapper.c +Source Code: mainWrapper.c mainWrapper.c creates Composite Test Case Processes and waits for all processes to get over @@ -40,49 +40,49 @@ struct applicationStatistics{ int GetParameters( int argc, char **argv) { - if( (argc != 5) || ((argc == 1) && !strcmp(argv[1],"/?")) + if( (argc != 5) || ((argc == 1) && !strcmp(argv[1],"/?")) || !strcmp(argv[1],"/h") || !strcmp(argv[1],"/H")) { printf("PAL -Composite Thread Suspension Test\n"); printf("Usage:\n"); - printf("\t[PROCESS_COUNT] Greater than or Equal to 1 \n"); - printf("\t[WORKER_THREAD_MULTIPLIER_COUNT] Greater than or Equal to 1 and Less than or Equal to %d \n", MAXIMUM_WAIT_OBJECTS); + printf("\t[PROCESS_COUNT] Greater than or Equal to 1 \n"); + printf("\t[WORKER_THREAD_MULTIPLIER_COUNT] Greater than or Equal to 1 and Less than or Equal to %d \n", MAXIMUM_WAIT_OBJECTS); printf("\t[REPEAT_COUNT] Greater than or Equal to 1\n"); - printf("\t[RELATION_ID [greater than or Equal to 1]\n"); + printf("\t[RELATION_ID [greater than or Equal to 1]\n"); return -1; } // Trace("Args 1 is [%s], Arg 2 is [%s], Arg 3 is [%s]\n", argv[1], argv[2], argv[3]); - + USE_PROCESS_COUNT = atoi(argv[1]); - if( USE_PROCESS_COUNT < 0) + if( USE_PROCESS_COUNT < 0) { printf("\nPROCESS_COUNT to greater than or equal to 1\n"); return -1; } WORKER_THREAD_MULTIPLIER_COUNT = atoi(argv[2]); - if( WORKER_THREAD_MULTIPLIER_COUNT < 1 || WORKER_THREAD_MULTIPLIER_COUNT > 64) + if( WORKER_THREAD_MULTIPLIER_COUNT < 1 || WORKER_THREAD_MULTIPLIER_COUNT > 64) { printf("\nWORKER_THREAD_MULTIPLIER_COUNT to be greater than or equal to 1 or less than or equal to 64\n"); return -1; } REPEAT_COUNT = atoi(argv[3]); - if( REPEAT_COUNT < 1) + if( REPEAT_COUNT < 1) { printf("\nREPEAT_COUNT to greater than or equal to 1\n"); return -1; } RELATION_ID = atoi(argv[4]); - if( RELATION_ID < 1) + if( RELATION_ID < 1) { printf("\nRELATION_ID to be greater than or equal to 1\n"); return -1; } - + return 0; } @@ -98,9 +98,9 @@ PALTEST(composite_threading_threadsuspension_paltest_threading_threadsuspension, FILE *hFile; char fileName[MAX_PATH]; - struct applicationStatistics appStats; + struct applicationStatistics appStats; - DWORD dwStart=0; + DWORD dwStart=0; char lpCommandLine[MAX_PATH] = ""; @@ -122,11 +122,11 @@ PALTEST(composite_threading_threadsuspension_paltest_threading_threadsuspension, appStats.repeatCount = 0; - + //Start Process Time Capture -dwStart = GetTickCount(); +dwStart = GetTickCount(); if(GetParameters(argc, argv)) { @@ -134,7 +134,7 @@ dwStart = GetTickCount(); } //Assign Correct Values to the Application Stats Structure - appStats.relationId=RELATION_ID; + appStats.relationId=RELATION_ID; appStats.processCount = USE_PROCESS_COUNT; appStats.threadCount = THREAD_COUNT ; appStats.repeatCount = REPEAT_COUNT; @@ -144,15 +144,15 @@ dwStart = GetTickCount(); Trace("WORKER_THREAD_MULTIPLIER_COUNT: %d \n", WORKER_THREAD_MULTIPLIER_COUNT); Trace("REPEAT_COUNT: %d \n", REPEAT_COUNT); - + _snprintf(fileName, MAX_PATH, "main_threadsuspension_%d_.txt",appStats.relationId); hFile = fopen(fileName, "w+"); if(hFile == NULL) - { + { Fail("Error in opening file to write application results for Thread Suspension Test with error code %d \n", GetLastError() ); } - + for( i = 0; i < USE_PROCESS_COUNT; i++ ) @@ -161,9 +161,9 @@ if(hFile == NULL) ZeroMemory( lpCommandLine, MAX_PATH ); if ( _snprintf( lpCommandLine, MAX_PATH-1, "threadsuspension %d %d %d %d", i, WORKER_THREAD_MULTIPLIER_COUNT, REPEAT_COUNT, RELATION_ID) < 0 ) { - Trace ("Error: Insufficient commandline string length for for iteration [%d]\n", i); + Trace ("Error: Insufficient commandline string length for iteration [%d]\n", i); } - + /* Zero the data structure space */ ZeroMemory ( &pi[i], sizeof(pi[i]) ); ZeroMemory ( &si[i], sizeof(si[i]) ); @@ -173,7 +173,7 @@ if(hFile == NULL) //Printing the Command Line //Trace("Command Line \t %s \n", lpCommandLine); - + //Create Process if(!CreateProcess( NULL, /* lpApplicationName*/ lpCommandLine, /* lpCommandLine */ @@ -188,7 +188,7 @@ if(hFile == NULL) )) { Fail("Process Not created for [%d] and GetLastError value is %d\n", i, GetLastError()); - + } else { @@ -198,7 +198,7 @@ if(hFile == NULL) } - returnCode = WaitForMultipleObjects( USE_PROCESS_COUNT, hProcess, TRUE, INFINITE); + returnCode = WaitForMultipleObjects( USE_PROCESS_COUNT, hProcess, TRUE, INFINITE); if( WAIT_OBJECT_0 != returnCode ) { Trace("Wait for Object(s) @ Main thread for %d processes returned %d, and GetLastError value is %d\n", USE_PROCESS_COUNT, returnCode, GetLastError()); @@ -210,15 +210,15 @@ if(hFile == NULL) /* check the exit code from the process */ if( ! GetExitCodeProcess( pi[i].hProcess, &processReturnCode ) ) { - Trace( "GetExitCodeProcess call failed for iteration %d with error code %u\n", - i, GetLastError() ); - + Trace( "GetExitCodeProcess call failed for iteration %d with error code %u\n", + i, GetLastError() ); + testReturnCode = FAIL; } if(processReturnCode == FAIL) { - Trace( "Process [%d] failed and returned FAIL\n", i); + Trace( "Process [%d] failed and returned FAIL\n", i); testReturnCode = FAIL; } @@ -246,10 +246,10 @@ if( testReturnCode == PASS) { Trace("Test Failed\n"); } - + //Write Process Result Contents to File if(hFile!= NULL) - { + { fprintf(hFile, "%lu,%d,%d,%d,%d,%s\n", appStats.operationTime, appStats.relationId, appStats.processCount, appStats.threadCount, appStats.repeatCount, appStats.buildNumber); } @@ -258,7 +258,7 @@ if (0!=fclose(hFile)) Trace("Error:%d: fclose failed for file %s\n", GetLastError(), fileName); } PAL_Terminate(); - + if( testReturnCode == PASS) { @@ -267,7 +267,7 @@ if( testReturnCode == PASS) else { return FAIL; - - } - + + } + } diff --git a/src/coreclr/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp b/src/coreclr/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp index 1f95d7dced4..1581992bd8a 100644 --- a/src/coreclr/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp +++ b/src/coreclr/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. /* -Source Code: mainWrapper.c +Source Code: mainWrapper.c mainWrapper.c creates Composite Test Case Processes and waits for all processes to get over @@ -40,49 +40,49 @@ struct applicationStatistics{ int GetParameters( int argc, char **argv) { - if( (argc != 5) || ((argc == 1) && !strcmp(argv[1],"/?")) + if( (argc != 5) || ((argc == 1) && !strcmp(argv[1],"/?")) || !strcmp(argv[1],"/h") || !strcmp(argv[1],"/H")) { printf("PAL -Composite Thread Suspension Test\n"); printf("Usage:\n"); - printf("\t[PROCESS_COUNT] Greater than or Equal to 1 \n"); - printf("\t[WORKER_THREAD_MULTIPLIER_COUNT] Greater than or Equal to 1 and Less than or Equal to %d \n", MAXIMUM_WAIT_OBJECTS); + printf("\t[PROCESS_COUNT] Greater than or Equal to 1 \n"); + printf("\t[WORKER_THREAD_MULTIPLIER_COUNT] Greater than or Equal to 1 and Less than or Equal to %d \n", MAXIMUM_WAIT_OBJECTS); printf("\t[REPEAT_COUNT] Greater than or Equal to 1\n"); - printf("\t[RELATION_ID [greater than or Equal to 1]\n"); + printf("\t[RELATION_ID [greater than or Equal to 1]\n"); return -1; } // Trace("Args 1 is [%s], Arg 2 is [%s], Arg 3 is [%s]\n", argv[1], argv[2], argv[3]); - + USE_PROCESS_COUNT = atoi(argv[1]); - if( USE_PROCESS_COUNT < 0) + if( USE_PROCESS_COUNT < 0) { printf("\nPROCESS_COUNT to greater than or equal to 1\n"); return -1; } WORKER_THREAD_MULTIPLIER_COUNT = atoi(argv[2]); - if( WORKER_THREAD_MULTIPLIER_COUNT < 1 || WORKER_THREAD_MULTIPLIER_COUNT > 64) + if( WORKER_THREAD_MULTIPLIER_COUNT < 1 || WORKER_THREAD_MULTIPLIER_COUNT > 64) { printf("\nWORKER_THREAD_MULTIPLIER_COUNT to be greater than or equal to 1 or less than or equal to 64\n"); return -1; } REPEAT_COUNT = atoi(argv[3]); - if( REPEAT_COUNT < 1) + if( REPEAT_COUNT < 1) { printf("\nREPEAT_COUNT to greater than or equal to 1\n"); return -1; } RELATION_ID = atoi(argv[4]); - if( RELATION_ID < 1) + if( RELATION_ID < 1) { printf("\nRELATION_ID to be greater than or equal to 1\n"); return -1; } - + return 0; } @@ -98,9 +98,9 @@ PALTEST(composite_threading_threadsuspension_switchthread_paltest_threading_thre FILE *hFile; char fileName[MAX_PATH]; - struct applicationStatistics appStats; + struct applicationStatistics appStats; - DWORD dwStart=0; + DWORD dwStart=0; char lpCommandLine[MAX_PATH] = ""; @@ -122,11 +122,11 @@ PALTEST(composite_threading_threadsuspension_switchthread_paltest_threading_thre appStats.repeatCount = 0; - + //Start Process Time Capture -dwStart = GetTickCount(); +dwStart = GetTickCount(); if(GetParameters(argc, argv)) { @@ -134,7 +134,7 @@ dwStart = GetTickCount(); } //Assign Correct Values to the Application Stats Structure - appStats.relationId=RELATION_ID; + appStats.relationId=RELATION_ID; appStats.processCount = USE_PROCESS_COUNT; appStats.threadCount = THREAD_COUNT ; appStats.repeatCount = REPEAT_COUNT; @@ -144,15 +144,15 @@ dwStart = GetTickCount(); Trace("WORKER_THREAD_MULTIPLIER_COUNT: %d \n", WORKER_THREAD_MULTIPLIER_COUNT); Trace("REPEAT_COUNT: %d \n", REPEAT_COUNT); - + _snprintf(fileName, MAX_PATH, "main_threadsuspension_%d_.txt",appStats.relationId); hFile = fopen(fileName, "w+"); if(hFile == NULL) - { + { Fail("Error in opening file to write application results for Thread Suspension Test with error code %d \n", GetLastError() ); } - + for( i = 0; i < USE_PROCESS_COUNT; i++ ) @@ -161,9 +161,9 @@ if(hFile == NULL) ZeroMemory( lpCommandLine, MAX_PATH ); if ( _snprintf( lpCommandLine, MAX_PATH-1, "threadsuspension %d %d %d %d", i, WORKER_THREAD_MULTIPLIER_COUNT, REPEAT_COUNT, RELATION_ID) < 0 ) { - Trace ("Error: Insufficient commandline string length for for iteration [%d]\n", i); + Trace ("Error: Insufficient commandline string length for iteration [%d]\n", i); } - + /* Zero the data structure space */ ZeroMemory ( &pi[i], sizeof(pi[i]) ); ZeroMemory ( &si[i], sizeof(si[i]) ); @@ -173,7 +173,7 @@ if(hFile == NULL) //Printing the Command Line //Trace("Command Line \t %s \n", lpCommandLine); - + //Create Process if(!CreateProcess( NULL, /* lpApplicationName*/ lpCommandLine, /* lpCommandLine */ @@ -188,7 +188,7 @@ if(hFile == NULL) )) { Fail("Process Not created for [%d] and GetLastError value is %d\n", i, GetLastError()); - + } else { @@ -198,7 +198,7 @@ if(hFile == NULL) } - returnCode = WaitForMultipleObjects( USE_PROCESS_COUNT, hProcess, TRUE, INFINITE); + returnCode = WaitForMultipleObjects( USE_PROCESS_COUNT, hProcess, TRUE, INFINITE); if( WAIT_OBJECT_0 != returnCode ) { Trace("Wait for Object(s) @ Main thread for %d processes returned %d, and GetLastError value is %d\n", USE_PROCESS_COUNT, returnCode, GetLastError()); @@ -210,15 +210,15 @@ if(hFile == NULL) /* check the exit code from the process */ if( ! GetExitCodeProcess( pi[i].hProcess, &processReturnCode ) ) { - Trace( "GetExitCodeProcess call failed for iteration %d with error code %u\n", - i, GetLastError() ); - + Trace( "GetExitCodeProcess call failed for iteration %d with error code %u\n", + i, GetLastError() ); + testReturnCode = FAIL; } if(processReturnCode == FAIL) { - Trace( "Process [%d] failed and returned FAIL\n", i); + Trace( "Process [%d] failed and returned FAIL\n", i); testReturnCode = FAIL; } @@ -246,10 +246,10 @@ if( testReturnCode == PASS) { Trace("Test Failed\n"); } - + //Write Process Result Contents to File if(hFile!= NULL) - { + { fprintf(hFile, "%lu,%d,%d,%d,%d,%s\n", appStats.operationTime, appStats.relationId, appStats.processCount, appStats.threadCount, appStats.repeatCount, appStats.buildNumber); } @@ -258,7 +258,7 @@ if (0!=fclose(hFile)) Trace("Error:%d: fclose failed for file %s\n", GetLastError(), fileName); } PAL_Terminate(); - + if( testReturnCode == PASS) { @@ -267,7 +267,7 @@ if( testReturnCode == PASS) else { return FAIL; - - } - + + } + } diff --git a/src/coreclr/pal/tests/palsuite/composite/wfmo/main.cpp b/src/coreclr/pal/tests/palsuite/composite/wfmo/main.cpp index 599109fb142..0e0684e5f4f 100644 --- a/src/coreclr/pal/tests/palsuite/composite/wfmo/main.cpp +++ b/src/coreclr/pal/tests/palsuite/composite/wfmo/main.cpp @@ -9,7 +9,7 @@ ** This test is for WFMO Test case for Mutex ** Algorithm ** o Create PROCESS_COUNT processes. -** o Main Thread of each process creates OBJECT_TYPE Object +** o Main Thread of each process creates OBJECT_TYPE Object ** ** Author: ShamitP ** @@ -41,24 +41,24 @@ struct TestStats{ int GetParameters( int argc, char **argv) { - if( (argc != 6) || ((argc == 1) && !strcmp(argv[1],"/?")) + if( (argc != 6) || ((argc == 1) && !strcmp(argv[1],"/?")) || !strcmp(argv[1],"/h") || !strcmp(argv[1],"/H")) { printf("PAL -Composite WFMO Test\n"); printf("Usage:\n"); - printf("main\n\t[PROCESS_COUNT [greater than 0] \n"); - printf("\t[THREAD_COUNT [greater than 0] \n"); + printf("main\n\t[PROCESS_COUNT [greater than 0] \n"); + printf("\t[THREAD_COUNT [greater than 0] \n"); printf("\t[REPEAT_COUNT [greater than 0]\n"); printf("\t[SLEEP_LENGTH [greater than 0]\n"); - printf("\t[RELATION_ID [greater than 0]\n"); + printf("\t[RELATION_ID [greater than 0]\n"); + - return -1; } PROCESS_COUNT = atoi(argv[1]); - if( (PROCESS_COUNT < 1) || (PROCESS_COUNT > MAXIMUM_WAIT_OBJECTS) ) + if( (PROCESS_COUNT < 1) || (PROCESS_COUNT > MAXIMUM_WAIT_OBJECTS) ) { printf("\nMain Process:Invalid PROCESS_COUNT number, Pass greater than 1 and less than PROCESS_COUNT %d\n", MAXIMUM_WAIT_OBJECTS); return -1; @@ -72,21 +72,21 @@ int GetParameters( int argc, char **argv) } REPEAT_COUNT = atoi(argv[3]); - if( REPEAT_COUNT < 1) + if( REPEAT_COUNT < 1) { printf("\nMain Process:Invalid REPEAT_COUNT number, Pass greater than 1\n"); return -1; } SLEEP_LENGTH = atoi(argv[4]); - if( SLEEP_LENGTH < 1) + if( SLEEP_LENGTH < 1) { printf("\nMain Process:Invalid SLEEP_LENGTH number, Pass greater than 1\n"); return -1; } RELATION_ID = atoi(argv[5]); - if( RELATION_ID < 1) + if( RELATION_ID < 1) { printf("\nMain Process:Invalid RELATION_ID number, Pass greater than 1\n"); return -1; @@ -101,7 +101,7 @@ PALTEST(composite_wfmo_paltest_composite_wfmo, "composite/wfmo/paltest_composite { unsigned int i = 0; HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; - + STARTUPINFO si[MAXIMUM_WAIT_OBJECTS]; PROCESS_INFORMATION pi[MAXIMUM_WAIT_OBJECTS]; @@ -126,7 +126,7 @@ PALTEST(composite_wfmo_paltest_composite_wfmo, "composite/wfmo/paltest_composite Fail("Error in obtaining the parameters\n"); } - /* Register the start time */ + /* Register the start time */ dwStartTime = GetTickCount(); testStats.relationId = 0; testStats.relationId = RELATION_ID; @@ -140,7 +140,7 @@ PALTEST(composite_wfmo_paltest_composite_wfmo, "composite/wfmo/paltest_composite _snprintf(fileName, MAX_PATH, "main_wfmo_%d_.txt",testStats.relationId); pFile = fopen(fileName, "w+"); if(pFile == NULL) - { + { Fail("Error in opening main file for write\n"); } @@ -150,16 +150,16 @@ PALTEST(composite_wfmo_paltest_composite_wfmo, "composite/wfmo/paltest_composite ZeroMemory( lpCommandLine, MAX_PATH ); if ( _snprintf( lpCommandLine, MAX_PATH-1, "mutex %d %d %d %d %d", i, THREAD_COUNT, REPEAT_COUNT, SLEEP_LENGTH, RELATION_ID) < 0 ) { - Trace ("Error: Insufficient commandline string length for for iteration [%d]\n", i); + Trace ("Error: Insufficient commandline string length for iteration [%d]\n", i); } - + /* Zero the data structure space */ ZeroMemory ( &pi[i], sizeof(pi[i]) ); ZeroMemory ( &si[i], sizeof(si[i]) ); /* Set the process flags and standard io handles */ si[i].cb = sizeof(si[i]); - + //Create Process if(!CreateProcess( NULL, /* lpApplicationName*/ lpCommandLine, /* lpCommandLine */ @@ -183,26 +183,26 @@ PALTEST(composite_wfmo_paltest_composite_wfmo, "composite/wfmo/paltest_composite } - returnCode = WaitForMultipleObjects( PROCESS_COUNT, hProcess, TRUE, INFINITE); + returnCode = WaitForMultipleObjects( PROCESS_COUNT, hProcess, TRUE, INFINITE); if( WAIT_OBJECT_0 != returnCode ) { Trace("Wait for Object(s) @ Main thread for %d processes returned %d, and GetLastError value is %d\n", PROCESS_COUNT, returnCode, GetLastError()); } - + for( i = 0; i < PROCESS_COUNT; i++ ) { /* check the exit code from the process */ if( ! GetExitCodeProcess( pi[i].hProcess, &processReturnCode ) ) { - Trace( "GetExitCodeProcess call failed for iteration %d with error code %u\n", - i, GetLastError() ); - + Trace( "GetExitCodeProcess call failed for iteration %d with error code %u\n", + i, GetLastError() ); + testReturnCode = FAIL; } if(processReturnCode == FAIL) { - Trace( "Process [%d] failed and returned FAIL\n", i); + Trace( "Process [%d] failed and returned FAIL\n", i); testReturnCode = FAIL; } @@ -217,14 +217,14 @@ PALTEST(composite_wfmo_paltest_composite_wfmo, "composite/wfmo/paltest_composite } } - testStats.operationTime = GetTimeDiff(dwStartTime); + testStats.operationTime = GetTimeDiff(dwStartTime); fprintf(pFile, "%d,%d,%d,%d,%d,%s\n", testStats.operationTime, testStats.relationId, testStats.processCount, testStats.threadCount, testStats.repeatCount, testStats.buildNumber); if(fclose(pFile)) { Trace("Error: fclose failed for pFile\n"); testReturnCode = FAIL; } - + if( testReturnCode == PASS) { Trace("Test Passed\n"); diff --git a/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp b/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp index b098719bb1f..9d774f43074 100644 --- a/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp +++ b/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp @@ -10,7 +10,7 @@ ** Example: test_directory\level1\..\testing.tmp. ** To add to this test, we will also call SetCurrentDirectory to ** ensure this is handled properly. -** The test will create a file with in the parent directory +** The test will create a file with in the parent directory ** to verify that the returned directory is valid. ** ** Depends: SetCurrentDirectory, @@ -22,7 +22,7 @@ ** strcmp, ** DeleteFileA, ** RemoveDirectory. -** +** ** **===================================================================*/ @@ -33,9 +33,9 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/GetFullPathNameA/test3/paltest_getfullpathnamea_test3") { #ifdef WIN32 - const char* szSeperator = "\\"; + const char* szSeparator = "\\"; #else - const char* szSeperator = "//"; + const char* szSeparator = "//"; #endif const char* szDotDot = "..\\"; @@ -72,7 +72,7 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ GetLastError(), szDotDot); } - + /* Create the path to the next level of directory to create. */ strcat( szDirectory, szCreatedDir ); @@ -89,7 +89,7 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ /* Create the path to the next level of directory to create. */ - strcat( szDirectory, szSeperator ); + strcat( szDirectory, szSeparator ); strcat( szDirectory, szCreatedNextDir ); /* Create a test directory. @@ -102,7 +102,7 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ bRetVal = FAIL; goto cleanUpOne; } - + /* Initialize the receiving char buffers. */ memset(szReturnedPath, 0, _MAX_DIR+1); @@ -117,9 +117,9 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ /* Get the full path to the filename. */ - dwRc = GetFullPathNameA(szFullFileName, + dwRc = GetFullPathNameA(szFullFileName, _MAX_DIR, - szReturnedPath, + szReturnedPath, &pPathPtr); if (dwRc == 0) { @@ -131,7 +131,7 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ goto cleanUpTwo; } - /* The returned value should be the parent directory with the + /* The returned value should be the parent directory with the * file name appended. */ hFile = CreateFileA(szReturnedPath, GENERIC_READ, @@ -143,7 +143,7 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ if (hFile == INVALID_HANDLE_VALUE) { - Trace("ERROR :%ld: CreateFileA failed to create \"%s\".\n", + Trace("ERROR :%ld: CreateFileA failed to create \"%s\".\n", GetLastError(), szReturnedPath); bRetVal = FAIL; @@ -160,7 +160,7 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ goto cleanUpThree; } - /* Verify that the file was created, attempt to create + /* Verify that the file was created, attempt to create * the file again. */ hFile = CreateFileA(szReturnedPath, GENERIC_READ, @@ -169,7 +169,7 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if ((hFile != INVALID_HANDLE_VALUE) && + if ((hFile != INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_ALREADY_EXISTS)) { Trace("ERROR :%ld: CreateFileA succeeded to create file " @@ -186,7 +186,7 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ { Trace("ERROR : Returned filename \"%s\" is not equal to " "supplied filename \"%s\".\n", - pPathPtr, + pPathPtr, szFileName); bRetVal = FAIL; goto cleanUpThree; @@ -197,8 +197,8 @@ PALTEST(file_io_GetFullPathNameA_test3_paltest_getfullpathnamea_test3, "file_io/ bRetVal = PASS; cleanUpThree: - - /* Delete the create file. + + /* Delete the create file. */ if (DeleteFileA(szReturnedPath) != TRUE) { diff --git a/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp b/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp index f463aec087f..99dc8269711 100644 --- a/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp +++ b/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp @@ -10,7 +10,7 @@ ** Example: ..\test_directory\testing.tmp. ** To add to this test, we will also call SetCurrentDirectory to ** ensure this is handled properly. -** The test will create a file with in the parent directory +** The test will create a file with in the parent directory ** to verify that the returned directory is valid. ** ** Depends: SetCurrentDirectory, @@ -22,7 +22,7 @@ ** strcmp, ** DeleteFileA, ** RemoveDirectory. -** +** ** **===================================================================*/ @@ -33,9 +33,9 @@ PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/GetFullPathNameA/test4/paltest_getfullpathnamea_test4") { #ifdef WIN32 - const char* szSeperator = "\\"; + const char* szSeparator = "\\"; #else - const char* szSeperator = "//"; + const char* szSeparator = "//"; #endif const char* szDotDot = ".."; @@ -65,7 +65,7 @@ PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/ /* Create the path to the next level of directory to create. */ strcat( szDirectory, szDotDot ); /* .. */ - strcat( szDirectory, szSeperator ); /* ../ */ + strcat( szDirectory, szSeparator ); /* ../ */ strcat( szDirectory, szCreatedDir ); /* ../test_directory */ /* Create a test directory. @@ -86,16 +86,16 @@ PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/ * in the middle of the path. */ strcat( szFullFileName, szDotDot ); /* .. */ - strcat( szFullFileName, szSeperator ); /* ../ */ + strcat( szFullFileName, szSeparator ); /* ../ */ strcat( szFullFileName, szCreatedDir ); /* ../test_directory */ - strcat( szFullFileName, szSeperator ); /* ../test_directory/ */ + strcat( szFullFileName, szSeparator ); /* ../test_directory/ */ strcat( szFullFileName, szFileName ); /* ../test_directory/testing.tmp */ /* Get the full path to the filename. */ - dwRc = GetFullPathNameA(szFullFileName, + dwRc = GetFullPathNameA(szFullFileName, _MAX_DIR, - szReturnedPath, + szReturnedPath, &pPathPtr); if (dwRc == 0) { @@ -107,7 +107,7 @@ PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/ goto cleanUpOne; } - /* The returned value should be the parent directory with the + /* The returned value should be the parent directory with the * file name appended. */ hFile = CreateFileA(szReturnedPath, GENERIC_READ, @@ -119,7 +119,7 @@ PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/ if (hFile == INVALID_HANDLE_VALUE) { - Trace("ERROR :%ld: CreateFileA failed to create \"%s\".\n", + Trace("ERROR :%ld: CreateFileA failed to create \"%s\".\n", GetLastError(), szReturnedPath); bRetVal = FAIL; @@ -136,7 +136,7 @@ PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/ goto cleanUpTwo; } - /* Verify that the file was created, attempt to create + /* Verify that the file was created, attempt to create * the file again. */ hFile = CreateFileA(szReturnedPath, GENERIC_READ, @@ -145,7 +145,7 @@ PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/ CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if ((hFile != INVALID_HANDLE_VALUE) && + if ((hFile != INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_ALREADY_EXISTS)) { Trace("ERROR :%ld: CreateFileA succeeded to create file " @@ -162,7 +162,7 @@ PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/ { Trace("ERROR : Returned filename \"%s\" is not equal to " "supplied filename \"%s\".\n", - pPathPtr, + pPathPtr, szFileName); bRetVal = FAIL; goto cleanUpTwo; @@ -173,8 +173,8 @@ PALTEST(file_io_GetFullPathNameA_test4_paltest_getfullpathnamea_test4, "file_io/ bRetVal = PASS; cleanUpTwo: - - /* Delete the create file. + + /* Delete the create file. */ if (DeleteFileA(szReturnedPath) != TRUE) { diff --git a/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp b/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp index 24fa5eff8fa..c6b83a2c217 100644 --- a/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp +++ b/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp @@ -10,7 +10,7 @@ ** Example: test_directory\level1\..\testing.tmp. ** To add to this test, we will also call SetCurrentDirectory to ** ensure this is handled properly. -** The test will create a file with in the parent directory +** The test will create a file with in the parent directory ** to verify that the returned directory is valid. ** ** Depends: SetCurrentDirectory, @@ -22,7 +22,7 @@ ** strcmp, ** DeleteFileW, ** RemoveDirectory. -** +** ** **===================================================================*/ @@ -32,9 +32,9 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/GetFullPathNameW/test3/paltest_getfullpathnamew_test3") { #ifdef WIN32 - const WCHAR szSeperator[] = {'\\','\\','\0'}; + const WCHAR szSeparator[] = {'\\','\\','\0'}; #else - const WCHAR szSeperator[] = {'/','/','\0'}; + const WCHAR szSeparator[] = {'/','/','\0'}; #endif const WCHAR szDotDot[] = {'.','.','\0'}; @@ -75,7 +75,7 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/ /* Create the path to the next level of directory to create. */ - wcscat(szDirectory, szCreatedDir); /* test_dir */ + wcscat(szDirectory, szCreatedDir); /* test_dir */ /* Create a test directory. @@ -89,7 +89,7 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/ /* Create the path to the next level of directory to create. */ - wcscat(szDirectory, szSeperator); /* / */ + wcscat(szDirectory, szSeparator); /* / */ wcscat(szDirectory, szCreatedNextDir); /* /level1 */ /* Create a test directory. @@ -112,18 +112,18 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/ * in the middle of the path. */ wcscat(szFullFileName, szCreatedDir); /*test_dir */ - wcscat(szFullFileName, szSeperator); /*test_dir/ */ + wcscat(szFullFileName, szSeparator); /*test_dir/ */ wcscat(szFullFileName, szCreatedNextDir);/*test_dir/level1 */ - wcscat(szFullFileName, szSeperator); /*test_dir/level1/ */ + wcscat(szFullFileName, szSeparator); /*test_dir/level1/ */ wcscat(szFullFileName, szDotDot); /*test_dir/level1/.. */ - wcscat(szFullFileName, szSeperator); /*test_dir/level1/../ */ + wcscat(szFullFileName, szSeparator); /*test_dir/level1/../ */ wcscat(szFullFileName, szFileName); /*test_dir/level1/../testing.tmp */ /* Get the full path to the filename. */ - dwRc = GetFullPathNameW(szFullFileName, + dwRc = GetFullPathNameW(szFullFileName, _MAX_DIR, - szReturnedPath, + szReturnedPath, &pPathPtr); if (dwRc == 0) { @@ -135,7 +135,7 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/ goto cleanUpTwo; } - /* The returned value should be the parent directory with the + /* The returned value should be the parent directory with the * file name appended. */ hFile = CreateFileW(szReturnedPath, GENERIC_READ, @@ -147,7 +147,7 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/ if (hFile == INVALID_HANDLE_VALUE) { - Trace("ERROR :%ld: CreateFileA failed to create \"%S\".\n", + Trace("ERROR :%ld: CreateFileA failed to create \"%S\".\n", GetLastError(), szReturnedPath); bRetVal = FAIL; @@ -164,7 +164,7 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/ goto cleanUpThree; } - /* Verify that the file was created, attempt to create + /* Verify that the file was created, attempt to create * the file again. */ hFile = CreateFileW(szReturnedPath, GENERIC_READ, @@ -173,7 +173,7 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/ CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if ((hFile != INVALID_HANDLE_VALUE) && + if ((hFile != INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_ALREADY_EXISTS)) { Trace("ERROR :%ld: CreateFileA succeeded to create file " @@ -190,7 +190,7 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/ { Trace("ERROR : Returned filename \"%s\" is not equal to " "supplied filename \"%s\".\n", - pPathPtr, + pPathPtr, szFileName); bRetVal = FAIL; goto cleanUpThree; @@ -202,7 +202,7 @@ PALTEST(file_io_GetFullPathNameW_test3_paltest_getfullpathnamew_test3, "file_io/ cleanUpThree: - /* Delete the create file. + /* Delete the create file. */ if (DeleteFileW(szReturnedPath) != TRUE) { @@ -210,7 +210,7 @@ cleanUpThree: GetLastError(), szFileName); } - + cleanUpTwo: /* Remove the empty directory. @@ -232,7 +232,7 @@ cleanUpOne: GetLastError(), szCreatedDir); } - + /* Terminate the PAL.*/ PAL_TerminateEx(bRetVal); return bRetVal; diff --git a/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp b/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp index 752abfc0605..7bc7fceed80 100644 --- a/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp +++ b/src/coreclr/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp @@ -10,7 +10,7 @@ ** Example: ..\test_directory\testing.tmp. ** To add to this test, we will also call SetCurrentDirectory to ** ensure this is handled properly. -** The test will create a file with in the parent directory +** The test will create a file with in the parent directory ** to verify that the returned directory is valid. ** ** Depends: SetCurrentDirectory, @@ -22,7 +22,7 @@ ** strcmp, ** DeleteFileW, ** RemoveDirectory. -** +** ** **===================================================================*/ @@ -32,9 +32,9 @@ PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/GetFullPathNameW/test4/paltest_getfullpathnamew_test4") { #ifdef WIN32 - const WCHAR szSeperator[] = {'\\','\\','\0'}; + const WCHAR szSeparator[] = {'\\','\\','\0'}; #else - const WCHAR szSeperator[] = {'/','/','\0'}; + const WCHAR szSeparator[] = {'/','/','\0'}; #endif const WCHAR szDotDot[] = {'.','.','\0'}; @@ -65,7 +65,7 @@ PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/ /* Create the path to the next level of directory to create. */ wcscat(szDirectory, szDotDot); /* .. */ - wcscat(szDirectory, szSeperator); /* ../ */ + wcscat(szDirectory, szSeparator); /* ../ */ wcscat(szDirectory, szCreatedDir); /* ../test_directory */ /* Create a test directory. @@ -86,16 +86,16 @@ PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/ * in the middle of the path. */ wcscat( szFullFileName, szDotDot ); /* .. */ - wcscat( szFullFileName, szSeperator ); /* ../ */ + wcscat( szFullFileName, szSeparator ); /* ../ */ wcscat( szFullFileName, szCreatedDir ); /* ../test_directory */ - wcscat( szFullFileName, szSeperator ); /* ../test_directory/ */ + wcscat( szFullFileName, szSeparator ); /* ../test_directory/ */ wcscat( szFullFileName, szFileName ); /* ../test_directory/testing.tmp */ /* Get the full path to the filename. */ - dwRc = GetFullPathNameW(szFullFileName, + dwRc = GetFullPathNameW(szFullFileName, _MAX_DIR, - szReturnedPath, + szReturnedPath, &pPathPtr); if (dwRc == 0) { @@ -107,7 +107,7 @@ PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/ goto cleanUpOne; } - /* The returned value should be the parent directory with the + /* The returned value should be the parent directory with the * file name appended. */ hFile = CreateFileW(szReturnedPath, GENERIC_READ, @@ -119,7 +119,7 @@ PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/ if (hFile == INVALID_HANDLE_VALUE) { - Trace("ERROR :%ld: CreateFileA failed to create \"%S\".\n", + Trace("ERROR :%ld: CreateFileA failed to create \"%S\".\n", GetLastError(), szReturnedPath); bRetVal = FAIL; @@ -136,7 +136,7 @@ PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/ goto cleanUpTwo; } - /* Verify that the file was created, attempt to create + /* Verify that the file was created, attempt to create * the file again. */ hFile = CreateFileW(szReturnedPath, GENERIC_READ, @@ -145,7 +145,7 @@ PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/ CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if ((hFile != INVALID_HANDLE_VALUE) && + if ((hFile != INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_ALREADY_EXISTS)) { Trace("ERROR :%ld: CreateFileA succeeded to create file " @@ -162,7 +162,7 @@ PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/ { Trace("ERROR : Returned filename \"%S\" is not equal to " "supplied filename \"%S\".\n", - pPathPtr, + pPathPtr, szFileName); bRetVal = FAIL; goto cleanUpTwo; @@ -173,8 +173,8 @@ PALTEST(file_io_GetFullPathNameW_test4_paltest_getfullpathnamew_test4, "file_io/ bRetVal = PASS; cleanUpTwo: - - /* Delete the create file. + + /* Delete the create file. */ if (DeleteFileW(szReturnedPath) != TRUE) { diff --git a/src/coreclr/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp b/src/coreclr/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp index d856be3571c..0202ada0128 100644 --- a/src/coreclr/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp +++ b/src/coreclr/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp @@ -3,10 +3,10 @@ /*============================================================ ** -** Source: test1.c +** Source: test1.c ** ** Purpose: Test for CreateThread. Call CreateThread and ensure -** that it succeeds. Also check to ensure the paramater is passed +** that it succeeds. Also check to ensure the parameter is passed ** properly. ** ** @@ -21,10 +21,10 @@ ULONGLONG dwCreateThreadTestParameter = 0; DWORD PALAPI CreateThreadTestThread( LPVOID lpParameter) { DWORD dwRet = 0; - + /* save parameter for test */ dwCreateThreadTestParameter = (ULONGLONG)lpParameter; - + return dwRet; } @@ -34,7 +34,7 @@ BOOL CreateThreadTest() DWORD dwRet = 0; LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL; - DWORD dwStackSize = 0; + DWORD dwStackSize = 0; LPTHREAD_START_ROUTINE lpStartAddress = &CreateThreadTestThread; LPVOID lpParameter = (LPVOID)lpStartAddress; DWORD dwCreationFlags = 0; /* run immediately */ @@ -44,17 +44,17 @@ BOOL CreateThreadTest() dwCreateThreadTestParameter = 0; - /* Create a thread, passing the appropriate paramaters as declared + /* Create a thread, passing the appropriate parameters as declared above. */ - - hThread = CreateThread( lpThreadAttributes, - dwStackSize, - lpStartAddress, - lpParameter, - dwCreationFlags, - &dwThreadId ); - + + hThread = CreateThread( lpThreadAttributes, + dwStackSize, + lpStartAddress, + lpParameter, + dwCreationFlags, + &dwThreadId ); + /* Ensure that the HANDLE is not invalid! */ if (hThread != INVALID_HANDLE_VALUE) { @@ -70,7 +70,7 @@ BOOL CreateThreadTest() /* Check to ensure that the parameter passed to the thread function is the same in the function as what we passed. */ - + if (dwCreateThreadTestParameter != (ULONGLONG)lpParameter) { Trace("CreateThreadTest:parameter error. The " @@ -91,7 +91,7 @@ BOOL CreateThreadTest() Trace("CreateThreadTest:CreateThread failed (%x)\n",GetLastError()); } - return bRet; + return bRet; } @@ -101,12 +101,12 @@ PALTEST(threading_CreateThread_test1_paltest_createthread_test1, "threading/Crea { return ( FAIL ); } - - if(!CreateThreadTest()) + + if(!CreateThreadTest()) { Fail ("Test failed\n"); } - + Trace("Test Passed\n"); PAL_Terminate(); return ( PASS ); diff --git a/src/coreclr/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp b/src/coreclr/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp index 084ddc504b4..c3b302842b9 100644 --- a/src/coreclr/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp +++ b/src/coreclr/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp @@ -3,7 +3,7 @@ /*============================================================ ** -** Source: test1.c +** Source: test1.c ** ** Purpose: Test for ExitThread. Create a thread and then call ** exit thread within the threading function. Ensure that it exits @@ -26,7 +26,7 @@ DWORD PALAPI ExitThreadTestThread( LPVOID lpParameter) /* Call the ExitThread function */ ExitThread(dwRet); - /* If we didn't exit, get caught in this loop. But, the + /* If we didn't exit, get caught in this loop. But, the program will exit. */ while (!dwRet) @@ -45,7 +45,7 @@ BOOL ExitThreadTest() DWORD dwRet = 0; LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL; - DWORD dwStackSize = 0; + DWORD dwStackSize = 0; LPTHREAD_START_ROUTINE lpStartAddress = &ExitThreadTestThread; LPVOID lpParameter = (LPVOID)lpStartAddress; DWORD dwCreationFlags = 0; //run immediately @@ -56,16 +56,16 @@ BOOL ExitThreadTest() dwExitThreadTestParameter = 0; /* Create a Thread. We'll need this to test that we're able - to exit the thread. + to exit the thread. */ - hThread = CreateThread( lpThreadAttributes, - dwStackSize, lpStartAddress, lpParameter, - dwCreationFlags, &dwThreadId ); - + hThread = CreateThread( lpThreadAttributes, + dwStackSize, lpStartAddress, lpParameter, + dwCreationFlags, &dwThreadId ); + if (hThread != INVALID_HANDLE_VALUE) { dwRet = WaitForSingleObject(hThread,INFINITE); - + if (dwRet != WAIT_OBJECT_0) { Trace("ExitThreadTest:WaitForSingleObject failed " @@ -78,7 +78,7 @@ BOOL ExitThreadTest() */ if (dwExitThreadTestParameter != (DWORD)(SIZE_T)lpParameter) { - Trace("ERROR: The paramater passed should have been " + Trace("ERROR: The parameter passed should have been " "%d but turned up as %d.", dwExitThreadTestParameter, lpParameter); } @@ -93,7 +93,7 @@ BOOL ExitThreadTest() Trace("ExitThreadTest:CreateThread failed (%x)\n",GetLastError()); } - return bRet; + return bRet; } PALTEST(threading_ExitThread_test1_paltest_exitthread_test1, "threading/ExitThread/test1/paltest_exitthread_test1") @@ -107,7 +107,7 @@ PALTEST(threading_ExitThread_test1_paltest_exitthread_test1, "threading/ExitThre { Fail ("Test failed\n"); } - + PAL_Terminate(); return ( PASS ); } diff --git a/src/coreclr/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp b/src/coreclr/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp index 23c7e5eb028..ab943b11a17 100644 --- a/src/coreclr/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp +++ b/src/coreclr/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp @@ -8,7 +8,7 @@ ** Purpose: Test the functionality of simultaneously waiting ** on multiple processes. Create the same number of helper ** processes and helper threads. -** Helper threads wait on helper processes to finish. +** Helper threads wait on helper processes to finish. ** Helper processes wait on the event signal from test ** thread before exit. ** The test thread can wake up one helper @@ -47,7 +47,7 @@ TestCaseType TestCase = WakeUpOneThread; should be waked up using hThreadFinishEvent instead of helper process. */ DWORD ThreadIndexOfThreadFinishEvent = 0; -struct helper_process_t +struct helper_process_t { PROCESS_INFORMATION pi; HANDLE hProcessReadyEvent; @@ -56,7 +56,7 @@ struct helper_process_t HANDLE hProcessStartEvent_WFMO_test5; -struct helper_thread_t +struct helper_thread_t { HANDLE hThread; DWORD dwThreadId; @@ -64,7 +64,7 @@ struct helper_thread_t HANDLE hThreadFinishEvent; } helper_thread[MAX_HELPER_PROCESS]; -/* +/* * Entry Point for helper thread. */ DWORD PALAPI WaitForProcess(LPVOID lpParameter) @@ -92,7 +92,7 @@ DWORD PALAPI WaitForProcess(LPVOID lpParameter) if(!SetEvent(helper_thread[index].hThreadReadyEvent)) { Fail("test5.WaitProcess: SetEvent of hThreadReadyEvent failed for thread %d. " - "GetLastError() returned %d.\n", index, + "GetLastError() returned %d.\n", index, GetLastError()); } @@ -105,7 +105,7 @@ DWORD PALAPI WaitForProcess(LPVOID lpParameter) if (dwRet != (WAIT_OBJECT_0+0)) { Fail("test5.WaitForProcess: invalid return value %d for WakupAllThread from WaitForMultipleObjectsEx for thread %d\n" - "LastError:(%u)\n", + "LastError:(%u)\n", dwRet, index, GetLastError()); } @@ -116,11 +116,11 @@ DWORD PALAPI WaitForProcess(LPVOID lpParameter) the return value must be either (WAIT_OBJECT_0+index) if the helper thread wakes up because the corresponding help process exits, or (index+1) if the helper thread wakes up because of hThreadReadyEvent. */ - if ((index != ThreadIndexOfThreadFinishEvent && dwRet != (WAIT_OBJECT_0+index)) || + if ((index != ThreadIndexOfThreadFinishEvent && dwRet != (WAIT_OBJECT_0+index)) || (index == ThreadIndexOfThreadFinishEvent && dwRet != (index+1))) { Fail("test5.WaitForProcess: invalid return value %d for WakupOneThread from WaitForMultipleObjectsEx for thread %d\n" - "LastError:(%u)\n", + "LastError:(%u)\n", dwRet, index, GetLastError()); } @@ -132,7 +132,7 @@ DWORD PALAPI WaitForProcess(LPVOID lpParameter) return 0; } -/* +/* * Setup the helper processes and helper threads. */ void @@ -142,7 +142,7 @@ Setup() STARTUPINFO si; DWORD dwRet; int i; - + char szEventName[MAX_PATH]; PWCHAR uniStringHelper; PWCHAR uniString; @@ -151,10 +151,10 @@ Setup() uniString = convert(szcHelperProcessStartEvName); hProcessStartEvent_WFMO_test5 = CreateEvent(NULL, TRUE, FALSE, uniString); free(uniString); - if (!hProcessStartEvent_WFMO_test5) + if (!hProcessStartEvent_WFMO_test5) { Fail("test5.Setup: CreateEvent of '%s' failed. " - "GetLastError() returned %d.\n", szcHelperProcessStartEvName, + "GetLastError() returned %d.\n", szcHelperProcessStartEvName, GetLastError()); } @@ -165,9 +165,9 @@ Setup() for (i = 0; i < MaxNumHelperProcess; i++) { ZeroMemory( &helper_process[i].pi, sizeof(PROCESS_INFORMATION)); - - if(!CreateProcess( NULL, uniStringHelper, NULL, NULL, - FALSE, 0, NULL, NULL, &si, &helper_process[i].pi)) + + if(!CreateProcess( NULL, uniStringHelper, NULL, NULL, + FALSE, 0, NULL, NULL, &si, &helper_process[i].pi)) { Fail("test5.Setup: CreateProcess failed to load executable for helper process %d. " "GetLastError() returned %u.\n", @@ -185,10 +185,10 @@ Setup() helper_process[i].hProcessReadyEvent = CreateEvent(NULL, FALSE, FALSE, uniString); free(uniString); - if (!helper_process[i].hProcessReadyEvent) + if (!helper_process[i].hProcessReadyEvent) { Fail("test5.Setup: CreateEvent of '%s' failed. " - "GetLastError() returned %d.\n", szEventName, + "GetLastError() returned %d.\n", szEventName, GetLastError()); } @@ -203,10 +203,10 @@ Setup() helper_process[i].hProcessFinishEvent = CreateEvent(NULL, TRUE, FALSE, uniString); free(uniString); - if (!helper_process[i].hProcessFinishEvent) + if (!helper_process[i].hProcessFinishEvent) { Fail("test5.Setup: CreateEvent of '%s' failed. " - "GetLastError() returned %d.\n", szEventName, + "GetLastError() returned %d.\n", szEventName, GetLastError()); } @@ -223,12 +223,12 @@ Setup() /* Wait for ready signals from all helper processes. */ for (i = 0; i < MaxNumHelperProcess; i++) - { + { dwRet = WaitForSingleObject(helper_process[i].hProcessReadyEvent, TIMEOUT); if (dwRet != WAIT_OBJECT_0) { Fail("test5.Setup: WaitForSingleObject %s failed for helper process %d\n" - "LastError:(%u)\n", + "LastError:(%u)\n", szcHelperProcessReadyEvName, i, GetLastError()); } } @@ -238,7 +238,7 @@ Setup() { /* Create the event to let helper thread tell us it is ready. */ helper_thread[i].hThreadReadyEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - if (!helper_thread[i].hThreadReadyEvent) + if (!helper_thread[i].hThreadReadyEvent) { Fail("test5.Setup: CreateEvent of hThreadReadyEvent failed for thread %d\n" "LastError:(%u)\n", i, GetLastError()); @@ -246,15 +246,15 @@ Setup() /* Create the event to tell helper thread to exit without waiting for helper process. */ helper_thread[i].hThreadFinishEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - if (!helper_thread[i].hThreadFinishEvent) + if (!helper_thread[i].hThreadFinishEvent) { Fail("test5.Setup: CreateEvent of hThreadFinishEvent failed for thread %d\n" "LastError:(%u)\n", i, GetLastError()); } /* Create the helper thread. */ - helper_thread[i].hThread = CreateThread( NULL, - 0, + helper_thread[i].hThread = CreateThread( NULL, + 0, (LPTHREAD_START_ROUTINE)WaitForProcess, (LPVOID)i, 0, @@ -268,7 +268,7 @@ Setup() /* Wait for ready signals from all helper threads. */ for (i = 0; i < MaxNumHelperProcess; i++) - { + { dwRet = WaitForSingleObject(helper_thread[i].hThreadReadyEvent, TIMEOUT); if (dwRet != WAIT_OBJECT_0) { @@ -278,7 +278,7 @@ Setup() } } -/* +/* * Cleanup the helper processes and helper threads. */ DWORD @@ -301,16 +301,16 @@ Cleanup_WFMO_test5() "LastError:(%u)\n", i, GetLastError()); } - /* check the exit code from the process */ + /* check the exit code from the process */ if (!GetExitCodeProcess(helper_process[i].pi.hProcess, &dwExitCode)) { - Trace( "test5.Cleanup: GetExitCodeProcess %d call failed LastError:(%u)\n", - i, GetLastError()); + Trace( "test5.Cleanup: GetExitCodeProcess %d call failed LastError:(%u)\n", + i, GetLastError()); dwExitCode = FAIL; } PEDANTIC(CloseHandle, (helper_process[i].pi.hThread)); PEDANTIC(CloseHandle, (helper_process[i].pi.hProcess)); - PEDANTIC(CloseHandle, (helper_process[i].hProcessReadyEvent)); + PEDANTIC(CloseHandle, (helper_process[i].hProcessReadyEvent)); PEDANTIC(CloseHandle, (helper_process[i].hProcessFinishEvent)); } @@ -328,7 +328,7 @@ Cleanup_WFMO_test5() return dwExitCode; } -/* +/* * In this test case, the test thread will signal one helper * process to exit at a time starting from the last helper * process and then wait for the corresponding helper thread to exit. @@ -348,7 +348,7 @@ TestWakeupOneThread() Fail("test5.TestWaitOnOneThread: Invalid ThreadIndexOfThreadFinishEvent %d\n", ThreadIndexOfThreadFinishEvent); /* Since helper thread 0 waits on helper process 0, - thread 1 waits on on process 0, and 1, + thread 1 waits on process 0, and 1, thread 2 waits on process 0, 1, and 2, and so on ..., and the last helper thread will wait on all helper processes, the helper thread can be waked up one at a time by @@ -383,16 +383,16 @@ TestWakeupOneThread() GetLastError()); } } - + dwRet = WaitForSingleObject(helper_thread[i].hThread, TIMEOUT); if (WAIT_OBJECT_0 != dwRet) { Fail("test5.TestWaitOnOneThread: WaitForSingleObject helper thread %d" - "LastError:(%u)\n", + "LastError:(%u)\n", i, GetLastError()); } } - + /* Finally, need to wake up the helper process which the test thread skips waking up in the last loop. */ if (!SetEvent(helper_process[ThreadIndexOfThreadFinishEvent].hProcessFinishEvent)) @@ -404,7 +404,7 @@ TestWakeupOneThread() } } -/* +/* * In this test case, the test thread will signal the helper * process 0 to exit. Since all helper threads wait on process 0, * all helper threads will wake up and exit, and the test thread @@ -440,17 +440,17 @@ TestWakeupAllThread() /* Wait for all helper threads to exit. */ for (i = 0; i < MaxNumHelperProcess; i++) { - + dwRet = WaitForSingleObject(helper_thread[i].hThread, TIMEOUT); if (WAIT_OBJECT_0 != dwRet) { Fail("test5.TestWaitOnAllThread: WaitForSingleObject failed for helper thread %d\n" - "LastError:(%u)\n", + "LastError:(%u)\n", i, GetLastError()); } } - /* Signal the rest of helper processes to exit. */ + /* Signal the rest of helper processes to exit. */ for (i = 1; i < MaxNumHelperProcess; i++) { if (!SetEvent(helper_process[i].hProcessFinishEvent)) diff --git a/src/coreclr/scripts/genEventing.py b/src/coreclr/scripts/genEventing.py index f1e341a36b2..e557a8e8aab 100644 --- a/src/coreclr/scripts/genEventing.py +++ b/src/coreclr/scripts/genEventing.py @@ -275,7 +275,7 @@ def parseTemplateNodes(templateNodes): structCounts = {} arrays = {} templateName = templateNode.getAttribute('tid') - var_Dependecies = {} + var_Dependencies = {} fnPrototypes = FunctionSignature() dataNodes = getTopLevelElementsByTagName(templateNode,'data') @@ -318,7 +318,7 @@ def parseTemplateNodes(templateNodes): if wintype == "win:GUID": var_Props = "sizeof(GUID)/sizeof(int)" - var_Dependecies[variable] = var_dependency + var_Dependencies[variable] = var_dependency fnparam = FunctionParameter(wintype,variable,wincount,var_Props) fnPrototypes.append(variable,fnparam) @@ -337,11 +337,11 @@ def parseTemplateNodes(templateNodes): types = [x.attributes['inType'].value for x in structToBeMarshalled.getElementsByTagName("data")] structCounts[structName] = countVarName - var_Dependecies[structName] = [countVarName, structName] + var_Dependencies[structName] = [countVarName, structName] fnparam_pointer = FunctionParameter("win:Struct", structName, "win:count", countVarName) fnPrototypes.append(structName, fnparam_pointer) - allTemplates[templateName] = Template(templateName, fnPrototypes, var_Dependecies, structCounts, arrays) + allTemplates[templateName] = Template(templateName, fnPrototypes, var_Dependencies, structCounts, arrays) return allTemplates diff --git a/src/coreclr/tools/Common/Compiler/CompilerTypeSystemContext.Validation.cs b/src/coreclr/tools/Common/Compiler/CompilerTypeSystemContext.Validation.cs index 58ebedf7814..2766d7226bf 100644 --- a/src/coreclr/tools/Common/Compiler/CompilerTypeSystemContext.Validation.cs +++ b/src/coreclr/tools/Common/Compiler/CompilerTypeSystemContext.Validation.cs @@ -108,7 +108,7 @@ namespace ILCompiler // Validate classes, structs, enums, interfaces, and delegates Debug.Assert(type.IsDefType); - // Don't validate generic definitons + // Don't validate generic definitions if (type.IsGenericDefinition) { return type; diff --git a/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs b/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs index a657279bfd1..9ae8212de83 100644 --- a/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs +++ b/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs @@ -2707,8 +2707,7 @@ namespace Internal.JitInterface } // If both sides are arrays, then the result is either an array or g_pArrayClass. The above is - // actually true about the element type for references types, but I think that that is a little - // excessive for sanity. + // actually true for reference types as well, but it is a little excessive to deal with. if (type1.IsArray && type2.IsArray) { TypeDesc arrayClass = _compilation.TypeSystemContext.GetWellKnownType(WellKnownType.Array); diff --git a/src/coreclr/tools/Common/TypeSystem/Common/ArrayOfTRuntimeInterfacesAlgorithm.cs b/src/coreclr/tools/Common/TypeSystem/Common/ArrayOfTRuntimeInterfacesAlgorithm.cs index 68e6371d89e..0e6328904c7 100644 --- a/src/coreclr/tools/Common/TypeSystem/Common/ArrayOfTRuntimeInterfacesAlgorithm.cs +++ b/src/coreclr/tools/Common/TypeSystem/Common/ArrayOfTRuntimeInterfacesAlgorithm.cs @@ -7,7 +7,7 @@ using Debug = System.Diagnostics.Debug; namespace Internal.TypeSystem { /// <summary> - /// RuntimeInterfaces algorithm for for array types which are similar to a generic type + /// RuntimeInterfaces algorithm for array types which are similar to a generic type /// </summary> public sealed class ArrayOfTRuntimeInterfacesAlgorithm : RuntimeInterfacesAlgorithm { @@ -17,7 +17,7 @@ namespace Internal.TypeSystem private MetadataType _arrayOfTType; /// <summary> - /// RuntimeInterfaces algorithm for for array types which are similar to a generic type + /// RuntimeInterfaces algorithm for array types which are similar to a generic type /// </summary> /// <param name="arrayOfTType">Open type to instantiate to get the interfaces associated with an array.</param> public ArrayOfTRuntimeInterfacesAlgorithm(MetadataType arrayOfTType) diff --git a/src/coreclr/tools/Common/TypeSystem/Common/ExplicitLayoutValidator.cs b/src/coreclr/tools/Common/TypeSystem/Common/ExplicitLayoutValidator.cs index 2decce4fa74..c537f6ea457 100644 --- a/src/coreclr/tools/Common/TypeSystem/Common/ExplicitLayoutValidator.cs +++ b/src/coreclr/tools/Common/TypeSystem/Common/ExplicitLayoutValidator.cs @@ -52,7 +52,7 @@ namespace Internal.TypeSystem private readonly int _pointerSize; - // Represent field layout bits as as a series of intervals to prevent pathological bad behavior + // Represent field layout bits as a series of intervals to prevent pathological bad behavior // involving excessively large explicit layout structures. private readonly List<FieldLayoutInterval> _fieldLayout; diff --git a/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs b/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs index eb55228d3e5..daeb4d1be86 100644 --- a/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs +++ b/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs @@ -460,7 +460,7 @@ namespace Internal.TypeSystem foreach (MethodDesc memberMethod in unificationGroup.Members) { // If a method is both overriden via MethodImpl and name/sig, we don't remove it from the unification list - // as the local MethodImpl takes priority over the name/sig match, and prevents the slot disunificaiton + // as the local MethodImpl takes priority over the name/sig match, and prevents the slot disunification. if (FindSlotDefiningMethodForVirtualMethod(memberMethod) == FindSlotDefiningMethodForVirtualMethod(originalDefiningMethod)) continue; @@ -525,7 +525,7 @@ namespace Internal.TypeSystem unificationGroup.AddMethodRequiringSlotUnification(methodImplRequiredToRemainInEffect); } - // Add all members from the decl's unification group except for ones that have been seperated by name/sig matches + // Add all members from the decl's unification group except for ones that have been separated by name/sig matches // or previously processed methodimpls. NOTE: This implies that method impls are order dependent. if (separatedMethods == null || !separatedMethods.Contains(addDeclGroup.DefiningMethod)) { diff --git a/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs b/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs index 4cd56aea6b1..490e804dda6 100644 --- a/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs +++ b/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs @@ -19,7 +19,7 @@ namespace Internal.TypeSystem.Interop // Each type of marshaller knows how to generate the marshalling code for the argument it marshals. // Marshallers contain method related marshalling information (which is common to all the Marshallers) - // and also argument specific marshalling informaiton + // and also argument specific marshalling information. abstract partial class Marshaller { #region Instance state information diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/AnalysisBasedInteropStubManager.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/AnalysisBasedInteropStubManager.cs index 415dca084fb..68ab76865e1 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/AnalysisBasedInteropStubManager.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/AnalysisBasedInteropStubManager.cs @@ -40,7 +40,7 @@ namespace ILCompiler } } - public override void AddDependeciesDueToPInvoke(ref DependencyList dependencies, NodeFactory factory, MethodDesc method) + public override void AddDependenciesDueToPInvoke(ref DependencyList dependencies, NodeFactory factory, MethodDesc method) { } diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Compilation.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Compilation.cs index ca40317e74b..09d58311aee 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Compilation.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Compilation.cs @@ -445,7 +445,7 @@ namespace ILCompiler } /// <summary> - /// Retreives method whose runtime handle is suitable for use with GVMLookupForSlot. + /// Retrieves method whose runtime handle is suitable for use with GVMLookupForSlot. /// </summary> public MethodDesc GetTargetOfGenericVirtualMethodCall(MethodDesc calledMethod) { diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/CodeBasedDependencyAlgorithm.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/CodeBasedDependencyAlgorithm.cs index 96dfdf19104..ce656b1f985 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/CodeBasedDependencyAlgorithm.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/CodeBasedDependencyAlgorithm.cs @@ -21,7 +21,7 @@ namespace ILCompiler.DependencyAnalysis { factory.MetadataManager.GetDependenciesDueToMethodCodePresence(ref dependencies, factory, method, methodIL); - factory.InteropStubManager.AddDependeciesDueToPInvoke(ref dependencies, factory, method); + factory.InteropStubManager.AddDependenciesDueToPInvoke(ref dependencies, factory, method); if (method.OwningType is MetadataType mdOwningType && mdOwningType.Module.GetGlobalModuleType().GetStaticConstructor() is MethodDesc moduleCctor) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/EmptyInteropStubManager.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/EmptyInteropStubManager.cs index 1261a63c111..e81d3471702 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/EmptyInteropStubManager.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/EmptyInteropStubManager.cs @@ -21,14 +21,14 @@ namespace ILCompiler return null; } - public override void AddDependeciesDueToPInvoke(ref DependencyList dependencies, NodeFactory factory, MethodDesc method) + public override void AddDependenciesDueToPInvoke(ref DependencyList dependencies, NodeFactory factory, MethodDesc method) { } public override void AddInterestingInteropConstructedTypeDependencies(ref DependencyList dependencies, NodeFactory factory, TypeDesc type) { } - + public override void AddMarshalAPIsGenericDependencies(ref DependencyList dependencies, NodeFactory factory, MethodDesc method) { } diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/InteropStubManager.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/InteropStubManager.cs index 87a7a35bb8b..5e99e86115b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/InteropStubManager.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/InteropStubManager.cs @@ -16,8 +16,8 @@ namespace ILCompiler /// </summary> public abstract class InteropStubManager : ICompilationRootProvider { - public abstract void AddDependeciesDueToPInvoke(ref DependencyList dependencies, NodeFactory factory, MethodDesc method); - + public abstract void AddDependenciesDueToPInvoke(ref DependencyList dependencies, NodeFactory factory, MethodDesc method); + public abstract void AddInterestingInteropConstructedTypeDependencies(ref DependencyList dependencies, NodeFactory factory, TypeDesc type); public abstract PInvokeILProvider CreatePInvokeILProvider(); diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedInteropStubManager.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedInteropStubManager.cs index 430c77f98f9..3b7d912a7c6 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedInteropStubManager.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedInteropStubManager.cs @@ -28,7 +28,7 @@ namespace ILCompiler _logger = logger; } - public override void AddDependeciesDueToPInvoke(ref DependencyList dependencies, NodeFactory factory, MethodDesc method) + public override void AddDependenciesDueToPInvoke(ref DependencyList dependencies, NodeFactory factory, MethodDesc method) { if (method.IsPInvoke && method.OwningType is MetadataType type && MarshalHelpers.IsRuntimeMarshallingEnabled(type.Module)) { diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs index bc4de930eb8..c07d679f9be 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs @@ -420,7 +420,7 @@ namespace Internal.IL // Either // 1. no constraint resolution at compile time (!directMethod) // OR 2. no code sharing lookup in call - // OR 3. we have have resolved to an instantiating stub + // OR 3. we have resolved to an instantiating stub methodAfterConstraintResolution = directMethod; diff --git a/src/coreclr/tools/aot/ILCompiler.DependencyAnalysisFramework/DependencyAnalyzer.cs b/src/coreclr/tools/aot/ILCompiler.DependencyAnalysisFramework/DependencyAnalyzer.cs index 2d3b7b07246..ddde51c53f0 100644 --- a/src/coreclr/tools/aot/ILCompiler.DependencyAnalysisFramework/DependencyAnalyzer.cs +++ b/src/coreclr/tools/aot/ILCompiler.DependencyAnalysisFramework/DependencyAnalyzer.cs @@ -11,16 +11,16 @@ namespace ILCompiler.DependencyAnalysisFramework /// <summary> /// Implement a dependency analysis framework. This works much like a Garbage Collector's mark algorithm /// in that it finds a set of nodes from an initial root set. - /// + /// /// However, in contrast to a typical GC in addition to simple edges from a node, there may also /// be conditional edges where a node has a dependency if some other specific node exists in the /// graph, and dynamic edges in which a node has a dependency if some other node exists in the graph, /// but what that other node might be is not known until it may exist in the graph. - /// + /// /// This analyzer also attempts to maintain a serialized state of why nodes are in the graph /// with strings describing the reason a given node was added to the graph. The degree of logging /// is configurable via the MarkStrategy - /// + /// /// </summary> public sealed class DependencyAnalyzer<MarkStrategy, DependencyContextType> : DependencyAnalyzerBase<DependencyContextType> where MarkStrategy : struct, IDependencyAnalysisMarkStrategy<DependencyContextType> { @@ -244,7 +244,7 @@ namespace ILCompiler.DependencyAnalysisFramework Debug.Assert(currentNode.Marked); // Only some marked objects are interesting for dynamic dependencies - // store those in a seperate list to avoid excess scanning over non-interesting + // store those in a separate list to avoid excess scanning over non-interesting // nodes during dynamic dependency discovery if (currentNode.InterestingForDynamicDependencyAnalysis) { @@ -262,7 +262,7 @@ namespace ILCompiler.DependencyAnalysisFramework _markedNodesWithDynamicDependencies.Add(new DynamicDependencyNode(currentNode)); } - // If this new node satisfies any stored conditional dependencies, + // If this new node satisfies any stored conditional dependencies, // add them to the mark stack HashSet<DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry> storedDependencySet = null; if (_conditional_dependency_store.TryGetValue(currentNode, out storedDependencySet)) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs index 4ba66a5ca9c..84ec3e175cb 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs @@ -100,8 +100,8 @@ namespace ILCompiler } // Compilation Unit Index is the compilation unit of a given module. If the compilation unit - // is unknown the module will be given an independent index from other modules, but - // IsCompilationUnitIndexExact will return false for that index. All compilation unit indices + // is unknown the module will be given an independent index from other modules, but + // IsCompilationUnitIndexExact will return false for that index. All compilation unit indices // are >= 2, to allow for 0 and 1 to be sentinel values. private CompilationUnitIndex ModuleToCompilationUnitIndex(ModuleDesc nonEcmaModule) { @@ -111,12 +111,12 @@ namespace ILCompiler if (!VersionsWithModule(module)) return CompilationUnitIndex.OutsideOfVersionBubble; - - // Assemblies within the version bubble, but not compiled as part of this compilation unit are given - // unique seperate compilation units. The practical effect of this is that the compiler can assume that + + // Assemblies within the version bubble, but not compiled as part of this compilation unit are given + // unique separate compilation units. The practical effect of this is that the compiler can assume that // types which are entirely defined in one module can be laid out in an optimal fashion, but types // which are laid out relying on multiple modules cannot have their type layout precisely known as - // it is unknown if the modules are bounding into a single composite image or into individual assemblies. + // it is unknown if the modules are bounding into a single composite image or into individual assemblies. lock (_moduleCompilationUnits) { if (!_moduleCompilationUnits.TryGetValue(module, out CompilationUnitIndex compilationUnit)) @@ -139,7 +139,7 @@ namespace ILCompiler // 2. That any assembly which is compiled in the current process may be considered to be part of a single unit. // // At some point, the compiler could take new parameters to allow the compiler to know that assemblies not in the current compilation - // unit are to be compiled into composite images or into seperate binaries, and this helper function could return true for these other + // unit are to be compiled into composite images or into separate binaries, and this helper function could return true for these other // compilation unit shapes. if (compilationUnitIndex != CompilationUnitIndex.Current) return false; @@ -175,7 +175,7 @@ namespace ILCompiler { if (_bits == null) return false; - + return _bits[(int)CompilationUnitIndex.RESERVEDForHasMultipleCompilationUnits]; } } @@ -197,7 +197,7 @@ namespace ILCompiler if (other._bits.Length > _bits.Length) _bits.Length = other._bits.Length; - + if (other._bits.Length < _bits.Length) { for (int i = 0; i < other._bits.Length; i++) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs index 2b09cadceeb..2e7452815e6 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs @@ -1528,7 +1528,7 @@ namespace Internal.JitInterface // Either // 1. no constraint resolution at compile time (!directMethod) // OR 2. no code sharing lookup in call - // OR 3. we have have resolved to an instantiating stub + // OR 3. we have resolved to an instantiating stub // This check for introducing an instantiation stub comes from the logic in // MethodTable::TryResolveConstraintMethodApprox at diff --git a/src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs b/src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs index 6c691b46692..1896db9fae8 100644 --- a/src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs +++ b/src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs @@ -1199,7 +1199,7 @@ namespace Internal.JitInterface // Either // 1. no constraint resolution at compile time (!directMethod) // OR 2. no code sharing lookup in call - // OR 3. we have have resolved to an instantiating stub + // OR 3. we have resolved to an instantiating stub methodAfterConstraintResolution = directMethod; diff --git a/src/coreclr/tools/dotnet-pgo/Microsoft.Diagnostics.JitTrace/JitTraceRuntime.cs b/src/coreclr/tools/dotnet-pgo/Microsoft.Diagnostics.JitTrace/JitTraceRuntime.cs index d817bd437b4..3a6b3caf084 100644 --- a/src/coreclr/tools/dotnet-pgo/Microsoft.Diagnostics.JitTrace/JitTraceRuntime.cs +++ b/src/coreclr/tools/dotnet-pgo/Microsoft.Diagnostics.JitTrace/JitTraceRuntime.cs @@ -45,9 +45,9 @@ namespace Microsoft.Diagnostics.JitTrace return input.Replace("\\s", separator).Replace("\\\\", "\\"); } - private static string[] SplitAndUnescape(string input, string separator, char[] seperatorCharArray) + private static string[] SplitAndUnescape(string input, string separator, char[] separatorCharArray) { - string[] returnValue = input.Split(seperatorCharArray); + string[] returnValue = input.Split(separatorCharArray); for (int i = 0; i < returnValue.Length; i++) { returnValue[i] = UnescapeStr(returnValue[i], separator); diff --git a/src/coreclr/tools/dotnet-pgo/Program.cs b/src/coreclr/tools/dotnet-pgo/Program.cs index a9bfc1db466..8972d34ef62 100644 --- a/src/coreclr/tools/dotnet-pgo/Program.cs +++ b/src/coreclr/tools/dotnet-pgo/Program.cs @@ -214,7 +214,7 @@ namespace Microsoft.Diagnostics.Tools.Pgo ZippedETLReader etlReader = new ZippedETLReader(inputFileName, log); etlReader.EtlFileName = unzipedEtlFile; - // Figure out where to put the symbols. + // Figure out where to put the symbols. var inputDir = Path.GetDirectoryName(inputFileName); if (inputDir.Length == 0) { @@ -1692,7 +1692,7 @@ namespace Microsoft.Diagnostics.Tools.Pgo methodPrepareInstruction.Clear(); instantiationBuilder.Clear(); - // Format is FriendlyNameOfMethod~typeIndex~ArgCount~GenericParameterCount:genericParamsSeperatedByColons~MethodName + // Format is FriendlyNameOfMethod~typeIndex~ArgCount~GenericParameterCount:genericParamsSeparatedByColons~MethodName // This format is not sufficient to exactly describe methods, so the runtime component may compile similar methods // In the various strings \ is escaped to \\ and in the outer ~ csv the ~ character is escaped to \s. In the inner csv : is escaped to \s try diff --git a/src/coreclr/tools/superpmi/superpmi-shared/compileresult.cpp b/src/coreclr/tools/superpmi/superpmi-shared/compileresult.cpp index fdfc7726688..ab36f2fa40b 100644 --- a/src/coreclr/tools/superpmi/superpmi-shared/compileresult.cpp +++ b/src/coreclr/tools/superpmi/superpmi-shared/compileresult.cpp @@ -915,7 +915,7 @@ void CompileResult::applyRelocs(RelocContext* rc, unsigned char* block1, ULONG b // add that to the MC, not just the CompileResult), and we don't have any control over // where the JIT buffer is allocated. To handle this, if the getRelocTypeHint() was // called on the target address, and the VM returned IMAGE_REL_BASED_REL32, then simply - // use the low-order 32 bits of the target address. This is unique enough for for assembly + // use the low-order 32 bits of the target address. This is unique enough for assembly // diffs, because the delta will compare identically and won't be dependent on where // SuperPMI allocated the JIT memory. @@ -1227,7 +1227,7 @@ void CompileResult::dmpRecordCallSiteWithoutSignature(DWORD key, DWORDLONG metho void CompileResult::repRecordCallSite(ULONG instrOffset, CORINFO_SIG_INFO* callSig, CORINFO_METHOD_HANDLE methodHandle) { - + if (RecordCallSiteWithSignature == nullptr) { // The most call site records have only `methodHandle`, so creating two separate maps give us better perfomance @@ -1273,7 +1273,7 @@ bool CompileResult::fndRecordCallSiteSigInfo(ULONG instrOffset, CORINFO_SIG_INFO bool CompileResult::fndRecordCallSiteMethodHandle(ULONG instrOffset, CORINFO_METHOD_HANDLE* pMethodHandle) { - + if (RecordCallSiteWithSignature != nullptr && RecordCallSiteWithSignature->GetIndex(instrOffset) != -1) { Agnostic_RecordCallSite value = RecordCallSiteWithSignature->Get(instrOffset); diff --git a/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp b/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp index 61d506443e9..97be9fbfc9f 100644 --- a/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp +++ b/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp @@ -7130,7 +7130,7 @@ MethodContext::Environment MethodContext::cloneEnvironment() return env; } -// Check that there is a difference between the current enviroment variables maps and the prevEnv. +// Check that there is a difference between the current environment variables maps and the prevEnv. bool MethodContext::WasEnvironmentChanged(const Environment& prevEnv) { if (!IsEnvironmentHeaderEqual(prevEnv)) diff --git a/src/coreclr/tools/superpmi/superpmi-shim-collector/icorjitinfo.cpp b/src/coreclr/tools/superpmi/superpmi-shim-collector/icorjitinfo.cpp index 3e7c8562355..458b3ed97c6 100644 --- a/src/coreclr/tools/superpmi/superpmi-shim-collector/icorjitinfo.cpp +++ b/src/coreclr/tools/superpmi/superpmi-shim-collector/icorjitinfo.cpp @@ -501,7 +501,7 @@ CORINFO_CLASS_HANDLE interceptor_ICJI::getTypeInstantiationArgument(CORINFO_CLAS // was truncated when copied to the buffer. // // Operation: -// +// // On entry, `*pnBufLen` specifies the size of the buffer pointed to by `*ppBuf` as a count of characters. // There are two cases: // 1. If the size is zero, the function computes the length of the representation and returns that. @@ -1933,7 +1933,7 @@ bool interceptor_ICJI::logMsg(unsigned level, const char* fmt, va_list args) } // do an assert. will return true if the code should retry (DebugBreak) -// returns false, if the assert should be igored. +// returns false, if the assert should be ignored. int interceptor_ICJI::doAssert(const char* szFile, int iLine, const char* szExpr) { mc->cr->AddCall("doAssert"); diff --git a/src/coreclr/tools/superpmi/superpmi/icorjitinfo.cpp b/src/coreclr/tools/superpmi/superpmi/icorjitinfo.cpp index ebfb397b3b8..a57b14cbee9 100644 --- a/src/coreclr/tools/superpmi/superpmi/icorjitinfo.cpp +++ b/src/coreclr/tools/superpmi/superpmi/icorjitinfo.cpp @@ -433,7 +433,7 @@ CORINFO_CLASS_HANDLE MyICJI::getTypeInstantiationArgument(CORINFO_CLASS_HANDLE c // was truncated when copied to the buffer. // // Operation: -// +// // On entry, `*pnBufLen` specifies the size of the buffer pointed to by `*ppBuf` as a count of characters. // There are two cases: // 1. If the size is zero, the function computes the length of the representation and returns that. @@ -1782,7 +1782,7 @@ bool MyICJI::logMsg(unsigned level, const char* fmt, va_list args) } // do an assert. will return true if the code should retry (DebugBreak) -// returns false, if the assert should be igored. +// returns false, if the assert should be ignored. int MyICJI::doAssert(const char* szFile, int iLine, const char* szExpr) { jitInstance->mc->cr->AddCall("doAssert"); diff --git a/src/coreclr/tools/superpmi/superpmi/jitinstance.cpp b/src/coreclr/tools/superpmi/superpmi/jitinstance.cpp index bdc41b352f6..da481413818 100644 --- a/src/coreclr/tools/superpmi/superpmi/jitinstance.cpp +++ b/src/coreclr/tools/superpmi/superpmi/jitinstance.cpp @@ -588,7 +588,7 @@ bool JitInstance::callJitStartup(ICorJitHost* jithost) return param.result; } -// Reset JitConfig, that stores Enviroment variables. +// Reset JitConfig, that stores Environment variables. bool JitInstance::resetConfig(MethodContext* firstContext) { if (pnjitStartup == nullptr) diff --git a/src/coreclr/tools/superpmi/superpmi/superpmi.cpp b/src/coreclr/tools/superpmi/superpmi/superpmi.cpp index aaa026ff693..5ed5f155c2d 100644 --- a/src/coreclr/tools/superpmi/superpmi/superpmi.cpp +++ b/src/coreclr/tools/superpmi/superpmi/superpmi.cpp @@ -355,13 +355,13 @@ int __cdecl main(int argc, char* argv[]) { if (!jit->resetConfig(mc)) { - LogError("JIT can't reset enviroment"); + LogError("JIT can't reset environment"); } if (o.nameOfJit2 != nullptr) { if (!jit2->resetConfig(mc)) { - LogError("JIT2 can't reset enviroment"); + LogError("JIT2 can't reset environment"); } } } diff --git a/src/coreclr/utilcode/clrhost_nodependencies.cpp b/src/coreclr/utilcode/clrhost_nodependencies.cpp index 7d2fceb3005..15ee748575e 100644 --- a/src/coreclr/utilcode/clrhost_nodependencies.cpp +++ b/src/coreclr/utilcode/clrhost_nodependencies.cpp @@ -39,7 +39,7 @@ void DisableThrowCheck() } #ifdef HAS_ADDRESS_SANITIZER -// use the functionality from address santizier (which does not throw exceptions) +// use the functionality from address sanitizer (which does not throw exceptions) #else #define CLRThrowsExceptionWorker() RealCLRThrowsExceptionWorker(__FUNCTION__, __FILE__, __LINE__) @@ -216,7 +216,7 @@ ClrDebugState *CLRInitDebugState() const NoThrow nothrow = { 0 }; #if defined(HAS_ADDRESS_SANITIZER) || defined(DACCESS_COMPILE) -// use standard heap functions for address santizier +// use standard heap functions for address sanitizer #else #ifdef _DEBUG @@ -350,7 +350,7 @@ operator new[](size_t n) void * __cdecl operator new(size_t n, const NoThrow&) NOEXCEPT { #if defined(HAS_ADDRESS_SANITIZER) || defined(DACCESS_COMPILE) - // use standard heap functions for address santizier (which doesn't provide for NoThrow) + // use standard heap functions for address sanitizer (which doesn't provide for NoThrow) void * result = operator new(n); #else STATIC_CONTRACT_NOTHROW; @@ -369,7 +369,7 @@ void * __cdecl operator new(size_t n, const NoThrow&) NOEXCEPT void * __cdecl operator new[](size_t n, const NoThrow&) NOEXCEPT { #if defined(HAS_ADDRESS_SANITIZER) || defined(DACCESS_COMPILE) - // use standard heap functions for address santizier (which doesn't provide for NoThrow) + // use standard heap functions for address sanitizer (which doesn't provide for NoThrow) void * result = operator new[](n); #else STATIC_CONTRACT_NOTHROW; @@ -386,7 +386,7 @@ void * __cdecl operator new[](size_t n, const NoThrow&) NOEXCEPT } #if defined(HAS_ADDRESS_SANITIZER) || defined(DACCESS_COMPILE) -// use standard heap functions for address santizier +// use standard heap functions for address sanitizer #else void __cdecl operator delete(void *p) NOEXCEPT diff --git a/src/coreclr/utilcode/pedecoder.cpp b/src/coreclr/utilcode/pedecoder.cpp index 7e72b1bc88d..209db00f9e4 100644 --- a/src/coreclr/utilcode/pedecoder.cpp +++ b/src/coreclr/utilcode/pedecoder.cpp @@ -2160,7 +2160,7 @@ CHECK PEDecoder::CheckILMethod(RVA rva) CONTRACT_CHECK_END; // - // Incrementaly validate that the entire IL method body is within the bounds of the image + // Incrementally validate that the entire IL method body is within the bounds of the image // // We need to have at least the tiny header @@ -2207,7 +2207,7 @@ CHECK PEDecoder::CheckILMethod(RVA rva) // Optional sections following the code // - for (;;) + while (true) { CHECK(CheckRva(rva, UINT32(pSect - pIL) + sizeof(IMAGE_COR_ILMETHOD_SECT_SMALL))); @@ -2294,7 +2294,7 @@ SIZE_T PEDecoder::ComputeILMethodSize(TADDR pIL) // DACized copy of code:COR_ILMETHOD_FAT::GetSect TADDR pSect = AlignUp(pIL + codeEnd, 4); - for (;;) + while (true) { PTR_COR_ILMETHOD_SECT_SMALL pSectSmall = PTR_COR_ILMETHOD_SECT_SMALL(pSect); diff --git a/src/coreclr/vm/amd64/cgencpu.h b/src/coreclr/vm/amd64/cgencpu.h index d5626278562..39d9915c711 100644 --- a/src/coreclr/vm/amd64/cgencpu.h +++ b/src/coreclr/vm/amd64/cgencpu.h @@ -58,7 +58,7 @@ EXTERN_C void FastCallFinalizeWorker(Object *obj, PCODE funcPtr); #define HAS_THISPTR_RETBUF_PRECODE 1 #define CODE_SIZE_ALIGN 16 // must alloc code blocks on 8-byte boundaries; for perf reasons we use 16 byte boundaries -#define CACHE_LINE_SIZE 64 // Current AMD64 processors have 64-byte cache lines as per AMD64 optmization manual +#define CACHE_LINE_SIZE 64 // Current AMD64 processors have 64-byte cache lines as per AMD64 optimization manual #define LOG2SLOT LOG2_PTRSIZE diff --git a/src/coreclr/vm/amd64/excepamd64.cpp b/src/coreclr/vm/amd64/excepamd64.cpp index ca978482dc3..17509c3ac1d 100644 --- a/src/coreclr/vm/amd64/excepamd64.cpp +++ b/src/coreclr/vm/amd64/excepamd64.cpp @@ -6,8 +6,6 @@ */ // -// - #include "common.h" #include "frames.h" @@ -27,8 +25,6 @@ #include "exceptionhandling.h" #include "virtualcallstub.h" - - #if !defined(DACCESS_COMPILE) VOID ResetCurrentContext() @@ -199,7 +195,7 @@ RtlVirtualUnwind_Worker ( // that the debugger is attched when we get here. _ASSERTE(CORDebuggerAttached()); - LOG((LF_CORDB, LL_EVERYTHING, "RVU_CBSW: in RtlVitualUnwind_ClrDbgSafeWorker, ControlPc=0x%p\n", ControlPc)); + LOG((LF_CORDB, LL_EVERYTHING, "RVU_CBSW: in RtlVirtualUnwind_ClrDbgSafeWorker, ControlPc=0x%p\n", ControlPc)); BOOL InEpilogue = FALSE; BOOL HasManagedBreakpoint = FALSE; @@ -630,7 +626,7 @@ AdjustContextForVirtualStub( return FALSE; } - PCODE callsite = *dac_cast<PTR_PCODE>(GetSP(pContext)); + PCODE callsite = *dac_cast<PTR_PCODE>(GetSP(pContext)); if (pExceptionRecord != NULL) { pExceptionRecord->ExceptionAddress = (PVOID)callsite; @@ -642,4 +638,3 @@ AdjustContextForVirtualStub( } #endif - diff --git a/src/coreclr/vm/appdomain.cpp b/src/coreclr/vm/appdomain.cpp index f83fa90ee60..c17659825cf 100644 --- a/src/coreclr/vm/appdomain.cpp +++ b/src/coreclr/vm/appdomain.cpp @@ -2478,10 +2478,6 @@ void FileLoadLock::HolderLeave(FileLoadLock *pThis) } - - - - // // Assembly loading: // @@ -2499,7 +2495,7 @@ void FileLoadLock::HolderLeave(FileLoadLock *pThis) // this constraint is expected and can be dealt with. // // Note that there is one case where this still doesn't handle recursion, and that is the -// security subsytem. The security system runs managed code, and thus must typically fully +// security subsystem. The security system runs managed code, and thus must typically fully // initialize assemblies of permission sets it is trying to use. (And of course, these may be used // while those assemblies are initializing.) This is dealt with in the historical manner - namely // the security system passes in a special flag which says that it will deal with null return values diff --git a/src/coreclr/vm/assemblyspec.cpp b/src/coreclr/vm/assemblyspec.cpp index be804c70ce6..14ad9e680b1 100644 --- a/src/coreclr/vm/assemblyspec.cpp +++ b/src/coreclr/vm/assemblyspec.cpp @@ -954,7 +954,7 @@ BOOL AssemblySpecBindingCache::StoreAssembly(AssemblySpec *pSpec, DomainAssembly } else { - // OK if we have have a matching PEAssembly + // OK if we have a matching PEAssembly if (entry->GetFile() != NULL && pAssembly->GetPEAssembly()->Equals(entry->GetFile())) { diff --git a/src/coreclr/vm/clsload.hpp b/src/coreclr/vm/clsload.hpp index 820e69d8cd9..bfaaab3b944 100644 --- a/src/coreclr/vm/clsload.hpp +++ b/src/coreclr/vm/clsload.hpp @@ -561,7 +561,7 @@ private: public: //#LoaderModule // LoaderModule determines in which module an item gets placed. - // For everything except paramaterized types and methods the choice is easy. + // For everything except parameterized types and methods the choice is easy. // // If NGEN'ing we may choose to place the item into the current module (which is different from runtime behavior). // diff --git a/src/coreclr/vm/codeman.cpp b/src/coreclr/vm/codeman.cpp index 9119434c088..c3341522d49 100644 --- a/src/coreclr/vm/codeman.cpp +++ b/src/coreclr/vm/codeman.cpp @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -// codeman.cpp - a managment class for handling multiple code managers -// // +// codeman.cpp - a managment class for handling multiple code managers +// #include "common.h" #include "jitinterface.h" @@ -929,7 +929,7 @@ PTR_RUNTIME_FUNCTION FindRootEntry(PTR_RUNTIME_FUNCTION pFunctionEntry, TADDR ba // Walk backwards in the RUNTIME_FUNCTION array until we find a non-fragment. // We're guaranteed to find one, because we require that a fragment live in a function or funclet // that has a prolog, which will have non-fragment .xdata. - for (;;) + while (true) { if (!IsFunctionFragment(baseAddress, pRootEntry)) { @@ -2393,7 +2393,7 @@ VOID EEJitManager::EnsureJumpStubReserve(BYTE * pImageBase, SIZE_T imageSize, SI { NewHolder<EmergencyJumpStubReserve> pNewReserve(new EmergencyJumpStubReserve()); - for (;;) + while (true) { BYTE * loAddrCurrent = loAddr; BYTE * hiAddrCurrent = hiAddr; @@ -5865,7 +5865,7 @@ PTR_EXCEPTION_CLAUSE_TOKEN ReadyToRunJitManager::GetNextEHClause(EH_CLAUSE_ENUME CORCOMPILE_EXCEPTION_CLAUSE* pClause = &(dac_cast<PTR_CORCOMPILE_EXCEPTION_CLAUSE>(pEnumState->pExceptionClauseArray)[iCurrentPos]); - // copy to the input parmeter, this is a nice abstraction for the future + // copy to the input parameter, this is a nice abstraction for the future // if we want to compress the Clause encoding, we can do without affecting the call sites pEHClauseOut->TryStartPC = pClause->TryStartPC; pEHClauseOut->TryEndPC = pClause->TryEndPC; diff --git a/src/coreclr/vm/dbginterface.h b/src/coreclr/vm/dbginterface.h index c9bc65c33fd..c7b4d56bd79 100644 --- a/src/coreclr/vm/dbginterface.h +++ b/src/coreclr/vm/dbginterface.h @@ -21,7 +21,7 @@ typedef void (*FAVORCALLBACK)(void *); // // The purpose of this object is to serve as an entry point to the -// debugger, which used to reside in a seperate DLL. +// debugger, which used to reside in a separate DLL. // class DebugInterface diff --git a/src/coreclr/vm/eetwain.cpp b/src/coreclr/vm/eetwain.cpp index 47e07ff1e8e..71802141bb9 100644 --- a/src/coreclr/vm/eetwain.cpp +++ b/src/coreclr/vm/eetwain.cpp @@ -813,7 +813,7 @@ bool VarIsInReg(ICorDebugInfo::VarLoc varLoc) * Last chance for the runtime support to do fixups in the context * before execution continues inside an EnC updated function. * It also adjusts ESP and munges on the stack. So the caller has to make - * sure that that stack region isnt needed (by doing a localloc) + * sure that this stack region is not needed (by doing a localloc). * Also, if this returns EnC_FAIL, we should not have munged the * context ie. transcated commit * The plan of attack is: @@ -4604,7 +4604,7 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY pContext, * in order to adjust ESP. * * Note that we report "this" for all methods, even if - * noncontinuable, because because of the off chance they may be + * noncontinuable, because of the off chance they may be * synchronized and we have to release the monitor on unwind. This * could conceivably be optimized, but it turns out to be more * expensive to check whether we're synchronized (which involves diff --git a/src/coreclr/vm/encee.cpp b/src/coreclr/vm/encee.cpp index 07586ac3995..8911f976bf4 100644 --- a/src/coreclr/vm/encee.cpp +++ b/src/coreclr/vm/encee.cpp @@ -321,7 +321,7 @@ HRESULT EditAndContinueModule::UpdateMethod(MethodDesc *pMethod) // Reset any flags relevant to the old code // - // Note that this only works since we've very carefullly made sure that _all_ references + // Note that this only works since we've very carefully made sure that _all_ references // to the Method's code must be to the call/jmp blob immediately in front of the // MethodDesc itself. See MethodDesc::IsEnCMethod() // diff --git a/src/coreclr/vm/exceptionhandling.cpp b/src/coreclr/vm/exceptionhandling.cpp index 546a7e69b42..204a6cc5a1d 100644 --- a/src/coreclr/vm/exceptionhandling.cpp +++ b/src/coreclr/vm/exceptionhandling.cpp @@ -1597,7 +1597,7 @@ bool ExceptionTracker::UpdateScannedStackRange(StackFrame sf, bool fIsFirstPass) CONTRACTL { // Since this function will modify the scanned stack range, which is also accessed during the GC stackwalk, - // we invoke it in COOP mode so that that access to the range is synchronized. + // we invoke it in COOP mode so that the access to this range is synchronized. MODE_COOPERATIVE; GC_TRIGGERS; THROWS; @@ -2083,7 +2083,7 @@ bool ExceptionTracker::HandleNestedExceptionEscape(StackFrame sf, bool fIsFirstP CONTRACTL { // Since this function can modify the scanned stack range, which is also accessed during the GC stackwalk, - // we invoke it in COOP mode so that that access to the range is synchronized. + // we invoke it in COOP mode so that the access to this range is synchronized. MODE_COOPERATIVE; GC_NOTRIGGER; NOTHROW; diff --git a/src/coreclr/vm/exceptmacros.h b/src/coreclr/vm/exceptmacros.h index 4967da497b5..41200e42f76 100644 --- a/src/coreclr/vm/exceptmacros.h +++ b/src/coreclr/vm/exceptmacros.h @@ -182,7 +182,7 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrowOM(); //========================================================================== -// Helpful macros to declare exception handlers, their implementaiton, +// Helpful macros to declare exception handlers, their implementation, // and to call them. //========================================================================== diff --git a/src/coreclr/vm/gdbjit.cpp b/src/coreclr/vm/gdbjit.cpp index d1939273ada..525ca50a28c 100644 --- a/src/coreclr/vm/gdbjit.cpp +++ b/src/coreclr/vm/gdbjit.cpp @@ -3166,7 +3166,7 @@ public: } }; -/* Buid the source files table for DWARF source line info */ +/* Build the source files table for DWARF source line info */ bool NotifyGdb::BuildFileTable(MemBuf& buf, SymbolsInfo* lines, unsigned nlines, const char * &cuPath) { FileTableBuilder fileTable(nlines); diff --git a/src/coreclr/vm/i386/excepx86.cpp b/src/coreclr/vm/i386/excepx86.cpp index 524b0ebd9ee..08282199af4 100644 --- a/src/coreclr/vm/i386/excepx86.cpp +++ b/src/coreclr/vm/i386/excepx86.cpp @@ -1767,7 +1767,7 @@ NOINLINE LPVOID COMPlusEndCatchWorker(Thread * pThread) EEToProfilerExceptionInterfaceWrapper::ExceptionCatcherLeave(); // no need to set pExInfo->m_ClauseType = (DWORD)COR_PRF_CLAUSE_NONE now that the - // notification is done because because the ExInfo record is about to be popped off anyway + // notification is done because the ExInfo record is about to be popped off anyway LOG((LF_EH, LL_INFO1000, "COMPlusPEndCatch:pThread:0x%x\n",pThread)); @@ -1805,7 +1805,7 @@ NOINLINE LPVOID COMPlusEndCatchWorker(Thread * pThread) // will not be available. Thus, we should reset the severity only if its not such a thread. // // This behaviour (of debugger doing SetIP) is not allowed on 64bit since the catch clauses are implemented - // as a seperate funclet and it's just not allowed to set the IP across EH scopes, such as from inside a catch + // as a separate funclet and it's just not allowed to set the IP across EH scopes, such as from inside a catch // clause to outside of the catch clause. bool fIsDebuggerHelperThread = (g_pDebugInterface == NULL) ? false : g_pDebugInterface->ThisIsHelperThread(); diff --git a/src/coreclr/vm/interoplibinterface_comwrappers.cpp b/src/coreclr/vm/interoplibinterface_comwrappers.cpp index 88d4aa30bd5..14046a7f16d 100644 --- a/src/coreclr/vm/interoplibinterface_comwrappers.cpp +++ b/src/coreclr/vm/interoplibinterface_comwrappers.cpp @@ -413,7 +413,7 @@ namespace // Separate the wrapper from the tracker runtime prior to // passing them onto the caller. This call is okay to make // even if the instance isn't from the tracker runtime. - // We switch to Preemptive mode since seperating a wrapper + // We switch to Preemptive mode since separating a wrapper // requires us to call out to non-runtime code which could // call back into the runtime and/or trigger a GC. GCX_PREEMP(); diff --git a/src/coreclr/vm/jithelpers.cpp b/src/coreclr/vm/jithelpers.cpp index 04014ce17a2..2c2d3b9a304 100644 --- a/src/coreclr/vm/jithelpers.cpp +++ b/src/coreclr/vm/jithelpers.cpp @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. - - #include "common.h" #include "jitinterface.h" #include "codeman.h" @@ -3092,7 +3090,7 @@ CORINFO_GENERIC_HANDLE JIT_GenericHandleWorker(MethodDesc * pMD, MethodTable * p } pDeclaringMT = pMT; - for (;;) + while (true) { MethodTable * pParentMT = pDeclaringMT->GetParentMethodTable(); if (pParentMT->GetNumDicts() <= dictionaryIndex) @@ -5811,7 +5809,7 @@ void WriteJitHelperCountToSTRESSLOG() switch (jitHelperLoggingLevel) { case 1: - // This will print a comma seperated list: + // This will print a comma separated list: // CORINFO_XXX_HELPER, 10 // CORINFO_YYYY_HELPER, 11 STRESS_LOG2(logFacility, logLevel, "%s, %d\n", name, count); diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp index 5e824413707..cb4f697d8ba 100644 --- a/src/coreclr/vm/jitinterface.cpp +++ b/src/coreclr/vm/jitinterface.cpp @@ -2741,7 +2741,7 @@ void CEEInfo::ScanToken(Module * pModule, CORINFO_RESOLVED_TOKEN * pResolvedToke // // Scan chain of parent types // - for (;;) + while (true) { Module * pDefModule = pMT->GetModule(); if (pDefModule->IsSystem()) @@ -3569,7 +3569,7 @@ uint32_t CEEInfo::getClassAttribs (CORINFO_CLASS_HANDLE clsHnd) MODE_PREEMPTIVE; } CONTRACTL_END; - // <REVISIT_TODO>@todo FIX need to really fetch the class atributes. at present + // <REVISIT_TODO>@todo FIX need to really fetch the class attributes. at present // we don't need to because the JIT only cares in the case of COM classes</REVISIT_TODO> uint32_t ret = 0; @@ -4375,9 +4375,8 @@ CORINFO_CLASS_HANDLE CEEInfo::mergeClasses( _ASSERTE(merged == reflexive); } - //If both sides are arrays, then the result is either an array or g_pArrayClass. The above is - //actually true about the element type for references types, but I think that that is a little - //excessive for sanity. + // If both sides are arrays, then the result is either an array or g_pArrayClass. The above is + // actually true for reference types as well, but it is a little excessive to deal with. if (hnd1.IsArray() && hnd2.IsArray()) { _ASSERTE((merged.IsArray() && reflexive.IsArray()) @@ -4913,7 +4912,7 @@ void CEEInfo::getCallInfo( // Either // 1. no constraint resolution at compile time (!directMethod) // OR 2. no code sharing lookup in call - // OR 3. we have have resolved to an instantiating stub + // OR 3. we have resolved to an instantiating stub pMDAfterConstraintResolution = directMethod; _ASSERTE(!pMDAfterConstraintResolution->IsInterface()); @@ -12815,7 +12814,7 @@ PCODE UnsafeJitFunction(PrepareCodeConfig* config, #endif // defined(TARGET_AMD64) || defined(TARGET_ARM64) - for (;;) + while (true) { CEEJitInfo jitInfo(ftn, ILHeader, jitMgr, !flags.IsSet(CORJIT_FLAGS::CORJIT_FLAG_NO_INLINING)); diff --git a/src/coreclr/vm/memberload.cpp b/src/coreclr/vm/memberload.cpp index 4c8e7dc7e2a..57e4bd342e4 100644 --- a/src/coreclr/vm/memberload.cpp +++ b/src/coreclr/vm/memberload.cpp @@ -1440,7 +1440,7 @@ MemberLoader::FindConstructor(MethodTable * pMT, PCCOR_SIGNATURE pSignature,DWOR continue; } - // Find only the constructor for for this object + // Find only the constructor for this object _ASSERTE(pCurMethod->GetMethodTable() == pMT->GetCanonicalMethodTable()); PCCOR_SIGNATURE pCurMethodSig; diff --git a/src/coreclr/vm/method.hpp b/src/coreclr/vm/method.hpp index 0e62b4a67d6..bc58090dd58 100644 --- a/src/coreclr/vm/method.hpp +++ b/src/coreclr/vm/method.hpp @@ -1122,7 +1122,7 @@ public: public: // True iff it is possible to change the code this method will run using the CodeVersionManager. Note: EnC currently returns - // false here because it uses its own seperate scheme to manage versionability. We will likely want to converge them at some + // false here because it uses its own separate scheme to manage versionability. We will likely want to converge them at some // point. bool IsVersionable() { @@ -2167,7 +2167,7 @@ class MethodDescChunk enum { enum_flag_TokenRangeMask = 0x07FF, // This must equal METHOD_TOKEN_RANGE_MASK calculated higher in this file - // These are seperate to allow the flags space available and used to be obvious here + // These are separate to allow the flags space available and used to be obvious here // and for the logic that splits the token to be algorithmically generated based on the // #define enum_flag_HasCompactEntrypoints = 0x4000, // Compact temporary entry points diff --git a/src/coreclr/vm/methodtablebuilder.cpp b/src/coreclr/vm/methodtablebuilder.cpp index 47563cbe66e..78e26991bcf 100644 --- a/src/coreclr/vm/methodtablebuilder.cpp +++ b/src/coreclr/vm/methodtablebuilder.cpp @@ -8617,7 +8617,7 @@ MethodTableBuilder::HandleExplicitLayout( // we will put a catchall "break" here which will cause the typeload to abort (albeit with a probably misleading // error message.) break; - } // for(;;) + } // We only break out of the loop above if we detected an error. if (i < bmtMetaData->cFields || !explicitClassTrust.IsLegal()) @@ -9296,9 +9296,8 @@ MethodTableBuilder::LoadExactInterfaceMap(MethodTable *pMT) { //#LoadExactInterfaceMap_Algorithm2 // Exact interface instantiation loading TECHNIQUE 2 - The exact instantiation has caused some duplicates to - // appear in the interface map! This may not be an error: if the duplicates - // were ones that arose because because of inheritance from - // a parent type then we accept that. For example + // appear in the interface map! This may not be an error: if the duplicates were ones that arose because of + // inheritance from a parent type then we accept that. For example // class C<T> : I<T> // class D<T> : C<T>, I<string> // is acceptable even when loading D<string>. Note that in such a case @@ -9509,7 +9508,7 @@ MethodTableBuilder::LoadExactInterfaceMap(MethodTable *pMT) // Compare original and duplicate interface entries in the dispatch map if they contain // different implementation for the same interface method - for (;;) + while (true) { if (!originalIt.IsValid() || !duplicateIt.IsValid()) { // We reached end of one dispatch map iterator diff --git a/src/coreclr/vm/multicorejit.cpp b/src/coreclr/vm/multicorejit.cpp index 18a0a141a82..15d99449068 100644 --- a/src/coreclr/vm/multicorejit.cpp +++ b/src/coreclr/vm/multicorejit.cpp @@ -5,7 +5,7 @@ // // =========================================================================== -// This file contains the implementation for MultiCore JIT (player in a seperate file MultiCoreJITPlayer.cpp) +// This file contains the implementation for MultiCore JIT (player in a separate file MultiCoreJITPlayer.cpp) // =========================================================================== // @@ -993,7 +993,7 @@ HRESULT MulticoreJitRecorder::StartProfile(const WCHAR * pRoot, const WCHAR * pF { m_fullFileName = pRoot; - // Append seperator if root does not end with one + // Append separator if root does not end with one unsigned len = m_fullFileName.GetCount(); if ((len != 0) && (m_fullFileName[len - 1] != '\\')) diff --git a/src/coreclr/vm/object.cpp b/src/coreclr/vm/object.cpp index fb03b8b7011..ae28bee5102 100644 --- a/src/coreclr/vm/object.cpp +++ b/src/coreclr/vm/object.cpp @@ -6,8 +6,6 @@ // Definitions of a Com+ Object // - - #include "common.h" #include "vars.hpp" @@ -877,7 +875,8 @@ BOOL StringObject::CaseInsensitiveCompHelper(_In_reads_(aLength) WCHAR *strAChar unsigned charA; unsigned charB; - for(;;) { + while (true) + { charA = *strAChars; charB = (unsigned) *strBChars; @@ -1163,7 +1162,7 @@ int OBJECTREF::operator==(const OBJECTREF &objref) const { // REVISIT_TODO: Weakening the contract system a little bit here. We should really // add a special NULLOBJECTREF which can be used for these situations and have - // a seperate code path for that with the correct contract protections. + // a separate code path for that with the correct contract protections. STATIC_CONTRACT_VIOLATION(ModeViolation); VALIDATEOBJECT(objref.m_asObj); @@ -1201,7 +1200,7 @@ int OBJECTREF::operator!=(const OBJECTREF &objref) const { // REVISIT_TODO: Weakening the contract system a little bit here. We should really // add a special NULLOBJECTREF which can be used for these situations and have - // a seperate code path for that with the correct contract protections. + // a separate code path for that with the correct contract protections. STATIC_CONTRACT_VIOLATION(ModeViolation); VALIDATEOBJECT(objref.m_asObj); diff --git a/src/coreclr/vm/object.h b/src/coreclr/vm/object.h index 7d5e4b121f1..f1b96cf0a9c 100644 --- a/src/coreclr/vm/object.h +++ b/src/coreclr/vm/object.h @@ -1097,7 +1097,7 @@ public: // m_object - a field that has a reference type in it. Used only for RuntimeMethodInfoStub to keep the real type alive. // This structure matches the structure up to the m_pMD for several different managed types. // (RuntimeConstructorInfo, RuntimeMethodInfo, and RuntimeMethodInfoStub). These types are unrelated in the type -// system except that they all implement a particular interface. It is important that that interface is not attached to any +// system except that they all implement a particular interface. It is important that such interface is not attached to any // type that does not sufficiently match this data structure. class ReflectMethodObject : public BaseObjectWithCachedData { @@ -1141,7 +1141,7 @@ public: // m_object - a field that has a reference type in it. Used only for RuntimeFieldInfoStub to keep the real type alive. // This structure matches the structure up to the m_pFD for several different managed types. // (RtFieldInfo and RuntimeFieldInfoStub). These types are unrelated in the type -// system except that they all implement a particular interface. It is important that that interface is not attached to any +// system except that they all implement a particular interface. It is important that such interface is not attached to any // type that does not sufficiently match this data structure. class ReflectFieldObject : public BaseObjectWithCachedData { diff --git a/src/coreclr/vm/peimage.cpp b/src/coreclr/vm/peimage.cpp index f9476846130..b9bb8ff068b 100644 --- a/src/coreclr/vm/peimage.cpp +++ b/src/coreclr/vm/peimage.cpp @@ -694,7 +694,7 @@ void PEImage::EnumMemoryRegions(CLRDataEnumMemoryFlags flags) // This just gets the image headers into the dump. // This is used, for example, for ngen images to ensure we have the debug directory so we // can find the managed PDBs. - // No lock here as the processs should be suspended. + // No lock here as the process should be suspended. if (m_pLayouts[IMAGE_FLAT].IsValid() && m_pLayouts[IMAGE_FLAT]!=NULL) m_pLayouts[IMAGE_FLAT]->EnumMemoryRegions(flags); if (m_pLayouts[IMAGE_LOADED].IsValid() && m_pLayouts[IMAGE_LOADED]!=NULL) diff --git a/src/coreclr/vm/prestub.cpp b/src/coreclr/vm/prestub.cpp index 3bc301ec938..c3fe015f053 100644 --- a/src/coreclr/vm/prestub.cpp +++ b/src/coreclr/vm/prestub.cpp @@ -255,7 +255,7 @@ PCODE MethodDesc::DoBackpatch(MethodTable * pMT, MethodTable *pDispatchingMT, BO // <TODO> FIX IN BETA 2 // // g_pNotificationTable is only modified by the DAC and therefore the -// optmizer can assume that it will always be its default value and has +// optimizer can assume that it will always be its default value and has // been seen to (on IA64 free builds) eliminate the code in DACNotifyCompilationFinished // such that DAC notifications are no longer sent. // diff --git a/src/coreclr/vm/proftoeeinterfaceimpl.cpp b/src/coreclr/vm/proftoeeinterfaceimpl.cpp index 5162ac38a3b..4c827783d51 100644 --- a/src/coreclr/vm/proftoeeinterfaceimpl.cpp +++ b/src/coreclr/vm/proftoeeinterfaceimpl.cpp @@ -4156,7 +4156,7 @@ HRESULT ProfToEEInterfaceImpl::GetModuleInfo2(ModuleID moduleId, if (pAssemblyId != NULL) { // Lie and say the assembly isn't available until we are loaded (even though it is.) - // This is for backward compatibilty - we may want to change it + // This is for backward compatibility - we may want to change it if (pModule->IsProfilerNotified()) { Assembly *pAssembly = pModule->GetAssembly(); diff --git a/src/coreclr/vm/runtimecallablewrapper.cpp b/src/coreclr/vm/runtimecallablewrapper.cpp index 5e130282822..84c0c5bdcd0 100644 --- a/src/coreclr/vm/runtimecallablewrapper.cpp +++ b/src/coreclr/vm/runtimecallablewrapper.cpp @@ -1476,7 +1476,7 @@ void RCW::Initialize(IUnknown* pUnk, DWORD dwSyncBlockIndex, MethodTable *pClass // if we're currently in a SendMessage. // Also, clients can opt out of this. The option is a per-thread flag which they can // set by calling DisableComEagerCleanup on the appropriate thread. Why would they - // want to opt out? Because pumping can lead to re-entrancy in in unexpected places. + // want to opt out? Because pumping can lead to re-entrancy in unexpected places. // If a client decides to opt out, they are required to cleanup RCWs themselves by // calling Marshal.CleanupUnusedObjectsInCurrentContext periodically. The best place // to make that call is within their own message pump. diff --git a/src/coreclr/vm/stdinterfaces_wrapper.cpp b/src/coreclr/vm/stdinterfaces_wrapper.cpp index 400d90405e7..751870479d9 100644 --- a/src/coreclr/vm/stdinterfaces_wrapper.cpp +++ b/src/coreclr/vm/stdinterfaces_wrapper.cpp @@ -360,7 +360,7 @@ ULONG __stdcall Unknown_AddRef(IUnknown* pUnk) } CONTRACTL_END; - // Allow addrefs to go through, coz we are allowing + // Allow addrefs to go through, because we are allowing // all releases to go through, otherwise we would // have a mismatch of ref-counts return Unknown_AddRef_Internal(pUnk); @@ -406,7 +406,7 @@ ULONG __stdcall Unknown_AddRefInner(IUnknown* pUnk) } CONTRACTL_END; - // Allow addrefs to go through, coz we are allowing + // Allow addrefs to go through, because we are allowing // all releases to go through, otherwise we would // have a mismatch of ref-counts return Unknown_AddRefInner_Internal(pUnk); @@ -452,7 +452,7 @@ ULONG __stdcall Unknown_AddRefSpecial(IUnknown* pUnk) } CONTRACTL_END; - // Allow addrefs to go through, coz we are allowing + // Allow addrefs to go through, because we are allowing // all releases to go through, otherwise we would // have a mismatch of ref-counts return Unknown_AddRefSpecial_Internal(pUnk); diff --git a/src/coreclr/vm/stringliteralmap.cpp b/src/coreclr/vm/stringliteralmap.cpp index 17e0d5fa3e0..6880614f917 100644 --- a/src/coreclr/vm/stringliteralmap.cpp +++ b/src/coreclr/vm/stringliteralmap.cpp @@ -96,7 +96,7 @@ StringLiteralMap::~StringLiteralMap() // We do need to take the globalstringliteralmap lock because we are manipulating // StringLiteralEntry objects that belong to it. - // Note that we remember the current entry and relaese it only when the + // Note that we remember the current entry and release it only when the // enumerator has advanced to the next entry so that we don't endup deleteing the // current entry itself and killing the enumerator. diff --git a/src/coreclr/vm/stublink.h b/src/coreclr/vm/stublink.h index 7e20812a57a..b5cf0421e01 100644 --- a/src/coreclr/vm/stublink.h +++ b/src/coreclr/vm/stublink.h @@ -887,13 +887,13 @@ class Stub // // // UINT RRT.GetSizeOfData(refsize, variationCode) -// Returns the total size of the seperate data area (if any) that the +// Returns the total size of the separate data area (if any) that the // instruction needs in bytes for a given refsize. For this example // on the SH3 // if (refsize==k32) return 4; else return 0; // // The default implem of this returns 0, so CPUs that don't have need -// for a seperate constant area don't have to worry about it. +// for a separate constant area don't have to worry about it. // // // BOOL CanReach(refsize, variationcode, fExternal, offset) diff --git a/src/coreclr/vm/threads.cpp b/src/coreclr/vm/threads.cpp index a7acad063a1..78b4b692771 100644 --- a/src/coreclr/vm/threads.cpp +++ b/src/coreclr/vm/threads.cpp @@ -1,13 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -// -// THREADS.CPP -// // +// THREADS.CPP // - #include "common.h" #include "frames.h" @@ -6157,7 +6154,7 @@ size_t getStackHash(size_t* stackTrace, size_t* stackTop, size_t* stackStop, siz UINT_PTR uPrevControlPc = uControlPc; - for (;;) + while (true) { RtlLookupFunctionEntry(uControlPc, ARM_ONLY((DWORD*))(&uImageBase), @@ -6274,7 +6271,7 @@ BOOL Thread::UniqueStack(void* stackStart) #ifdef TARGET_X86 // Find the stop point (most jitted function) Frame* pFrame = pThread->GetFrame(); - for(;;) + while (true) { // skip GC frames if (pFrame == 0 || pFrame == (Frame*) -1) @@ -8515,7 +8512,7 @@ Thread::EnumMemoryRegionsWorker(CLRDataEnumMemoryFlags flags) if (!IsAddressInStack(currentSP)) { - _ASSERTE(!"Target stack has been corrupted, SP must in in the stack range."); + _ASSERTE(!"Target stack has been corrupted, SP must be in the stack range."); break; } diff --git a/src/coreclr/vm/threads.h b/src/coreclr/vm/threads.h index d5db56a460d..97232493d6f 100644 --- a/src/coreclr/vm/threads.h +++ b/src/coreclr/vm/threads.h @@ -3786,7 +3786,7 @@ public: } // Clears the table. Useful to do when crossing the managed-code - EE boundary - // as you ususally only care about OBJECTREFS that have been created after that + // as you usually only care about OBJECTREFS that have been created after that static void STDCALL ObjectRefFlush(Thread* thread); diff --git a/src/coreclr/vm/threadsuspend.cpp b/src/coreclr/vm/threadsuspend.cpp index 8f74be88661..a9a1b46daad 100644 --- a/src/coreclr/vm/threadsuspend.cpp +++ b/src/coreclr/vm/threadsuspend.cpp @@ -1243,7 +1243,7 @@ Thread::UserAbort(EEPolicy::ThreadAbortTypes abortType, DWORD timeout) DWORD dwSwitchCount = 0; #endif // !defined(DISABLE_THREADSUSPEND) - for (;;) + while (true) { // Lock the thread store LOG((LF_SYNC, INFO3, "UserAbort obtain lock\n")); @@ -1617,7 +1617,7 @@ LPrepareRetry: } #endif - } // for(;;) + } // while (true) if ((GetAbortEndTime() != MAXULONGLONG) && IsAbortRequested()) { @@ -2121,7 +2121,7 @@ void Thread::RareDisablePreemptiveGC() DWORD dwSwitchCount = 0; - for (;;) + while (true) { EnablePreemptiveGC(); @@ -3728,7 +3728,7 @@ void EnableStressHeapHelper() // We're done with our GC. Let all the threads run again. // By this point we've already unblocked most threads. This just releases the ThreadStore lock. -void ThreadSuspend::ResumeRuntime(BOOL bFinishedGC, BOOL SuspendSucceded) +void ThreadSuspend::ResumeRuntime(BOOL bFinishedGC, BOOL SuspendSucceeded) { CONTRACTL { NOTHROW; @@ -3744,7 +3744,7 @@ void ThreadSuspend::ResumeRuntime(BOOL bFinishedGC, BOOL SuspendSucceded) _ASSERTE(IsGCSpecialThread() || ThreadStore::HoldingThreadStore()); _ASSERTE(!GCHeapUtilities::IsGCInProgress() ); - STRESS_LOG2(LF_SYNC, LL_INFO1000, "Thread::ResumeRuntime(finishedGC=%d, SuspendSucceeded=%d) - Start\n", bFinishedGC, SuspendSucceded); + STRESS_LOG2(LF_SYNC, LL_INFO1000, "Thread::ResumeRuntime(finishedGC=%d, SuspendSucceeded=%d) - Start\n", bFinishedGC, SuspendSucceeded); // // Notify everyone who cares, that this suspension is over, and this thread is going to go do other things. @@ -5525,7 +5525,7 @@ void Thread::UnmarkForSuspension(ULONG mask) //---------------------------------------------------------------------------- -void ThreadSuspend::RestartEE(BOOL bFinishedGC, BOOL SuspendSucceded) +void ThreadSuspend::RestartEE(BOOL bFinishedGC, BOOL SuspendSucceeded) { ThreadSuspend::s_fSuspended = false; #ifdef TIME_SUSPEND @@ -5578,7 +5578,7 @@ void ThreadSuspend::RestartEE(BOOL bFinishedGC, BOOL SuspendSucceded) Thread *thread = NULL; while ((thread = ThreadStore::GetThreadList(thread)) != NULL) { - thread->PrepareForEERestart(SuspendSucceded); + thread->PrepareForEERestart(SuspendSucceeded); } // @@ -5605,7 +5605,7 @@ void ThreadSuspend::RestartEE(BOOL bFinishedGC, BOOL SuspendSucceded) GCHeapUtilities::GetGCHeap()->SetWaitForGCEvent(); _ASSERTE(IsGCSpecialThread() || ThreadStore::HoldingThreadStore()); - ResumeRuntime(bFinishedGC, SuspendSucceded); + ResumeRuntime(bFinishedGC, SuspendSucceeded); FireEtwGCRestartEEEnd_V1(GetClrInstanceId()); diff --git a/src/coreclr/vm/threadsuspend.h b/src/coreclr/vm/threadsuspend.h index a600d090eef..6d034b91a19 100644 --- a/src/coreclr/vm/threadsuspend.h +++ b/src/coreclr/vm/threadsuspend.h @@ -186,7 +186,7 @@ private: static SUSPEND_REASON m_suspendReason; // This contains the reason why the runtime is suspended static void SuspendRuntime(ThreadSuspend::SUSPEND_REASON reason); - static void ResumeRuntime(BOOL bFinishedGC, BOOL SuspendSucceded); + static void ResumeRuntime(BOOL bFinishedGC, BOOL SuspendSucceeded); public: // Initialize thread suspension support static void Initialize(); @@ -239,7 +239,7 @@ public: public: //suspend all threads static void SuspendEE(SUSPEND_REASON reason); - static void RestartEE(BOOL bFinishedGC, BOOL SuspendSucceded); //resume threads. + static void RestartEE(BOOL bFinishedGC, BOOL SuspendSucceeded); //resume threads. static void LockThreadStore(ThreadSuspend::SUSPEND_REASON reason); static void UnlockThreadStore(BOOL bThreadDestroyed = FALSE, diff --git a/src/coreclr/vm/tieredcompilation.cpp b/src/coreclr/vm/tieredcompilation.cpp index a905c86efb9..4e4da913e86 100644 --- a/src/coreclr/vm/tieredcompilation.cpp +++ b/src/coreclr/vm/tieredcompilation.cpp @@ -960,7 +960,7 @@ void TieredCompilationManager::ActivateCodeVersion(NativeCodeVersion nativeCodeV } } -// Dequeues the next method in the optmization queue. +// Dequeues the next method in the optimization queue. // This runs on the background thread. NativeCodeVersion TieredCompilationManager::GetNextMethodToOptimize() { diff --git a/src/coreclr/vm/typedesc.cpp b/src/coreclr/vm/typedesc.cpp index 7636b6b2ef1..e7eacb9c2ff 100644 --- a/src/coreclr/vm/typedesc.cpp +++ b/src/coreclr/vm/typedesc.cpp @@ -1,19 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. + // // File: typedesc.cpp // - - -// // This file contains definitions for methods in the code:TypeDesc class and its // subclasses // code:ParamTypeDesc, // code:TyVarTypeDesc, // code:FnPtrTypeDesc // - -// // ============================================================================ #include "common.h" @@ -861,7 +857,7 @@ void TypeVarTypeDesc::LoadConstraints(ClassLoadLevel level /* = CLASS_LOADED */) if (numConstraints != 0) { LoaderAllocator* pAllocator = GetModule()->GetLoaderAllocator(); - // If there is a single class constraint we put in in element 0 of the array + // If there is a single class constraint we place it at index 0 of the array AllocMemHolder<TypeHandle> constraints (pAllocator->GetLowFrequencyHeap()->AllocMem(S_SIZE_T(numConstraints) * S_SIZE_T(sizeof(TypeHandle)))); diff --git a/src/coreclr/vm/util.cpp b/src/coreclr/vm/util.cpp index e635568623d..1439dc8e040 100644 --- a/src/coreclr/vm/util.cpp +++ b/src/coreclr/vm/util.cpp @@ -1793,7 +1793,7 @@ void InitializeClrNotifications() // <TODO> FIX IN BETA 2 // // g_dacNotificationFlags is only modified by the DAC and therefore the -// optmizer can assume that it will always be its default value and has +// optimizer can assume that it will always be its default value and has // been seen to eliminate the code in DoModuleLoadNotification, // etc... such that DAC notifications are no longer sent. // diff --git a/src/coreclr/vm/virtualcallstub.h b/src/coreclr/vm/virtualcallstub.h index 9b349afb258..2e1e9d547da 100644 --- a/src/coreclr/vm/virtualcallstub.h +++ b/src/coreclr/vm/virtualcallstub.h @@ -1,12 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. + // // File: VirtualCallStub.h // - - - -// // See code:VirtualCallStubManager for details // // ============================================================================ @@ -14,7 +11,6 @@ #ifndef _VIRTUAL_CALL_STUB_H #define _VIRTUAL_CALL_STUB_H - #define CHAIN_LOOKUP #if defined(TARGET_X86) @@ -984,7 +980,7 @@ because a stub/entry is not present in a table, e.g. has been removed, that does it is not in use. It also implies that internal table structures, such as discarded hash table buckets, cannot be freely recycled since another concurrent thread may still be walking thru it. -4. Occassionaly it is necessary to pick up the pieces that have been dropped on the floor +4. Occassionally it is necessary to pick up the pieces that have been dropped on the floor so to speak, e.g. actually recycle hash buckets that aren't in use. Since we have a natural sync point already in the GC, we use that to provide cleanup points. We need to make sure that code that is walking our structures is not a GC safe point. Hence if the GC calls back into us inside the GC diff --git a/src/libraries/Common/src/System/Net/Http/aspnetcore/Http2/Hpack/HPackDecoder.cs b/src/libraries/Common/src/System/Net/Http/aspnetcore/Http2/Hpack/HPackDecoder.cs index f9d8dc45b8b..cefb377f40c 100644 --- a/src/libraries/Common/src/System/Net/Http/aspnetcore/Http2/Hpack/HPackDecoder.cs +++ b/src/libraries/Common/src/System/Net/Http/aspnetcore/Http2/Hpack/HPackDecoder.cs @@ -183,7 +183,7 @@ namespace System.Net.Http.HPack while (currentIndex < data.Length); // If a header range was set, but the value was not in the data, then copy the range - // to the name buffer. Must copy because because the data will be replaced and the range + // to the name buffer. Must copy because the data will be replaced and the range // will no longer be valid. if (_headerNameRange != null) { diff --git a/src/libraries/Common/src/System/Net/Http/aspnetcore/Http3/QPack/QPackDecoder.cs b/src/libraries/Common/src/System/Net/Http/aspnetcore/Http3/QPack/QPackDecoder.cs index 9e3d8fe8a21..394cc1aee72 100644 --- a/src/libraries/Common/src/System/Net/Http/aspnetcore/Http3/QPack/QPackDecoder.cs +++ b/src/libraries/Common/src/System/Net/Http/aspnetcore/Http3/QPack/QPackDecoder.cs @@ -239,7 +239,7 @@ namespace System.Net.Http.QPack while (currentIndex < data.Length); // If a header range was set, but the value was not in the data, then copy the range - // to the name buffer. Must copy because because the data will be replaced and the range + // to the name buffer. Must copy because the data will be replaced and the range // will no longer be valid. if (_headerNameRange != null) { diff --git a/src/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs b/src/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs index a7a2dc95cc2..d581fac9dc1 100644 --- a/src/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs +++ b/src/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs @@ -556,7 +556,7 @@ namespace System.IO.Compression if (expectException) continue; - throw new XunitException($"An unexpected error occured while decompressing data:{e}"); + throw new XunitException($"An unexpected error occurred while decompressing data:{e}"); } if (expectException) diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_firewall.ps1 b/src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_firewall.ps1 index c277f8d47a2..a1db4f5fad2 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_firewall.ps1 +++ b/src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_firewall.ps1 @@ -6,7 +6,7 @@ # Firewall configuration $script:firewallGroup = "Libraries Testing" $script:firewallRules = @( - @{Name = "LibariesNet - HTTP 80"; Port = 80}, + @{Name = "LibrariesNet - HTTP 80"; Port = 80}, @{Name = "LibrariesNet - HTTP 443"; Port = 443} ) diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/AES/DecryptorReusability.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/AES/DecryptorReusability.cs index 99e03904aef..f0761570a47 100644 --- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/AES/DecryptorReusability.cs +++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/AES/DecryptorReusability.cs @@ -8,7 +8,7 @@ namespace System.Security.Cryptography.Encryption.Aes.Tests using Aes = System.Security.Cryptography.Aes; [SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser")] - public static class DecryptorReusabilty + public static class DecryptorReusability { // See https://github.com/dotnet/runtime/issues/21354 for details [ConditionalFact(nameof(ShouldDecryptorBeReusable))] diff --git a/src/libraries/Common/tests/System/Xml/ModuleCore/cmodinfo.cs b/src/libraries/Common/tests/System/Xml/ModuleCore/cmodinfo.cs index 1d117cfcb66..6b84064f61f 100644 --- a/src/libraries/Common/tests/System/Xml/ModuleCore/cmodinfo.cs +++ b/src/libraries/Common/tests/System/Xml/ModuleCore/cmodinfo.cs @@ -75,7 +75,7 @@ namespace OLEDB.Test.ModuleCore { CKeywordParser.Tokens tokens = new CKeywordParser.Tokens(); tokens.Equal = " "; - tokens.Seperator = "/"; + tokens.Separator = "/"; s_hashOptions = CKeywordParser.ParseKeywords(CommandLine, tokens); } return s_hashOptions; diff --git a/src/libraries/Common/tests/System/Xml/ModuleCore/cparser.cs b/src/libraries/Common/tests/System/Xml/ModuleCore/cparser.cs index 0e1d4e333ad..091c9c3296d 100644 --- a/src/libraries/Common/tests/System/Xml/ModuleCore/cparser.cs +++ b/src/libraries/Common/tests/System/Xml/ModuleCore/cparser.cs @@ -34,7 +34,7 @@ namespace OLEDB.Test.ModuleCore public class Tokens { public string Equal = "="; - public string Seperator = ";"; + public string Separator = ";"; public string SingleQuote = "'"; public string DoubleQuote = "\""; }; @@ -94,7 +94,7 @@ namespace OLEDB.Test.ModuleCore { state = PARSE.DoubleBegin; } - else if (tokens.Seperator.IndexOf(ch) >= 0) + else if (tokens.Separator.IndexOf(ch) >= 0) { keywords[key] = string.Empty; state = PARSE.Initial; @@ -107,7 +107,7 @@ namespace OLEDB.Test.ModuleCore break; case PARSE.Value: - if (tokens.Seperator.IndexOf(ch) >= 0) + if (tokens.Separator.IndexOf(ch) >= 0) { keywords[key] = (builder.ToString()).Trim(); state = PARSE.Initial; @@ -161,7 +161,7 @@ namespace OLEDB.Test.ModuleCore break; case PARSE.End: - if (tokens.Seperator.IndexOf(ch) >= 0) + if (tokens.Separator.IndexOf(ch) >= 0) { state = PARSE.Initial; } diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/ApplicationNameSetFromAgrument.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromArgument/ApplicationNameSetFromArgument.csproj index 1d8d76f900a..1d8d76f900a 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/ApplicationNameSetFromAgrument.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromArgument/ApplicationNameSetFromArgument.csproj diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/Program.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromArgument/Program.cs index f83f5c12af7..f83f5c12af7 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromAgrument/Program.cs +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/ApplicationNameSetFromArgument/Program.cs diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/HostFactoryResolverTests.cs b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/HostFactoryResolverTests.cs index d6cf530c94e..fe26636fa85 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/HostFactoryResolverTests.cs +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/HostFactoryResolverTests.cs @@ -264,14 +264,14 @@ namespace Microsoft.Extensions.Hosting.Tests } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] - public void ApplicationNameSetFromAgrument() + public void ApplicationNameSetFromArgument() { - Assembly assembly = Assembly.Load("ApplicationNameSetFromAgrument"); + Assembly assembly = Assembly.Load("ApplicationNameSetFromArgument"); var factory = HostFactoryResolver.ResolveServiceProviderFactory(assembly, s_WaitTimeout); IServiceProvider? serviceProvider = factory(Array.Empty<string>()); var configuration = (IConfiguration)serviceProvider.GetService(typeof(IConfiguration)); - Assert.Contains("ApplicationNameSetFromAgrument", configuration["applicationName"]); + Assert.Contains("ApplicationNameSetFromArgument", configuration["applicationName"]); } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj index 61edd76da9c..d24d1061440 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj @@ -14,7 +14,7 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="ApplicationNameSetFromAgrument\ApplicationNameSetFromAgrument.csproj" /> + <ProjectReference Include="ApplicationNameSetFromArgument\ApplicationNameSetFromArgument.csproj" /> <ProjectReference Include="BuildWebHostInvalidSignature\BuildWebHostInvalidSignature.csproj" /> <ProjectReference Include="BuildWebHostPatternTestSite\BuildWebHostPatternTestSite.csproj" /> <ProjectReference Include="CreateHostBuilderInvalidSignature\CreateHostBuilderInvalidSignature.csproj" /> diff --git a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/DefaultHttpClientFactoryTest.cs b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/DefaultHttpClientFactoryTest.cs index 50a806a8a8f..1b1b8b305e4 100644 --- a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/DefaultHttpClientFactoryTest.cs +++ b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/DefaultHttpClientFactoryTest.cs @@ -389,7 +389,7 @@ namespace Microsoft.Extensions.Http Assert.False(factory.CleanupTimerStarted.IsSet, "Cleanup timer not started"); } - // Seprate to avoid the HttpClient getting its lifetime extended by + // Separate to avoid the HttpClient getting its lifetime extended by // the state machine of the test. [MethodImpl(MethodImplOptions.NoInlining)] private async Task<ExpiredHandlerTrackingEntry> SimulateClientUse_Factory_CleanupCycle_DisposesEligibleHandler(TestHttpClientFactory factory) @@ -459,7 +459,7 @@ namespace Microsoft.Extensions.Http Assert.False(factory.CleanupTimerStarted.IsSet, "Cleanup timer not started"); } - // Seprate to avoid the HttpClient getting its lifetime extended by + // Separate to avoid the HttpClient getting its lifetime extended by // the state machine of the test. [MethodImpl(MethodImplOptions.NoInlining)] private async Task<ExpiredHandlerTrackingEntry> SimulateClientUse_Factory_CleanupCycle_DisposesLiveHandler( diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/OptionsBuidlerConfigurationExtensionsTests.cs b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/OptionsBuidlerConfigurationExtensionsTests.cs index 387beac8cc4..3b90ed58db2 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/OptionsBuidlerConfigurationExtensionsTests.cs +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/OptionsBuidlerConfigurationExtensionsTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Microsoft.Extensions.Options.ConfigurationExtensions.Tests { - public class OptionsBuidlerConfigurationExtensionsTests + public class OptionsBuilderConfigurationExtensionsTests { [Fact] public static void BindConfiguration_ThrowsForNullBuilder() diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Interaction.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Interaction.vb index ff87277720b..b51ca252f74 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Interaction.vb +++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Interaction.vb @@ -52,9 +52,9 @@ Namespace Microsoft.VisualBasic ' as well as skipping over quotations used around embedded spaces within ' the application name ' examples: - ' f:\"Program Files"\Microsoft\foo.exe a b d e f - ' "f:\"Program Files"\Microsoft\foo.exe" a b d e f - ' f:\Program Files\Microsoft\foo.exe a b d e f + ' f:\"Program Files"\Microsoft\foo.exe a b d e f + ' "f:\"Program Files"\Microsoft\foo.exe" a b d e f + ' f:\Program Files\Microsoft\foo.exe a b d e f Dim LengthOfAppName, j As Integer 'Remove the app name from the arguments @@ -150,7 +150,7 @@ Namespace Microsoft.VisualBasic '============================================================================ Public Function Choose(ByVal Index As Double, ByVal ParamArray Choice() As Object) As Object - Dim FixedIndex As Integer = CInt(Fix(Index) - 1) 'ParamArray is 0 based, but Choose assumes 1 based + Dim FixedIndex As Integer = CInt(Fix(Index) - 1) 'ParamArray is 0 based, but Choose assumes 1 based If Choice.Rank <> 1 Then Throw New ArgumentException(SR.Format(SR.Argument_RankEQOne1, "Choice")) @@ -228,7 +228,7 @@ Namespace Microsoft.VisualBasic End If 'Build-up the string. Calculate number of spaces needed: VB3 uses Stop + 1. - 'This may seem bogus but it has to be this way for VB3 compatibilty. + 'This may seem bogus but it has to be this way for VB3 compatibility. Buffer1 = CStr([Stop] + 1) Buffer2 = CStr(Start - 1) @@ -253,7 +253,7 @@ Namespace Microsoft.VisualBasic InsertNumber(Buffer, Lower, Spaces) End If - 'Insert the partition + 'Insert the partition Buffer = Buffer & ":" 'Insert upper-end of partition range diff --git a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs index 4c181db60da..b2bd0a8c8aa 100644 --- a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs +++ b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs @@ -2068,7 +2068,7 @@ namespace Microsoft.VisualBasic Output.Write(')'); } - // In VB, constraints are put right after the type paramater name. + // In VB, constraints are put right after the type parameter name. // In C#, there is a separate "where" statement private void OutputTypeParameterConstraints(CodeTypeParameter typeParameter) { diff --git a/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/FilteredCatalog.DependentsTraversal.cs b/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/FilteredCatalog.DependentsTraversal.cs index 1c7f01b32e8..f14b829009a 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/FilteredCatalog.DependentsTraversal.cs +++ b/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/FilteredCatalog.DependentsTraversal.cs @@ -14,7 +14,7 @@ namespace System.ComponentModel.Composition.Hosting /// <summary> /// Implementation of IComposablePartTraversal supporting the Dependents traveral pattern. /// The implementation is optimized for a situation when the traversal is expected to be rather short-lived - that is, - /// if the chains of dependecies are rather small. To achieve that we do a very minimal structure prep upfront - merely creating a contract-based + /// if the chains of dependencies are rather small. To achieve that we do a very minimal structure prep upfront - merely creating a contract-based /// index of imports - and the verify the full match of imports during the traversal. Given that most parts have a very few imports this should perform well. /// </summary> internal sealed class DependentsTraversal : IComposablePartCatalogTraversal diff --git a/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/FilteredCatalog.Traversal.cs b/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/FilteredCatalog.Traversal.cs index 10a7acc02fe..57ad4ed0d92 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/FilteredCatalog.Traversal.cs +++ b/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/FilteredCatalog.Traversal.cs @@ -11,7 +11,7 @@ namespace System.ComponentModel.Composition.Hosting public partial class FilteredCatalog { /// <summary> - /// Creates a new instance of the <see cref="FilteredCatalog"/> that conatains all the parts from the orignal filtered catalog and all their dependecies. + /// Creates a new instance of the <see cref="FilteredCatalog"/> that conatains all the parts from the orignal filtered catalog and all their dependencies. /// </summary> /// <returns></returns> public FilteredCatalog IncludeDependencies() diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModelServicesTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModelServicesTests.cs index 7cc2e443ada..101781a8b30 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModelServicesTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModelServicesTests.cs @@ -53,7 +53,7 @@ namespace System.ComponentModel.Composition.AttributedModel } [Fact] - public void CreatePart_From_InvalidPartDefiniton_ShouldThrowArgumentException() + public void CreatePart_From_InvalidPartDefinition_ShouldThrowArgumentException() { Assert.Throws<ArgumentException>("partDefinition", () => { diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ExportMetadataAttributeTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ExportMetadataAttributeTests.cs index 3326cef3d3a..debc005bb09 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ExportMetadataAttributeTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ExportMetadataAttributeTests.cs @@ -50,7 +50,7 @@ namespace System.ComponentModel.Composition } [Fact] - public void IsMultiple_ValueAsValueArgument_ShouldSetPropert() + public void IsMultiple_ValueAsValueArgument_ShouldSetProperty() { var expectations = Expectations.GetBooleans(); diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs index 712637375d0..8876db46066 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/AssemblyCatalogTests.cs @@ -381,7 +381,7 @@ namespace System.ComponentModel.Composition } //========================================================================================================================================= - // Test cases for AssemblyCatalog(string codebase, ICompositionElement definitonOrigin) constructor + // Test cases for AssemblyCatalog(string codebase, ICompositionElement definitionOrigin) constructor //========================================================================================================================================= [Fact] [ActiveIssue("https://github.com/dotnet/runtime/issues/24240")] @@ -490,7 +490,7 @@ namespace System.ComponentModel.Composition } //========================================================================================================================================= - // Test cases for AssemblyCatalog(string codebase, ICompositionElement definitonOrigin, ReflectionContext reflectionContext) constructor + // Test cases for AssemblyCatalog(string codebase, ICompositionElement definitionOrigin, ReflectionContext reflectionContext) constructor //========================================================================================================================================= [Fact] public void Constructor4_ValueAsCodebaseArgument_ShouldSetAssemblyProperty() @@ -606,7 +606,7 @@ namespace System.ComponentModel.Composition }); } //========================================================================================================================================= - // Test cases for AssemblyCatalog(string codebase, ICompositionElement definitonOrigin) constructor + // Test cases for AssemblyCatalog(string codebase, ICompositionElement definitionOrigin) constructor //========================================================================================================================================= [Fact] [ActiveIssue("https://github.com/dotnet/runtime/issues/24240")] @@ -671,7 +671,7 @@ namespace System.ComponentModel.Composition } //========================================================================================================================================= - // Test cases for AssemblyCatalog(string codebase, ICompositionElement definitonOrigin, ReflectionContext reflectionContext) constructor + // Test cases for AssemblyCatalog(string codebase, ICompositionElement definitionOrigin, ReflectionContext reflectionContext) constructor //========================================================================================================================================= [Fact] public void Constructor8_ValueAsAssemblyArgument_ShouldSetAssemblyProperty() diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesTests.cs index a521c72efe1..1b886750dd4 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionModelServicesTests.cs @@ -715,7 +715,7 @@ namespace System.ComponentModel.Composition.ReflectionModel } [Fact] - public void CreateImportDefinition_Parameter_NullAsParamater_ShouldThrowArgumentNull() + public void CreateImportDefinition_Parameter_NullAsParameter_ShouldThrowArgumentNull() { ParameterInfo parameter = typeof(TestPart).GetConstructor(new Type[] { typeof(int) }).GetParameters()[0]; Lazy<ParameterInfo> expectedLazyParameter = parameter.AsLazy(); diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/Integration/DelayLoadingTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/Integration/DelayLoadingTests.cs index 782c3039fda..96a4518378a 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/Integration/DelayLoadingTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/Integration/DelayLoadingTests.cs @@ -35,7 +35,7 @@ namespace Tests.Integration } [Fact] - public void PartTypeLoadedLazilyEagerDependeciesLoadEagerly() + public void PartTypeLoadedLazilyEagerDependenciesLoadEagerly() { var catalog = new TypeLoadNotifyingCatalog(typeof(ExportingPart), typeof(PartImportingEagerly)); var container = new CompositionContainer(catalog); @@ -56,7 +56,7 @@ namespace Tests.Integration } [Fact] - public void PartTypeLoadedLazilyLazyDependeciesLoadLazily() + public void PartTypeLoadedLazilyLazyDependenciesLoadLazily() { var catalog = new TypeLoadNotifyingCatalog(typeof(ExportingPart), typeof(PartImportingLazily)); var container = new CompositionContainer(catalog); @@ -77,7 +77,7 @@ namespace Tests.Integration } [Fact] - public void PartTypeLoadedLazilyEagerCollectionDependeciesLoadEagerly() + public void PartTypeLoadedLazilyEagerCollectionDependenciesLoadEagerly() { var catalog = new TypeLoadNotifyingCatalog(typeof(ExportingPart), typeof(PartImportingCollectionEagerly)); var container = new CompositionContainer(catalog); @@ -98,7 +98,7 @@ namespace Tests.Integration } [Fact] - public void PartTypeLoadedLazilyLazyCollectionDependeciesLoadLazily() + public void PartTypeLoadedLazilyLazyCollectionDependenciesLoadLazily() { var catalog = new TypeLoadNotifyingCatalog(typeof(ExportingPart), typeof(PartImportingCollectionLazily)); var container = new CompositionContainer(catalog); diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectPropertyDescriptor.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectPropertyDescriptor.cs index 232709f9e57..100beeb2875 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectPropertyDescriptor.cs +++ b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectPropertyDescriptor.cs @@ -59,7 +59,7 @@ namespace System.ComponentModel private static readonly int s_bitAmbientValueQueried = InterlockedBitVector32.CreateMask(s_bitReadOnlyChecked); private static readonly int s_bitSetOnDemand = InterlockedBitVector32.CreateMask(s_bitAmbientValueQueried); - private InterlockedBitVector32 _state; // Contains the state bits for this proeprty descriptor. + private InterlockedBitVector32 _state; // Contains the state bits for this property descriptor. [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] private readonly Type _componentClass; // used to determine if we should all on us or on the designer private readonly Type _type; // the data type of the property diff --git a/src/libraries/System.Composition/tests/LightContainerTests.cs b/src/libraries/System.Composition/tests/LightContainerTests.cs index a7933d56561..31443ab20e5 100644 --- a/src/libraries/System.Composition/tests/LightContainerTests.cs +++ b/src/libraries/System.Composition/tests/LightContainerTests.cs @@ -112,9 +112,9 @@ namespace System.Composition.UnitTests public void VerifyAssemblyNameCanBeUsedWithContainer() { var test = new ContainerConfiguration() - .WithAssembly(typeof(ClassWithDependecy).GetTypeInfo().Assembly) + .WithAssembly(typeof(ClassWithDependency).GetTypeInfo().Assembly) .CreateContainer(); - var b = test.GetExport<ClassWithDependecy>(); + var b = test.GetExport<ClassWithDependency>(); Assert.NotNull(b); Assert.NotNull(b._dep); } @@ -123,9 +123,9 @@ namespace System.Composition.UnitTests public void VerifyAssemblyWithTwoBaseTypeWithOnlyOneExportedWorks() { var test = new ContainerConfiguration() - .WithAssembly(typeof(ClassWithDependecy).GetTypeInfo().Assembly) + .WithAssembly(typeof(ClassWithDependency).GetTypeInfo().Assembly) .CreateContainer(); - var b = test.GetExport<ClassWithDependecyAndSameBaseType>(); + var b = test.GetExport<ClassWithDependencyAndSameBaseType>(); Assert.NotNull(b); Assert.NotNull(b._dep); Assert.Equal(typeof(TestDependency), b._dep.GetType()); diff --git a/src/libraries/System.Composition/tests/TestLibrary/TestClass.cs b/src/libraries/System.Composition/tests/TestLibrary/TestClass.cs index 7f306622203..411cdf6152d 100644 --- a/src/libraries/System.Composition/tests/TestLibrary/TestClass.cs +++ b/src/libraries/System.Composition/tests/TestLibrary/TestClass.cs @@ -6,22 +6,22 @@ using System.Composition; namespace TestLibrary { [Export] - public class ClassWithDependecy + public class ClassWithDependency { public TestDependency _dep; [ImportingConstructor] - public ClassWithDependecy(TestDependency dep) + public ClassWithDependency(TestDependency dep) { _dep = dep; } } [Export] - public class ClassWithDependecyAndSameBaseType + public class ClassWithDependencyAndSameBaseType { public IDependency _dep; [ImportingConstructor] - public ClassWithDependecyAndSameBaseType(IDependency dep) + public ClassWithDependencyAndSameBaseType(IDependency dep) { _dep = dep; } diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/BaseConfigurationRecord.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/BaseConfigurationRecord.cs index 4877a395d91..20a486c6e3b 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/BaseConfigurationRecord.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/BaseConfigurationRecord.cs @@ -803,7 +803,7 @@ namespace System.Configuration } catch { - // Ignore the error if we are attempting to retreive + // Ignore the error if we are attempting to retrieve // the last known good configuration. if (!getLkg) throw; } @@ -848,7 +848,7 @@ namespace System.Configuration // // It WILL be common in web scenarios for there to be // deep hierarchies of config files, most of which have - // sparse input. Therefore we do not want to retreive a + // sparse input. Therefore we do not want to retrieve a // factory record if it is not necessary to do so, as // it would always lead to an order N-squared operation, // where N is the depth of the config hierarchy. @@ -1075,7 +1075,7 @@ namespace System.Configuration } catch { - // Ignore the error if we are attempting to retreive + // Ignore the error if we are attempting to retrieve // the last known good configuration. if (!getLkg) throw; } @@ -1189,7 +1189,7 @@ namespace System.Configuration } catch { - // Ignore the error if we are attempting to retreive + // Ignore the error if we are attempting to retrieve // the last known good configuration. if (!getLkg) throw; } diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj index 38c03d6d6c2..733fcd5adf9 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj @@ -81,7 +81,7 @@ <Compile Include="System\Configuration\SettingElementTests.cs" /> <Compile Include="System\Configuration\SettingsDescriptionAttributeTests.cs" /> <Compile Include="System\Configuration\SettingsGroupDescriptionAttributeTests.cs" /> - <Compile Include="System\Configuration\SettingsManageabilityAtrributeTests.cs" /> + <Compile Include="System\Configuration\SettingsManageabilityAttributeTests.cs" /> <Compile Include="System\Configuration\SettingsPropertyIsReadOnlyExceptionTests.cs" /> <Compile Include="System\Configuration\SettingsPropertyNotFoundExceptionTests.cs" /> <Compile Include="System\Configuration\SettingsPropertyWrongTypeExceptionTests.cs" /> diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/SettingsManageabilityAtrributeTests.cs b/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/SettingsManageabilityAttributeTests.cs index cf5dd53d421..dcd6d77185b 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/SettingsManageabilityAtrributeTests.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/SettingsManageabilityAttributeTests.cs @@ -5,7 +5,7 @@ using Xunit; namespace System.Configuration { - public class SettingsManageabilityAtrributeTests + public class SettingsManageabilityAttributeTests { [Fact] public void GetValueIsExpected() diff --git a/src/libraries/System.Data.Common/src/System/Data/DataTable.cs b/src/libraries/System.Data.Common/src/System/Data/DataTable.cs index 5f3d16b5993..6cbecabd9b8 100644 --- a/src/libraries/System.Data.Common/src/System/Data/DataTable.cs +++ b/src/libraries/System.Data.Common/src/System/Data/DataTable.cs @@ -6503,12 +6503,12 @@ namespace System.Data else { string CurrentTableNamespace = string.Empty; - int nsSeperator = CurrentTableFullName.IndexOf(':'); - if (nsSeperator > -1) + int nsSeparator = CurrentTableFullName.IndexOf(':'); + if (nsSeparator > -1) { - CurrentTableNamespace = CurrentTableFullName.Substring(0, nsSeperator); + CurrentTableNamespace = CurrentTableFullName.Substring(0, nsSeparator); } - string CurrentTableName = CurrentTableFullName.Substring(nsSeperator + 1); + string CurrentTableName = CurrentTableFullName.Substring(nsSeparator + 1); currentTable = ds.Tables[CurrentTableName, CurrentTableNamespace]; } diff --git a/src/libraries/System.Data.Common/src/System/Data/SQLTypes/SQLDecimal.cs b/src/libraries/System.Data.Common/src/System/Data/SQLTypes/SQLDecimal.cs index 44687a102bb..e3af9a2cfcb 100644 --- a/src/libraries/System.Data.Common/src/System/Data/SQLTypes/SQLDecimal.cs +++ b/src/libraries/System.Data.Common/src/System/Data/SQLTypes/SQLDecimal.cs @@ -2708,7 +2708,7 @@ namespace System.Data.SqlTypes // D5. Test remainder. Carry indicates result<0, therefore QH 1 too large if (HI(dwlAccum) == 0) { - // D6. Add back - probabilty is 2**(-31). R += D. Q[digit] -= 1 + // D6. Add back - probability is 2**(-31). R += D. Q[digit] -= 1 uint ulCarry; rgulQ[iulRindex - ciulD] = QH - 1; diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataTableTest2.cs b/src/libraries/System.Data.Common/tests/System/Data/DataTableTest2.cs index 6b6f56caa68..2157ca6002d 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataTableTest2.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataTableTest2.cs @@ -1852,11 +1852,11 @@ namespace System.Data.Tests DataRow[] drSelect; List<DataRow> al; - //add some rows + // add some rows dt.Rows.Add(new object[] { 99, 88, "bla", "wowww" }); dt.Rows.Add(new object[] { 999, 888, string.Empty, "woowww" }); - //get excepted resault + // get excepted result al = new List<DataRow>(); foreach (DataRow dr in dt.Rows) { @@ -1869,7 +1869,7 @@ namespace System.Data.Tests drSelect = dt.Select("ChildId=1", "ParentId Desc"); Assert.Equal(al.ToArray(), drSelect); - //get excepted resault + // get excepted result al = new List<DataRow>(); foreach (DataRow dr in dt.Rows) { @@ -1882,7 +1882,7 @@ namespace System.Data.Tests drSelect = dt.Select("String1='1-String1'", "ParentId Desc"); Assert.Equal(al.ToArray(), drSelect); - //get excepted resault + // get excepted result al = new List<DataRow>(); foreach (DataRow dr in dt.Rows) { @@ -1897,7 +1897,7 @@ namespace System.Data.Tests Assert.Equal(al.ToArray(), drSelect); - //get excepted resault + // get excepted result al = new List<DataRow>(); foreach (DataRow dr in dt.Rows) { diff --git a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/DbDataRecord.cs b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/DbDataRecord.cs index 7b4887893f6..1e97a9c6455 100644 --- a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/DbDataRecord.cs +++ b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/DbDataRecord.cs @@ -112,7 +112,7 @@ namespace System.Data.Odbc //Random //Means that the user can ask for the values int any order (ie: out of order). // In order to achieve this on a forward only stream, we need to actually - // retreive all the value in between so they can go back to values they've skipped + // retrieve all the value in between so they can go back to values they've skipped for (int c = 0; c < i; c++) { if (values[c] == null) diff --git a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnection.cs b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnection.cs index d1cee50654a..6e954454109 100644 --- a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnection.cs +++ b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnection.cs @@ -519,7 +519,7 @@ namespace System.Data.Odbc case ODBC32.SQLRETURN.SUCCESS_WITH_INFO: { //Optimize to only create the event objects and obtain error info if - //the user is really interested in retriveing the events... + //the user is really interested in retrieveing the events... if (_infoMessageEventHandler != null) { OdbcErrorCollection errors = ODBC32.GetDiagErrors(null, hrHandle, retcode); diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityListener.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityListener.cs index f4072666b29..8ba75333324 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityListener.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityListener.cs @@ -11,7 +11,7 @@ namespace System.Diagnostics public delegate ActivitySamplingResult SampleActivity<T>(ref ActivityCreationOptions<T> options); /// <summary> - /// ActivityListener allows listening to the start and stop Activity events and give the oppertunity to decide creating the Activity for sampling scenarios. + /// ActivityListener allows listening to the start and stop Activity events and give the opportunity to decide creating the Activity for sampling scenarios. /// </summary> public sealed class ActivityListener : IDisposable { diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs index a36e3113920..67767349084 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs @@ -1190,12 +1190,12 @@ namespace System.Diagnostics if (0 <= dotIdx) idIdx = dotIdx + 1; - string propertName = transformSpec.Substring(idIdx, endIdx - idIdx); - _fetches = new PropertySpec(propertName, _fetches); + string propertyName = transformSpec.Substring(idIdx, endIdx - idIdx); + _fetches = new PropertySpec(propertyName, _fetches); // If the user did not explicitly set a name, it is the last one (first to be processed from the end). if (_outputName == null) - _outputName = propertName; + _outputName = propertyName; endIdx = dotIdx; // This works even when LastIndexOf return -1. } diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/MetricsEventSource.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/MetricsEventSource.cs index de3a6cb340f..83c625a8284 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/MetricsEventSource.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/MetricsEventSource.cs @@ -360,7 +360,7 @@ namespace System.Diagnostics.Metrics return false; } - private static readonly char[] s_instrumentSeperators = new char[] { '\r', '\n', ',', ';' }; + private static readonly char[] s_instrumentSeparators = new char[] { '\r', '\n', ',', ';' }; [UnsupportedOSPlatform("browser")] private void ParseSpecs(string? metricsSpecs) @@ -369,7 +369,7 @@ namespace System.Diagnostics.Metrics { return; } - string[] specStrings = metricsSpecs.Split(s_instrumentSeperators, StringSplitOptions.RemoveEmptyEntries); + string[] specStrings = metricsSpecs.Split(s_instrumentSeparators, StringSplitOptions.RemoveEmptyEntries); foreach (string specString in specStrings) { if (!MetricSpec.TryParse(specString, out MetricSpec spec)) diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs index 424bd204c4f..d8ba5d93a16 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs @@ -1169,7 +1169,7 @@ namespace System.Diagnostics.Tests activity.Stop(); /****************************************************/ - // Confirm that that flags are propagated to children. + // Confirm that the flags are propagated to children. activity = new Activity("activity4"); activity.SetParentId("00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"); activity.Start(); diff --git a/src/libraries/System.Diagnostics.EventLog/src/System/Diagnostics/Reader/UnsafeNativeMethods.cs b/src/libraries/System.Diagnostics.EventLog/src/System/Diagnostics/Reader/UnsafeNativeMethods.cs index b70e89445db..c41416115e4 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System/Diagnostics/Reader/UnsafeNativeMethods.cs +++ b/src/libraries/System.Diagnostics.EventLog/src/System/Diagnostics/Reader/UnsafeNativeMethods.cs @@ -107,7 +107,7 @@ namespace Microsoft.Win32 } [StructLayout(LayoutKind.Explicit, CharSet = CharSet.Auto)] -#pragma warning disable 618 // Ssytem.Core still uses SecurityRuleSet.Level1 +#pragma warning disable 618 // System.Core still uses SecurityRuleSet.Level1 [SecurityCritical(SecurityCriticalScope.Everything)] #pragma warning restore 618 internal struct EvtVariant diff --git a/src/libraries/System.Diagnostics.Tracing/documentation/EventCounterTutorial.md b/src/libraries/System.Diagnostics.Tracing/documentation/EventCounterTutorial.md index 436bda8ae39..26ce253a585 100644 --- a/src/libraries/System.Diagnostics.Tracing/documentation/EventCounterTutorial.md +++ b/src/libraries/System.Diagnostics.Tracing/documentation/EventCounterTutorial.md @@ -78,7 +78,7 @@ PerfView /onlyProviders=*Samples.EventCounterDemos.Minimal:*:Critical:EventCount Notice the `Critical` keyword in the command line, that is used to filter out the other events with lower priorities. -In the next relaese of PerfView (> 2.0.26), we can visualize the counters using PerfView. To do so, you can right click on the event like this and choose the show event counter graph item: +In the next release of PerfView (> 2.0.26), we can visualize the counters using PerfView. To do so, you can right click on the event like this and choose the show event counter graph item: <img src="PerfViewCapture_Menu.png" alt="Show EventCounter graph menu item" title="Show EventCounter graph menu item" /> diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADDNLinkedAttrSet.cs b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADDNLinkedAttrSet.cs index 7542fc06fb0..06fa26cc6ea 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADDNLinkedAttrSet.cs +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADDNLinkedAttrSet.cs @@ -590,7 +590,7 @@ namespace System.DirectoryServices.AccountManagement List<byte[]> sidList = new List<byte[]>(_foreignMembersCurrentGroup.Count); - // Foreach foreign principal retrive the sid. + // Foreach foreign principal retrieve the sid. // If the SID is for a fake object we have to track it separately. If we were attempt to translate it // it would fail and not be returned and we would lose it. // Once we have a list of sids then translate them against the target store in one call. diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADStoreCtx.cs b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADStoreCtx.cs index a7e18fa4360..806b76fb990 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADStoreCtx.cs +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADStoreCtx.cs @@ -1390,7 +1390,7 @@ namespace System.DirectoryServices.AccountManagement // SID search // // - // If we can read the defaultNamingContext and retrive the well known path for the foreignSecurityPrincipal container start there. + // If we can read the defaultNamingContext and retrieve the well known path for the foreignSecurityPrincipal container start there. // If we can only read the defaultNamingContext then start there // Else just start at the base DN from the original context // @@ -1436,7 +1436,7 @@ namespace System.DirectoryServices.AccountManagement GlobalDebug.WriteLineIf(GlobalDebug.Info, "ADStoreCtx", "GetGroupsMemberOf(ctx): Read DNC of {0}", this.DefaultNamingContext); - fspWkDn = ADUtils.RetriveWkDn(dncContainer, this.DefaultNamingContext, this.UserSuppliedServerName, Constants.GUID_FOREIGNSECURITYPRINCIPALS_CONTAINER_BYTE); + fspWkDn = ADUtils.RetrieveWkDn(dncContainer, this.DefaultNamingContext, this.UserSuppliedServerName, Constants.GUID_FOREIGNSECURITYPRINCIPALS_CONTAINER_BYTE); if (null != fspWkDn) { @@ -1521,7 +1521,7 @@ namespace System.DirectoryServices.AccountManagement } else { - // We don't need to retrive the Primary group ID here because we have already established that this user is not from this domain + // We don't need to retrieve the Primary group ID here because we have already established that this user is not from this domain // and the users primary group must be from the same domain as the user. Debug.Assert(foreignPrincipal.ContextType != ContextType.ApplicationDirectory); diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADUtils.cs b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADUtils.cs index ee0aaa86f7c..672b9c6ea46 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADUtils.cs +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADUtils.cs @@ -467,7 +467,7 @@ namespace System.DirectoryServices.AccountManagement { } - // Since we were able to retrive the computer domain above we should be able to access the current forest here. + // Since we were able to retrieve the computer domain above we should be able to access the current forest here. Forest currentForest = Forest.GetCurrentForest(); Domain targetdom = Domain.GetDomain(new DirectoryContext(DirectoryContextType.Domain, targetDomain, username, password)); @@ -488,7 +488,7 @@ namespace System.DirectoryServices.AccountManagement return false; } - internal static string RetriveWkDn(DirectoryEntry deBase, string defaultNamingContext, string serverName, byte[] wellKnownContainerGuid) + internal static string RetrieveWkDn(DirectoryEntry deBase, string defaultNamingContext, string serverName, byte[] wellKnownContainerGuid) { /* bool w2k3Supported = false; diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AccountInfo.cs b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AccountInfo.cs index 326d14d4e5c..c1c2dc398eb 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AccountInfo.cs +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AccountInfo.cs @@ -86,7 +86,7 @@ namespace System.DirectoryServices.AccountManagement throw new InvalidOperationException(SR.InvalidPropertyForStore); // If we get to this point we know that the value of the property has changed and we should not load it from the store. - // If value is retrived the state is set to loaded. Even if user modifies the reference we will + // If value is retrieved the state is set to loaded. Even if user modifies the reference we will // not overwrite it because we mark it as loaded. // If the user sets it before reading it we mark it as changed. When the users accesses it we just return the current // value. All change tracking to the store is done off of an actual object comparison because users can change the value diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/Utils.cs b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/Utils.cs index a18cdb60d62..eb08e73efd2 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/Utils.cs +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/Utils.cs @@ -728,7 +728,7 @@ namespace System.DirectoryServices.AccountManagement return false; } - // Retrive the parsed username which has had the domain removed because LogonUser + // Retrieve the parsed username which has had the domain removed because LogonUser // expects creds this way. string userName = credential.ParsedUserName; string password = credential.Password; diff --git a/src/libraries/System.DirectoryServices.Protocols/tests/LdapConnectionTests.cs b/src/libraries/System.DirectoryServices.Protocols/tests/LdapConnectionTests.cs index a0522a61abc..2de6a96dd5b 100644 --- a/src/libraries/System.DirectoryServices.Protocols/tests/LdapConnectionTests.cs +++ b/src/libraries/System.DirectoryServices.Protocols/tests/LdapConnectionTests.cs @@ -118,7 +118,7 @@ namespace System.DirectoryServices.Protocols.Tests var connection = new LdapConnection("server"); connection.AuthType = AuthType.Anonymous; // When calling Bind we make sure that the exception thrown is not that there was a NullReferenceException - // trying to retrive a null password's lenght, but instead an LdapException given the server cannot be reached. + // trying to retrieve a null password's lenght, but instead an LdapException given the server cannot be reached. Assert.Throws<LdapException>(() => connection.Bind()); } diff --git a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/Locator.cs b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/Locator.cs index 76c5e4376f9..d055b21f034 100644 --- a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/Locator.cs +++ b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/Locator.cs @@ -76,7 +76,7 @@ namespace System.DirectoryServices.ActiveDirectory // // this api obtains the list of DCs/GCs based on dns records. The DCs/GCs that have registered - // non site specific records for the domain/forest are returned. Additonally DCs/GCs that have registered site specific records + // non site specific records for the domain/forest are returned. Additionally DCs/GCs that have registered site specific records // (site is either specified or defaulted to the site of the local machine) are also returned in this list. // diff --git a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectoryEntry.cs b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectoryEntry.cs index 3b3a6d20515..dcdea0d5993 100644 --- a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectoryEntry.cs +++ b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectoryEntry.cs @@ -141,7 +141,7 @@ namespace System.DirectoryServices _options = new DirectoryEntryConfiguration(this); // We are starting from an already bound connection so make sure the options are set properly. - // If this is an externallly managed com object then we don't want to change it's current behavior + // If this is an externally managed com object then we don't want to change it's current behavior if (!AdsObjIsExternal) { InitADsObjectOptions(); diff --git a/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs b/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs index c694a531619..ac0f4c11a42 100644 --- a/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs +++ b/src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs @@ -148,7 +148,7 @@ namespace System.IO.Tests T item = GetExistingItem(); // These linq calls make an IEnumerable of pairs of functions that are not identical - // (eg. not (creationtime, creationtime)), includes both orders as seperate entries + // (eg. not (creationtime, creationtime)), includes both orders as separate entries // as they it have different behavior in reverse order (of functions), in addition // to the pairs of functions, there is a reverse bool that allows a test for both // increasing and decreasing timestamps as to not limit the test unnecessarily. diff --git a/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOServices.cs b/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOServices.cs index 27b923dbd39..7b2355746ea 100644 --- a/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOServices.cs +++ b/src/libraries/System.IO.FileSystem/tests/PortedCommon/IOServices.cs @@ -109,7 +109,7 @@ internal class IOServices while (path.Length < characterCount) { - // Add directory seperator after each dir but not at the end of the path + // Add directory separator after each dir but not at the end of the path path.Append(Path.DirectorySeparatorChar); // Continue adding unique path segments until the character count is hit diff --git a/src/libraries/System.IO.Ports/tests/Support/SerialPortProperties.cs b/src/libraries/System.IO.Ports/tests/Support/SerialPortProperties.cs index 40f1c22e820..a814cd8b5e3 100644 --- a/src/libraries/System.IO.Ports/tests/Support/SerialPortProperties.cs +++ b/src/libraries/System.IO.Ports/tests/Support/SerialPortProperties.cs @@ -287,7 +287,7 @@ namespace Legacy.Support { _properties.Clear(); - // For each key in the defaultProperties Hashtable set poperties[key] + // For each key in the defaultProperties Hashtable set properties[key] // with the corresponding value in defaultProperties foreach (object key in defaultProperties.Keys) { diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/ExpressionStringBuilder.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/ExpressionStringBuilder.cs index b0309c31fec..6bc6d136cfc 100644 --- a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/ExpressionStringBuilder.cs +++ b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/ExpressionStringBuilder.cs @@ -120,7 +120,7 @@ namespace System.Linq.Expressions VisitExpressions(open, expressions, close, ", "); } - private void VisitExpressions<T>(char open, ReadOnlyCollection<T> expressions, char close, string seperator) where T : Expression + private void VisitExpressions<T>(char open, ReadOnlyCollection<T> expressions, char close, string separator) where T : Expression { Out(open); if (expressions != null) @@ -134,7 +134,7 @@ namespace System.Linq.Expressions } else { - Out(seperator); + Out(separator); } Visit(e); } diff --git a/src/libraries/System.Linq.Expressions/tests/Block/BlockTests.cs b/src/libraries/System.Linq.Expressions/tests/Block/BlockTests.cs index da7dd6e6ced..bfc685a9f95 100644 --- a/src/libraries/System.Linq.Expressions/tests/Block/BlockTests.cs +++ b/src/libraries/System.Linq.Expressions/tests/Block/BlockTests.cs @@ -122,7 +122,7 @@ namespace System.Linq.Expressions.Tests } [Fact] - public static void VisitChangingOnlyParmeters() + public static void VisitChangingOnlyParameters() { BlockExpression block = Expression.Block( new[] { Expression.Parameter(typeof(int)), Expression.Parameter(typeof(string)) }, @@ -132,7 +132,7 @@ namespace System.Linq.Expressions.Tests } [Fact] - public static void VisitChangingOnlyParmetersMultiStatementBody() + public static void VisitChangingOnlyParametersMultiStatementBody() { BlockExpression block = Expression.Block( new[] { Expression.Parameter(typeof(int)), Expression.Parameter(typeof(string)) }, @@ -143,7 +143,7 @@ namespace System.Linq.Expressions.Tests } [Fact] - public static void VisitChangingOnlyParmetersTyped() + public static void VisitChangingOnlyParametersTyped() { BlockExpression block = Expression.Block( typeof(object), diff --git a/src/libraries/System.Linq.Expressions/tests/Switch/SwitchTests.cs b/src/libraries/System.Linq.Expressions/tests/Switch/SwitchTests.cs index 723ec56c884..be075791681 100644 --- a/src/libraries/System.Linq.Expressions/tests/Switch/SwitchTests.cs +++ b/src/libraries/System.Linq.Expressions/tests/Switch/SwitchTests.cs @@ -577,7 +577,7 @@ namespace System.Linq.Expressions.Tests AssertExtensions.Throws<ArgumentException>("switchValue", () => Expression.Switch(typeof(int), Expression.Empty(), Expression.Constant(1), default(MethodInfo), Enumerable.Empty<SwitchCase>())); } - public static IEnumerable<object[]> ComparisonsWithInvalidParmeterCounts() + public static IEnumerable<object[]> ComparisonsWithInvalidParameterCounts() { Func<bool> nullary = () => true; yield return new object[] { nullary.GetMethodInfo() }; @@ -589,7 +589,7 @@ namespace System.Linq.Expressions.Tests yield return new object[] { quaternary.GetMethodInfo() }; } - [Theory, MemberData(nameof(ComparisonsWithInvalidParmeterCounts))] + [Theory, MemberData(nameof(ComparisonsWithInvalidParameterCounts))] public void InvalidComparisonMethodParameterCount(MethodInfo comparison) { AssertExtensions.Throws<ArgumentException>("comparison", () => Expression.Switch(Expression.Constant(0), Expression.Empty(), comparison)); diff --git a/src/libraries/System.Management/src/System/Management/WMIGenerator.cs b/src/libraries/System.Management/src/System/Management/WMIGenerator.cs index dfa1e091188..1c43875350a 100644 --- a/src/libraries/System.Management/src/System/Management/WMIGenerator.cs +++ b/src/libraries/System.Management/src/System/Management/WMIGenerator.cs @@ -1078,7 +1078,7 @@ namespace System.Management /// <summary> /// Function for generating the helper class "ManagementSystemProperties" which is - /// used for seperating the system properties from the other properties. This is used + /// used for separating the system properties from the other properties. This is used /// just to make the drop down list in the editor to look good. /// </summary> private CodeTypeDeclaration GenerateSystemPropertiesClass() @@ -4716,7 +4716,7 @@ namespace System.Management } /// <summary> - /// Function to convert a given ValueMap or BitMap name to propert enum name + /// Function to convert a given ValueMap or BitMap name to property enum name /// </summary> private static string ConvertValuesToName(string str) { diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj index 501b6446bb8..ac4d036552f 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj @@ -14,7 +14,7 @@ <Compile Include="BaseCertificateTest.cs" /> <Compile Include="ServerCertificateTest.cs" /> <Compile Include="WinHttpHandlerTest.cs" /> - <Compile Include="XunitTestAssemblyAtrributes.cs" /> + <Compile Include="XunitTestAssemblyAttributes.cs" /> <Compile Include="$(CommonPath)\System\Net\Http\HttpHandlerDefaults.cs" Link="Common\System\Net\Http\HttpHandlerDefaults.cs" /> <Compile Include="$(CommonTestPath)System\IO\DelegateStream.cs" diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/XunitTestAssemblyAtrributes.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/XunitTestAssemblyAttributes.cs index 9a5c8690d95..9a5c8690d95 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/XunitTestAssemblyAtrributes.cs +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/XunitTestAssemblyAttributes.cs diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index a3e5400761f..8cc30e517ac 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -117,6 +117,6 @@ <Compile Include="WinHttpRequestStreamTest.cs" /> <Compile Include="WinHttpResponseHeaderReaderTest.cs" /> <Compile Include="WinHttpResponseStreamTest.cs" /> - <Compile Include="XunitTestAssemblyAtrributes.cs" /> + <Compile Include="XunitTestAssemblyAttributes.cs" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/XunitTestAssemblyAtrributes.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/XunitTestAssemblyAttributes.cs index 9a5c8690d95..9a5c8690d95 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/XunitTestAssemblyAtrributes.cs +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/XunitTestAssemblyAttributes.cs diff --git a/src/libraries/System.Net.Requests/src/System/Net/ICloseEx.cs b/src/libraries/System.Net.Requests/src/System/Net/ICloseEx.cs index b9705ccd873..626c46158b3 100644 --- a/src/libraries/System.Net.Requests/src/System/Net/ICloseEx.cs +++ b/src/libraries/System.Net.Requests/src/System/Net/ICloseEx.cs @@ -7,7 +7,7 @@ namespace System.Net internal enum CloseExState { Normal = 0x0, // just a close - Abort = 0x1, // unconditionaly release resources + Abort = 0x1, // unconditionally release resources Silent = 0x2 // do not throw on close if possible } diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs index 022a57c0ca2..05dfce4137f 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs @@ -59,7 +59,7 @@ namespace System.Net.Security.Tests } } - // MacOS has has special validation rules for apple.com and icloud.com + // MacOS has special validation rules for apple.com and icloud.com [ConditionalTheory] [OuterLoop("Uses external servers")] [InlineData("www.apple.com")] diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/LocalEndPointTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/LocalEndPointTest.cs index 9fb542d8335..673e85b593e 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/LocalEndPointTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/LocalEndPointTest.cs @@ -79,7 +79,7 @@ namespace System.Net.Sockets.Tests } [Fact] - public async Task TcpClientSocket_WhenBoundToWildcardAddress_LocalEPChangeToSpecificOnConnnect() + public async Task TcpClientSocket_WhenBoundToWildcardAddress_LocalEPChangeToSpecificOnConnect() { using (Socket server = CreateTcpSocket()) using (Socket client = CreateTcpSocket()) @@ -103,7 +103,7 @@ namespace System.Net.Sockets.Tests } [Fact] - public async Task TcpClientSocket_WhenNotBound_LocalEPChangeToSpecificOnConnnect() + public async Task TcpClientSocket_WhenNotBound_LocalEPChangeToSpecificOnConnect() { using (Socket server = CreateTcpSocket()) using (Socket client = CreateTcpSocket()) diff --git a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSetEqualityComparer.cs b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSetEqualityComparer.cs index bd741f8ab13..981d7644f5d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSetEqualityComparer.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSetEqualityComparer.cs @@ -63,7 +63,7 @@ namespace System.Collections.Generic { if (t != null) { - hashCode ^= t.GetHashCode(); // same hashcode as as default comparer + hashCode ^= t.GetHashCode(); // same hashcode as default comparer } } } diff --git a/src/libraries/System.Private.CoreLib/src/System/Environment.Win32.cs b/src/libraries/System.Private.CoreLib/src/System/Environment.Win32.cs index 0f190d79f2e..07af75661e9 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Environment.Win32.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Environment.Win32.cs @@ -379,7 +379,7 @@ namespace System return path; } - // Seperate type so a .cctor is not created for Enviroment which then would be triggered during startup + // Separate type so a .cctor is not created for Environment which then would be triggered during startup private static class WindowsVersion { // Cache the value in static readonly that can be optimized out by the JIT diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/DateTimeParse.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/DateTimeParse.cs index a67fa5cca0b..a4fe66a66d9 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/DateTimeParse.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/DateTimeParse.cs @@ -5379,7 +5379,7 @@ new DS[] { DS.ERROR, DS.TX_NNN, DS.TX_NNN, DS.TX_NNN, DS.ERROR, DS.ERROR, { tokenType = tempType; tokenValue = tempValue; - // This is a token, so the Index has been advanced propertly in DTFI.Tokenizer(). + // This is a token, so the Index has been advanced properly in DTFI.Tokenizer(). } else { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs index f7064b15ad6..9edb16152bf 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs @@ -724,7 +724,7 @@ namespace System.Globalization else if (!IsWordSeparator(charType)) { // This category is considered to be part of the word. - // This is any category that is marked as false in wordSeprator array. + // This is any category that is marked as false in wordSeparator array. i += charLen; } else @@ -852,7 +852,7 @@ namespace System.Globalization // Used in ToTitleCase(): // When we find a starting letter, the following array decides if a category should be - // considered as word seprator or not. + // considered as word separator or not. private const int c_wordSeparatorMask = /* false */ (0 << 0) | // UppercaseLetter = 0, /* false */ (0 << 1) | // LowercaseLetter = 1, diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/UnmanagedMemoryStreamWrapper.cs b/src/libraries/System.Private.CoreLib/src/System/IO/UnmanagedMemoryStreamWrapper.cs index d3a8bab317e..bc9f9c3f674 100644 --- a/src/libraries/System.Private.CoreLib/src/System/IO/UnmanagedMemoryStreamWrapper.cs +++ b/src/libraries/System.Private.CoreLib/src/System/IO/UnmanagedMemoryStreamWrapper.cs @@ -132,7 +132,7 @@ namespace System.IO { // This was probably meant to call _unmanagedStream.SetLength(value), but it was forgotten in V.4.0. // Now this results in a call to the base which touches the underlying array which is never actually used. - // We cannot fix it due to compat now, but we should fix this at the next SxS release oportunity. + // We cannot fix it due to compat now, but we should fix this at the next SxS release opportunity. base.SetLength(value); } diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/TypeAttributes.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/TypeAttributes.cs index c59ce522ea8..30c6ed4a4a4 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Reflection/TypeAttributes.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Reflection/TypeAttributes.cs @@ -17,7 +17,7 @@ namespace System.Reflection NestedFamANDAssem = 0x00000006, // Class is nested with family and assembly visibility. NestedFamORAssem = 0x00000007, // Class is nested with family or assembly visibility. - // Use this mask to retrieve class layout informaiton + // Use this mask to retrieve class layout information // 0 is AutoLayout, 0x2 is SequentialLayout, 4 is ExplicitLayout LayoutMask = 0x00000018, AutoLayout = 0x00000000, // Class fields are auto-laid out diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.cs index 431a8b8c679..c0c2bf3e0c0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.cs @@ -315,7 +315,7 @@ namespace System.Runtime.InteropServices /// If unable to get the <typeparamref name="TManager"/> type, returns false. /// </summary> /// <typeparam name="T">The element type of the <paramref name="memory" />.</typeparam> - /// <typeparam name="TManager">The type of <see cref="MemoryManager{T}"/> to try and retrive.</typeparam> + /// <typeparam name="TManager">The type of <see cref="MemoryManager{T}"/> to try and retrieve.</typeparam> /// <param name="memory">The memory to get the manager for.</param> /// <param name="manager">The returned manager of the <see cref="ReadOnlyMemory{T}"/>.</param> /// <returns>A <see cref="bool"/> indicating if it was successful.</returns> @@ -334,7 +334,7 @@ namespace System.Runtime.InteropServices /// If unable to get the <typeparamref name="TManager"/> type, returns false. /// </summary> /// <typeparam name="T">The element type of the <paramref name="memory" />.</typeparam> - /// <typeparam name="TManager">The type of <see cref="MemoryManager{T}"/> to try and retrive.</typeparam> + /// <typeparam name="TManager">The type of <see cref="MemoryManager{T}"/> to try and retrieve.</typeparam> /// <param name="memory">The memory to get the manager for.</param> /// <param name="manager">The returned manager of the <see cref="ReadOnlyMemory{T}"/>.</param> /// <param name="start">The offset from the start of the <paramref name="manager" /> that the <paramref name="memory" /> represents.</param> diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/LowLevelSpinWaiter.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/LowLevelSpinWaiter.cs index 28d70524c2b..ba82f7237e5 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/LowLevelSpinWaiter.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/LowLevelSpinWaiter.cs @@ -68,7 +68,7 @@ namespace System.Threading if (processorCount > 1 && (spinIndex < sleep0Threshold || (spinIndex - sleep0Threshold) % 2 != 0)) { // Cap the maximum spin count to a value such that many thousands of CPU cycles would not be wasted doing - // the equivalent of YieldProcessor(), as that that point SwitchToThread/Sleep(0) are more likely to be able to + // the equivalent of YieldProcessor(), as at that point SwitchToThread/Sleep(0) are more likely to be able to // allow other useful work to run. Long YieldProcessor() loops can help to reduce contention, but Sleep(1) is // usually better for that. int n = Thread.OptimalMaxSpinWaitsPerSpinIteration; diff --git a/src/libraries/System.Private.Uri/src/System/Uri.cs b/src/libraries/System.Private.Uri/src/System/Uri.cs index ad283039b32..fefc3e64969 100644 --- a/src/libraries/System.Private.Uri/src/System/Uri.cs +++ b/src/libraries/System.Private.Uri/src/System/Uri.cs @@ -759,7 +759,7 @@ namespace System throw new InvalidOperationException(SR.net_uri_NotAbsolute); } - // Note: Compatibilty with V1 that does not report user info + // Note: Compatibility with V1 that does not report user info return GetParts(UriComponents.Host | UriComponents.Port, UriFormat.UriEscaped); } } diff --git a/src/libraries/System.Private.Uri/tests/FunctionalTests/UriMailToTest.cs b/src/libraries/System.Private.Uri/tests/FunctionalTests/UriMailToTest.cs index 32be21bdf91..0635b79d2b4 100644 --- a/src/libraries/System.Private.Uri/tests/FunctionalTests/UriMailToTest.cs +++ b/src/libraries/System.Private.Uri/tests/FunctionalTests/UriMailToTest.cs @@ -117,13 +117,13 @@ namespace System.PrivateUri.Tests } [Fact] - public void UriMailTo_TwoSemiColonSepratedAddresses_Success() + public void UriMailTo_TwoSemiColonSeparatedAddresses_Success() { Assert.ThrowsAny<FormatException>(() => new Uri("mailto:User@Host;User@Host")); } [Fact] - public void UriMailTo_TwoCommaSepratedAddresses_Success() + public void UriMailTo_TwoCommaSeparatedAddresses_Success() { Assert.ThrowsAny<FormatException>(() => new Uri("mailto:User@Host,User@Host")); } diff --git a/src/libraries/System.Private.Xml.Linq/tests/Schema/ExtensionTests.cs b/src/libraries/System.Private.Xml.Linq/tests/Schema/ExtensionTests.cs index 623fd2ad6d0..e4c75f5e5fa 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/Schema/ExtensionTests.cs +++ b/src/libraries/System.Private.Xml.Linq/tests/Schema/ExtensionTests.cs @@ -30,7 +30,7 @@ namespace CoreXml.Test.XLinq public static XmlSchemaSet schemaSet; public static string xmlString; public static XDocument xmlDocument; - public static bool validationSucceded; + public static bool validationSucceeded; // initialize values for tests public SchemaExtensionsTests() @@ -72,7 +72,7 @@ namespace CoreXml.Test.XLinq <body>Don't forget to call me!</body> </note>"; xmlDocument = XDocument.Load(new StringReader(xmlString)); - validationSucceded = false; + validationSucceeded = false; /* * Use this method to load the above data from disk @@ -88,17 +88,17 @@ namespace CoreXml.Test.XLinq // this gets called when a validation error occurs private void TestValidationHandler(object sender, ValidationEventArgs e) { - validationSucceded = false; + validationSucceeded = false; } // test succesful validation [Fact] public void XDocumentSuccessValidate() { - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler)); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); } // test failed validation @@ -112,10 +112,10 @@ namespace CoreXml.Test.XLinq var newElement = new XElement(elementName, elementValue); xmlDocument.Root.Add(newElement); - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler)); - Assert.False(validationSucceded); + Assert.False(validationSucceeded); } /* @@ -160,10 +160,10 @@ namespace CoreXml.Test.XLinq } // populate XML with PSVI - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler), true); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // no. of elements after validation elements = xmlDocument.Elements(); @@ -211,10 +211,10 @@ namespace CoreXml.Test.XLinq } // don't populate XML with PSVI - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler), false); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // no. of elements after validation elements = xmlDocument.Elements(); @@ -246,17 +246,17 @@ namespace CoreXml.Test.XLinq object attributeValue = "2010-05-27"; // validate the entire document - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler), true); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // change and re-validate attribute value XAttribute date = xmlDocument.Element(elementName).Attribute(attributeName); date.SetValue(attributeValue); ExtensionsClass.Validate(date, date.GetSchemaInfo().SchemaAttribute,schemaSet, new ValidationEventHandler(TestValidationHandler)); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); } // attribute validation fails after change @@ -268,17 +268,17 @@ namespace CoreXml.Test.XLinq object attributeValue = "2010-12-32"; // validate the entire document - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler),true); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // change and re-validate attribute value XAttribute date = xmlDocument.Element(elementName).Attribute(attributeName); date.SetValue(attributeValue); ExtensionsClass.Validate(date, date.GetSchemaInfo().SchemaAttribute, schemaSet, new ValidationEventHandler(TestValidationHandler)); - Assert.False(validationSucceded); + Assert.False(validationSucceeded); } /* @@ -293,10 +293,10 @@ namespace CoreXml.Test.XLinq object attributeValue = "2010-12-32"; // validate the entire document - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler),true); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // change and re-validate attribute value XAttribute date = xmlDocument.Element(elementName).Attribute(attributeName); @@ -313,10 +313,10 @@ namespace CoreXml.Test.XLinq object childElementValue = "Please call me!"; // validate the entire document - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler), true); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // alter element XElement root = xmlDocument.Element(parentElementName); @@ -324,7 +324,7 @@ namespace CoreXml.Test.XLinq ExtensionsClass.Validate(root, root.GetSchemaInfo().SchemaElement, schemaSet, new ValidationEventHandler(TestValidationHandler)); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); } // element validation fails after change @@ -336,10 +336,10 @@ namespace CoreXml.Test.XLinq object childElementValue = "Don't forget to call me! Please!"; // validate the entire document - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler), true); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // alter element XElement root = xmlDocument.Element(parentElementName); @@ -347,7 +347,7 @@ namespace CoreXml.Test.XLinq ExtensionsClass.Validate(root, root.GetSchemaInfo().SchemaElement, schemaSet, new ValidationEventHandler(TestValidationHandler)); - Assert.False(validationSucceded); + Assert.False(validationSucceeded); } @@ -363,10 +363,10 @@ namespace CoreXml.Test.XLinq object childElementValue = "Don't forget to call me! Please!"; // validate the entire document - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler), true); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // alter element XElement root = xmlDocument.Element(parentElementName); @@ -383,16 +383,16 @@ namespace CoreXml.Test.XLinq string attributeName = "date"; // validate the entire document - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler), true); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // validate attribute XAttribute date = xmlDocument.Element(elementName).Attribute(attributeName); ExtensionsClass.Validate(date, date.GetSchemaInfo().SchemaAttribute, schemaSet, new ValidationEventHandler(TestValidationHandler)); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); IXmlSchemaInfo schemaInfo = ExtensionsClass.GetSchemaInfo(date); Assert.NotNull(schemaInfo); @@ -405,16 +405,16 @@ namespace CoreXml.Test.XLinq string elementName = "body"; // validate the entire document - validationSucceded = true; + validationSucceeded = true; ExtensionsClass.Validate(xmlDocument, schemaSet, new ValidationEventHandler(TestValidationHandler), true); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); // validate element XElement body = xmlDocument.Root.Element(elementName); ExtensionsClass.Validate(body, body.GetSchemaInfo().SchemaElement, schemaSet, new ValidationEventHandler(TestValidationHandler)); - Assert.True(validationSucceded); + Assert.True(validationSucceeded); IXmlSchemaInfo schemaInfo = ExtensionsClass.GetSchemaInfo(body); Assert.NotNull(schemaInfo); diff --git a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testparser.cs b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testparser.cs index 1818eeaa973..02c857b30f6 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testparser.cs +++ b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testparser.cs @@ -34,7 +34,7 @@ namespace Microsoft.Test.ModuleCore public class Tokens { public string Equal = "="; - public string Seperator = ";"; + public string Separator = ";"; public string SingleQuote = "'"; public string DoubleQuote = "\""; } @@ -71,7 +71,7 @@ namespace Microsoft.Test.ModuleCore break; case PARSE.Keyword: - if (tokens.Seperator.IndexOf(ch) >= 0) + if (tokens.Separator.IndexOf(ch) >= 0) { state = PARSE.Initial; } @@ -98,7 +98,7 @@ namespace Microsoft.Test.ModuleCore { state = PARSE.DoubleBegin; } - else if (tokens.Seperator.IndexOf(ch) >= 0) + else if (tokens.Separator.IndexOf(ch) >= 0) { keywords.Update(key, string.Empty); state = PARSE.Initial; @@ -111,7 +111,7 @@ namespace Microsoft.Test.ModuleCore break; case PARSE.Value: - if (tokens.Seperator.IndexOf(ch) >= 0) + if (tokens.Separator.IndexOf(ch) >= 0) { keywords.Update(key, (builder.ToString()).Trim()); state = PARSE.Initial; @@ -165,7 +165,7 @@ namespace Microsoft.Test.ModuleCore break; case PARSE.End: - if (tokens.Seperator.IndexOf(ch) >= 0) + if (tokens.Separator.IndexOf(ch) >= 0) { state = PARSE.Initial; } diff --git a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testproperties.cs b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testproperties.cs index cb377772a9e..51bdf4bf8f8 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testproperties.cs +++ b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/testproperties.cs @@ -34,7 +34,7 @@ namespace Microsoft.Test.ModuleCore //CommandLine Options KeywordParser.Tokens tokens = new KeywordParser.Tokens(); tokens.Equal = " "; - tokens.Seperator = "/"; + tokens.Separator = "/"; Dictionary<string, string> options = KeywordParser.ParseKeywords(commandline, tokens); foreach (string key in options.Keys) s_pproperties["CommandLine/" + key] = options[key]; @@ -66,7 +66,7 @@ namespace Microsoft.Test.ModuleCore //CommandLine Options KeywordParser.Tokens tokens = new KeywordParser.Tokens(); tokens.Equal = " "; - tokens.Seperator = "/"; + tokens.Separator = "/"; Dictionary<string, string> options = KeywordParser.ParseKeywords(commandLine, tokens); foreach (string key in options.Keys) TestInput.Properties["CommandLine/" + key] = options[key]; diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs index 95a59303710..fc7812a4ded 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs +++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/FunctionalTests.cs @@ -579,7 +579,7 @@ namespace CoreXml.Test.XLinq this.AddChild(new TestVariation(writeValue_13) { Attribute = new VariationAttribute("Write multiple atomic values inside element, separate by WriteWhitespace(' ')") { Id = 13, Priority = 1 } }); this.AddChild(new TestVariation(writeValue_14) { Attribute = new VariationAttribute("Write multiple atomic values inside element, separate by WriteString(' ')") { Id = 14, Priority = 1 } }); this.AddChild(new TestVariation(writeValue_15) { Attribute = new VariationAttribute("Write multiple atomic values inside attribute, separate by WriteWhitespace(' ')") { Id = 15, Priority = 1 } }); - this.AddChild(new TestVariation(writeValue_16) { Attribute = new VariationAttribute("Write multiple atomic values inside attribute, seperate by WriteString(' ')") { Id = 16, Priority = 1 } }); + this.AddChild(new TestVariation(writeValue_16) { Attribute = new VariationAttribute("Write multiple atomic values inside attribute, separate by WriteString(' ')") { Id = 16, Priority = 1 } }); this.AddChild(new TestVariation(writeValue_17) { Attribute = new VariationAttribute("WriteValue(long)") { Id = 17, Priority = 1 } }); } } diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/XmlReaderDiff.cs b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/XmlReaderDiff.cs index 74d4c175441..4029b82f49b 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/XmlReaderDiff.cs +++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/XmlReaderDiff.cs @@ -94,9 +94,9 @@ namespace CoreXml.Test.XLinq if (originalReader.NodeType == XmlNodeType.Element) { // read all r1 attributes - var origAttrs = MoveAtrributeEnumerator(originalReader).ToArray(); + var origAttrs = MoveAttributeEnumerator(originalReader).ToArray(); // read all r2 attributes - var filteredAttrs = MoveAtrributeEnumerator(filteredReader).ToArray(); + var filteredAttrs = MoveAttributeEnumerator(filteredReader).ToArray(); // Verify HasAttributes consistency TestLog.Compare(filteredAttrs.Any(), filteredReader.HasAttributes, "has attributes"); @@ -241,7 +241,7 @@ namespace CoreXml.Test.XLinq } } - private static IEnumerable<string[]> IndexedAtrributeEnumerator(XmlReader r, bool moveToElement) + private static IEnumerable<string[]> IndexedAttributeEnumerator(XmlReader r, bool moveToElement) { TestLog.Compare(r.NodeType, XmlNodeType.Element, "Assert for enumerator"); // assert int aCount = r.AttributeCount; @@ -254,7 +254,7 @@ namespace CoreXml.Test.XLinq r.MoveToElement(); } - private static IEnumerable<string[]> MoveAtrributeEnumerator(XmlReader r) + private static IEnumerable<string[]> MoveAttributeEnumerator(XmlReader r) { TestLog.Compare(r.NodeType, XmlNodeType.Element, "Assert for enumerator"); // assert if (r.MoveToFirstAttribute()) diff --git a/src/libraries/System.Private.Xml/src/Resources/Strings.resx b/src/libraries/System.Private.Xml/src/Resources/Strings.resx index f9f838382dc..57974af51a6 100644 --- a/src/libraries/System.Private.Xml/src/Resources/Strings.resx +++ b/src/libraries/System.Private.Xml/src/Resources/Strings.resx @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <root> - <!-- - Microsoft ResX Schema - + <!-- + Microsoft ResX Schema + Version 2.0 - - The primary goals of this format is to allow a simple XML format - that is mostly human readable. The generation and parsing of the - various data types are done through the TypeConverter classes + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes associated with the data types. - + Example: - + ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">2.0</resheader> @@ -26,36 +26,36 @@ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <comment>This is a comment</comment> </data> - - There are any number of "resheader" rows that contain simple + + There are any number of "resheader" rows that contain simple name/value pairs. - - Each data row contains a name, and value. The row also contains a - type or mimetype. Type corresponds to a .NET class that support - text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the mimetype set. - - The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: - - Note - application/x-microsoft.net.object.binary.base64 is the format - that the ResXResourceWriter will generate, however the reader can + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. - + mimetype: application/x-microsoft.net.object.binary.base64 - value : The object must be serialized with + value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. - + mimetype: application/x-microsoft.net.object.soap.base64 - value : The object must be serialized with + value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array + value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> @@ -423,7 +423,7 @@ <data name="Xml_NoDTDPresent" xml:space="preserve"> <value>No DTD found.</value> </data> - <data name="Xml_MultipleValidaitonTypes" xml:space="preserve"> + <data name="Xml_MultipleValidationTypes" xml:space="preserve"> <value>Unsupported combination of validation types.</value> </data> <data name="Xml_NoValidation" xml:space="preserve"> @@ -3401,7 +3401,7 @@ building and deploying the assemblies with the application. Usage: dotnet {0} [--assembly <assembly file path>] [--type <type name>]</value> </data> <data name="HelpDevOptions" xml:space="preserve"> - <value> + <value> Developer options:</value> </data> <data name="HelpAssembly" xml:space="preserve"> @@ -3420,7 +3420,7 @@ Usage: dotnet {0} [--assembly <assembly file path>] [--type <type name& <value> {0}|{1} Output directory name (default: target assembly location).</value> </data> <data name="HelpMiscOptions" xml:space="preserve"> - <value> + <value> Miscellaneous options:</value> </data> <data name="HelpHelp" xml:space="preserve"> diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs b/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs index 6c12e3a0586..1c34c045b2b 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs @@ -3679,7 +3679,7 @@ namespace System.Xml _ps.charPos += 5; - // parsing of text declarations cannot change global stringBuidler or curNode as we may be in the middle of a text node + // parsing of text declarations cannot change global stringBuilder or curNode as we may be in the middle of a text node Debug.Assert(_stringBuilder.Length == 0 || isTextDecl); StringBuilder sb = isTextDecl ? new StringBuilder() : _stringBuilder; diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImplAsync.cs b/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImplAsync.cs index dc3e99fd89d..a017a26ed71 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImplAsync.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImplAsync.cs @@ -1237,7 +1237,7 @@ namespace System.Xml } _ps.charPos += 5; - // parsing of text declarations cannot change global stringBuidler or curNode as we may be in the middle of a text node + // parsing of text declarations cannot change global stringBuilder or curNode as we may be in the middle of a text node Debug.Assert(_stringBuilder.Length == 0 || isTextDecl); StringBuilder sb = isTextDecl ? new StringBuilder() : _stringBuilder; diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/Asttree.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/Asttree.cs index 65acfb5264b..a523db7ee27 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Schema/Asttree.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Schema/Asttree.cs @@ -51,8 +51,8 @@ namespace System.Xml.Schema if (depth == this.curDepth - 1) { // really need to move the current node pointer to parent - // what i did here is for seperating the case of IsDss or only IsChild - // bcoz in the first case i need to expect "a" from random depth + // what i did here is for separating the case of IsDss or only IsChild + // because in the first case i need to expect "a" from random depth // -1 means it doesn't expect some specific depth (referecing the dealing to -1 in movetochild method // while in the second case i can't change the root depth which is 1. if ((this.curNode.Input == parent.RootNode) && (parent.IsDss)) diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/Preprocessor.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/Preprocessor.cs index 482b596d915..327f490d57f 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Schema/Preprocessor.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Schema/Preprocessor.cs @@ -1729,7 +1729,7 @@ namespace System.Xml.Schema if (complexType.Particle != null || complexType.Attributes != null) { - // this is illigal + // this is illegal } if (complexType.ContentModel is XmlSchemaSimpleContent) { diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaCollectionpreProcessor.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaCollectionpreProcessor.cs index 3dab0b2b2a9..e011edae379 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaCollectionpreProcessor.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaCollectionpreProcessor.cs @@ -1381,7 +1381,7 @@ namespace System.Xml.Schema if (complexType.Particle != null || complexType.Attributes != null) { - // this is illigal + // this is illegal } if (complexType.ContentModel is XmlSchemaSimpleContent) { diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaSetCompiler.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaSetCompiler.cs index 9094f3939eb..7de4c7d56ef 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaSetCompiler.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaSetCompiler.cs @@ -599,7 +599,7 @@ namespace System.Xml.Schema { CompileAttributeGroup(baseAttributeGroup); CompileAttributeGroup(attributeGroup); - CheckAtrributeGroupRestriction(baseAttributeGroup, attributeGroup); + CheckAttributeGroupRestriction(baseAttributeGroup, attributeGroup); } } @@ -2327,7 +2327,7 @@ namespace System.Xml.Schema } } - private void CheckAtrributeGroupRestriction(XmlSchemaAttributeGroup baseAttributeGroup, XmlSchemaAttributeGroup derivedAttributeGroup) + private void CheckAttributeGroupRestriction(XmlSchemaAttributeGroup baseAttributeGroup, XmlSchemaAttributeGroup derivedAttributeGroup) { XmlSchemaAnyAttribute? baseAnyAtt = baseAttributeGroup.AttributeWildcard; XmlSchemaAnyAttribute? derivedAnyAtt = derivedAttributeGroup.AttributeWildcard; diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XdrValidator.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XdrValidator.cs index 6c91f1f48dc..092fd0c5eef 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XdrValidator.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XdrValidator.cs @@ -392,7 +392,7 @@ namespace System.Xml.Schema { if (schemaInfo.SchemaType != SchemaType.XDR) { - throw new XmlException(SR.Xml_MultipleValidaitonTypes, string.Empty, this.PositionInfo.LineNumber, this.PositionInfo.LinePosition); + throw new XmlException(SR.Xml_MultipleValidationTypes, string.Empty, this.PositionInfo.LineNumber, this.PositionInfo.LinePosition); } this.schemaInfo.Add(schemaInfo, EventHandler); diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaValidator.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaValidator.cs index a37bc74bf47..a41ef94dd7d 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaValidator.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaValidator.cs @@ -2185,7 +2185,7 @@ namespace System.Xml.Schema } // foreach constraint /constraintstruct // added on June 19, make connections between new keyref tables with key/unique tables in stack - // i can't put it in the above loop, coz there will be key on the same level + // i can't put it in the above loop, because there will be key on the same level for (int i = 0; i < _context.Constr.Length; ++i) { if (_context.Constr[i].constraint.Role == CompiledIdentityConstraint.ConstraintRole.Keyref) diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XsdValidator.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XsdValidator.cs index 3ae730e42d5..4e33a421969 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XsdValidator.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XsdValidator.cs @@ -638,7 +638,7 @@ namespace System.Xml.Schema { if (schemaInfo.SchemaType != SchemaType.XSD) { - throw new XmlException(SR.Xml_MultipleValidaitonTypes, string.Empty, this.PositionInfo.LineNumber, this.PositionInfo.LinePosition); + throw new XmlException(SR.Xml_MultipleValidationTypes, string.Empty, this.PositionInfo.LineNumber, this.PositionInfo.LinePosition); } SchemaInfo.Add(schemaInfo, EventHandler); return; @@ -864,7 +864,7 @@ namespace System.Xml.Schema } // foreach constraint /constraintstruct // added on June 19, make connections between new keyref tables with key/unique tables in stack - // i can't put it in the above loop, coz there will be key on the same level + // i can't put it in the above loop, because there will be key on the same level for (int i = 0; i < context.Constr.Length; ++i) { if (context.Constr[i].constraint.Role == CompiledIdentityConstraint.ConstraintRole.Keyref) diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGenerator.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGenerator.cs index 0d004975a39..1c5c500088e 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGenerator.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/QilGenerator.cs @@ -348,7 +348,7 @@ namespace System.Xml.Xsl.Xslt // 3. In context of global variable // We treating this methods differentely when they are called to create implicit arguments. // Implicite argument (position, last) are rare and lead to uneficiant code. So we treating them - // specialy to be able eliminate them later, wen we compiled everithing and can detect was they used or not. + // specially to be able eliminate them later, wen we compiled everithing and can detect was they used or not. // Returns context node private QilNode GetCurrentNode() @@ -2562,7 +2562,7 @@ namespace System.Xml.Xsl.Xslt // Fills invokeArgs with values from actualArgs in order given by formalArgs // Returns true if formalArgs maps 1:1 with actual args. - // Formaly this is n*n algorithm. We can optimize it by calculationg "signature" + // Formally this is n*n algorithm. We can optimize it by calculationg "signature" // of the function as sum of all hashes of its args names. private static bool FillupInvokeArgs(IList<QilNode> formalArgs, IList<XslNode> actualArgs, QilList invokeArgs) { diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/InputScope.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/InputScope.cs index 08ad280514f..82e95b719de 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/InputScope.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/InputScope.cs @@ -104,7 +104,7 @@ namespace System.Xml.Xsl.XsltOld _variables[variable.Name!] = variable; } - internal int GetVeriablesCount() + internal int GetVariablesCount() { if (_variables == null) { diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/SequentialOutput.cs b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/SequentialOutput.cs index f19259e5083..4ba7cf13308 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/SequentialOutput.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Xsl/XsltOld/SequentialOutput.cs @@ -60,7 +60,7 @@ namespace System.Xml.Xsl.XsltOld private bool _firstLine = true; private bool _secondRoot; - // Cached Output propertes: + // Cached Output properties: private XsltOutput _output; private bool _isHtmlOutput; private bool _isXmlOutput; diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/tests/CustomAttributeBuilderTests.cs b/src/libraries/System.Reflection.Emit.ILGeneration/tests/CustomAttributeBuilderTests.cs index 0b536e51a94..9b170d6ec9f 100644 --- a/src/libraries/System.Reflection.Emit.ILGeneration/tests/CustomAttributeBuilderTests.cs +++ b/src/libraries/System.Reflection.Emit.ILGeneration/tests/CustomAttributeBuilderTests.cs @@ -1017,7 +1017,7 @@ namespace System.Reflection.Emit.Tests [Theory] [ActiveIssue("https://github.com/dotnet/runtime/issues/2383", TestRuntimes.Mono)] [MemberData(nameof(NotSupportedPrimitives_TestData))] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Coreclr fixed an issue where IntPtr/UIntPtr in propertValues causes a corrupt created binary.")] + [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Coreclr fixed an issue where IntPtr/UIntPtr in propertyValues causes a corrupt created binary.")] public static void NotSupportedPrimitiveInPropertyValues_ThrowsArgumentException(object value) { ConstructorInfo con = typeof(TestAttribute).GetConstructor(new Type[0]); diff --git a/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs b/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs index 1a005f42e1f..43dcc00666a 100644 --- a/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs +++ b/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs @@ -232,7 +232,7 @@ namespace System.Reflection.Emit.Tests [Theory] [InlineData(AssemblyBuilderAccess.Run)] [InlineData(AssemblyBuilderAccess.RunAndCollect)] - public void SetCustomAttribute_ConstructorBuidler_ByteArray(AssemblyBuilderAccess access) + public void SetCustomAttribute_ConstructorBuilder_ByteArray(AssemblyBuilderAccess access) { AssemblyBuilder assembly = Helpers.DynamicAssembly(access: access); ConstructorInfo constructor = typeof(BoolAllAttribute).GetConstructor(new Type[] { typeof(bool) }); @@ -243,14 +243,14 @@ namespace System.Reflection.Emit.Tests } [Fact] - public void SetCustomAttribute_ConstructorBuidler_ByteArray_NullConstructorBuilder_ThrowsArgumentNullException() + public void SetCustomAttribute_ConstructorBuildler_ByteArray_NullConstructorBuilder_ThrowsArgumentNullException() { AssemblyBuilder assembly = Helpers.DynamicAssembly(); AssertExtensions.Throws<ArgumentNullException>("con", () => assembly.SetCustomAttribute(null, new byte[0])); } [Fact] - public void SetCustomAttribute_ConstructorBuidler_ByteArray_NullByteArray_ThrowsArgumentNullException() + public void SetCustomAttribute_ConstructorBuildler_ByteArray_NullByteArray_ThrowsArgumentNullException() { AssemblyBuilder assembly = Helpers.DynamicAssembly(); ConstructorInfo constructor = typeof(IntAllAttribute).GetConstructor(new Type[] { typeof(int) }); @@ -398,12 +398,12 @@ namespace System.Reflection.Emit.Tests Assert.Throws<MethodAccessException>(() => d ()); } - + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsReflectionEmitSupported))] void Invoke_Private_SameAssembly_ThrowsMethodAccessException() { ModuleBuilder modb = Helpers.DynamicModule(); - + string calleeName = "PrivateMethod"; TypeBuilder tbCalled = modb.DefineType ("CalledClass", TypeAttributes.Public); diff --git a/src/libraries/System.Reflection.Metadata/tests/TestUtilities/SigningUtilities.cs b/src/libraries/System.Reflection.Metadata/tests/TestUtilities/SigningUtilities.cs index c23a93346ed..ac375d87ad7 100644 --- a/src/libraries/System.Reflection.Metadata/tests/TestUtilities/SigningUtilities.cs +++ b/src/libraries/System.Reflection.Metadata/tests/TestUtilities/SigningUtilities.cs @@ -17,7 +17,7 @@ namespace System.Reflection.PortableExecutable.Tests using (var rsa = RSA.Create()) { - rsa.ImportParameters(RSAParamatersFromBlob(privateKey)); + rsa.ImportParameters(RSAParametersFromBlob(privateKey)); var signature = rsa.SignHash(hash, HashAlgorithmName.SHA1, RSASignaturePadding.Pkcs1); Array.Reverse(signature); return signature; @@ -43,7 +43,7 @@ namespace System.Reflection.PortableExecutable.Tests } } - private static RSAParameters RSAParamatersFromBlob(byte[] blob) + private static RSAParameters RSAParametersFromBlob(byte[] blob) { RSAParameters key; diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/MethodBase/Ecma/EcmaMethodDecoder.cs b/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/MethodBase/Ecma/EcmaMethodDecoder.cs index 9558e92d656..23341e6709d 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/MethodBase/Ecma/EcmaMethodDecoder.cs +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/MethodBase/Ecma/EcmaMethodDecoder.cs @@ -71,11 +71,11 @@ namespace System.Reflection.TypeLoading.Ecma public MethodSig<RoParameter> SpecializeMethodSig(IRoMethodBase roMethodBase) { MetadataReader reader = Reader; - MethodDefinition methodDefiniton = MethodDefinition; - MethodSignature<RoType> sig = methodDefiniton.DecodeSignature(_module, roMethodBase.TypeContext); + MethodDefinition methodDefinition = MethodDefinition; + MethodSignature<RoType> sig = methodDefinition.DecodeSignature(_module, roMethodBase.TypeContext); int numParameters = sig.RequiredParameterCount; MethodSig<RoParameter> methodSig = new MethodSig<RoParameter>(numParameters); - foreach (ParameterHandle ph in methodDefiniton.GetParameters()) + foreach (ParameterHandle ph in methodDefinition.GetParameters()) { Parameter p = ph.GetParameter(reader); int position = p.SequenceNumber - 1; diff --git a/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs b/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs index 7d7c45c55e9..35949f76935 100644 --- a/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs +++ b/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs @@ -1729,7 +1729,7 @@ namespace System.Numerics.Tests return ret; } - private static string GenerateGroups(int[] sizes, string seperator, Random random) + private static string GenerateGroups(int[] sizes, string separator, Random random) { List<int> total_sizes = new List<int>(); int total; @@ -1780,14 +1780,14 @@ namespace System.Numerics.Tests num_digits -= group_size; if (num_digits > 0) { - digits += seperator; + digits += separator; } } return digits; } - private static string GroupFormatDigits(string input, string seperator, int[] sizes, string point, int places) + private static string GroupFormatDigits(string input, string separator, int[] sizes, string point, int places) { string output = string.Empty; int currentspot = input.Length - 1; @@ -1813,7 +1813,7 @@ namespace System.Numerics.Tests } else { - output = seperator + ZeroString(size) + output; + output = separator + ZeroString(size) + output; currentspot -= size; } if (currentsize < sizes.Length - 1) @@ -1840,7 +1840,7 @@ namespace System.Numerics.Tests } else { - output = seperator + input.Substring(currentspot - size + 1, size) + output; + output = separator + input.Substring(currentspot - size + 1, size) + output; currentspot -= size; } if (currentsize < sizes.Length - 1) diff --git a/src/libraries/System.Runtime.Numerics/tests/BigInteger/parse.cs b/src/libraries/System.Runtime.Numerics/tests/BigInteger/parse.cs index 0aa38f0824d..785dc209b24 100644 --- a/src/libraries/System.Runtime.Numerics/tests/BigInteger/parse.cs +++ b/src/libraries/System.Runtime.Numerics/tests/BigInteger/parse.cs @@ -253,12 +253,12 @@ namespace System.Numerics.Tests for (int i = 0; i < s_samples; i++) { int[] sizes = null; - string seperator = null; + string separator = null; string digits = null; sizes = CultureInfo.CurrentCulture.NumberFormat.NumberGroupSizes; - seperator = CultureInfo.CurrentCulture.NumberFormat.NumberGroupSeparator; - digits = GenerateGroups(sizes, seperator, random); + separator = CultureInfo.CurrentCulture.NumberFormat.NumberGroupSeparator; + digits = GenerateGroups(sizes, separator, random); if (NoGrouping(sizes)) { VerifyParseToString(digits); @@ -382,12 +382,12 @@ namespace System.Numerics.Tests for (int i = 0; i < s_samples; i++) { int[] sizes = null; - string seperator = null; + string separator = null; string digits = null; sizes = CultureInfo.CurrentCulture.NumberFormat.NumberGroupSizes; - seperator = CultureInfo.CurrentCulture.NumberFormat.NumberGroupSeparator; - digits = GenerateGroups(sizes, seperator, random); + separator = CultureInfo.CurrentCulture.NumberFormat.NumberGroupSeparator; + digits = GenerateGroups(sizes, separator, random); VerifyParseToString(digits, ns, NoGrouping(sizes) || ((ns & NumberStyles.AllowThousands) != 0)); } @@ -767,7 +767,7 @@ namespace System.Numerics.Tests return y2; } - private static string GenerateGroups(int[] sizes, string seperator, Random random) + private static string GenerateGroups(int[] sizes, string separator, Random random) { List<int> total_sizes = new List<int>(); int total; @@ -823,7 +823,7 @@ namespace System.Numerics.Tests num_digits -= group_size; if (num_digits > 0) { - digits += seperator; + digits += separator; } } diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs b/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs index 7493bb07a97..57825bdcc01 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs @@ -533,9 +533,9 @@ namespace SerializationTestTypes return Globals.DefaultNamespace + clrNs.Replace('.', '/'); } - static string GetGlobalContractNamespace(string clrNs, ICustomAttributeProvider customAttribuetProvider) + static string GetGlobalContractNamespace(string clrNs, ICustomAttributeProvider customAttributeProvider) { - object[] nsAttributes = customAttribuetProvider.GetCustomAttributes(typeof(ContractNamespaceAttribute), false); + object[] nsAttributes = customAttributeProvider.GetCustomAttributes(typeof(ContractNamespaceAttribute), false); string dataContractNs = null; for (int i = 0; i < nsAttributes.Length; i++) { diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellmanCng.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellmanCng.cs index 56ae020b746..5f75ab78519 100644 --- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellmanCng.cs +++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellmanCng.cs @@ -115,7 +115,7 @@ namespace System.Security.Cryptography } /// <summary> - /// Use the secret agreement as the HMAC key rather than supplying a seperate one + /// Use the secret agreement as the HMAC key rather than supplying a separate one /// </summary> public bool UseSecretAgreementAsHmacKey { diff --git a/src/libraries/System.Speech/src/Internal/GrammarBuilding/BuilderElements.cs b/src/libraries/System.Speech/src/Internal/GrammarBuilding/BuilderElements.cs index 04947f11aa0..1832e5c8ef6 100644 --- a/src/libraries/System.Speech/src/Internal/GrammarBuilding/BuilderElements.cs +++ b/src/libraries/System.Speech/src/Internal/GrammarBuilding/BuilderElements.cs @@ -152,9 +152,9 @@ namespace System.Speech.Internal.GrammarBuilding internal void CreateChildrenElements(IElementFactory elementFactory, IRule parent, IdentifierCollection ruleIds) { - foreach (GrammarBuilderBase buider in Items) + foreach (GrammarBuilderBase builder in Items) { - IElement element = buider.CreateElement(elementFactory, parent, parent, ruleIds); + IElement element = builder.CreateElement(elementFactory, parent, parent, ruleIds); if (element != null) { element.PostParse(parent); @@ -165,9 +165,9 @@ namespace System.Speech.Internal.GrammarBuilding internal void CreateChildrenElements(IElementFactory elementFactory, IItem parent, IRule rule, IdentifierCollection ruleIds) { - foreach (GrammarBuilderBase buider in Items) + foreach (GrammarBuilderBase builder in Items) { - IElement element = buider.CreateElement(elementFactory, parent, rule, ruleIds); + IElement element = builder.CreateElement(elementFactory, parent, rule, ruleIds); if (element != null) { element.PostParse(parent); diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/JsonConstants.cs b/src/libraries/System.Text.Json/src/System/Text/Json/JsonConstants.cs index 93ff7cea77f..421b71e80f0 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/JsonConstants.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/JsonConstants.cs @@ -14,7 +14,7 @@ namespace System.Text.Json public const byte LineFeed = (byte)'\n'; public const byte Tab = (byte)'\t'; public const byte ListSeparator = (byte)','; - public const byte KeyValueSeperator = (byte)':'; + public const byte KeyValueSeparator = (byte)':'; public const byte Quote = (byte)'"'; public const byte BackSlash = (byte)'\\'; public const byte Slash = (byte)'/'; diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/JsonHelpers.Escaping.cs b/src/libraries/System.Text.Json/src/System/Text/Json/JsonHelpers.Escaping.cs index d8f74ddc091..c4cfe678a5c 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/JsonHelpers.Escaping.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/JsonHelpers.Escaping.cs @@ -89,7 +89,7 @@ namespace System.Text.Json propertySection[0] = JsonConstants.Quote; utf8Value.CopyTo(propertySection.AsSpan(1, length)); propertySection[++length] = JsonConstants.Quote; - propertySection[++length] = JsonConstants.KeyValueSeperator; + propertySection[++length] = JsonConstants.KeyValueSeparator; return propertySection; } diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.MultiSegment.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.MultiSegment.cs index efe4ab9dc9d..fffb8f29e4b 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.MultiSegment.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.MultiSegment.cs @@ -732,8 +732,8 @@ namespace System.Text.Json first = _buffer[_consumed]; } - // The next character must be a key / value seperator. Validate and skip. - if (first != JsonConstants.KeyValueSeperator) + // The next character must be a key / value separator. Validate and skip. + if (first != JsonConstants.KeyValueSeparator) { ThrowHelper.ThrowJsonReaderException(ref this, ExceptionResource.ExpectedSeparatorAfterPropertyNameNotFound, first); } diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.cs index 543c9fa5bea..fb19d52032b 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.cs @@ -1250,8 +1250,8 @@ namespace System.Text.Json first = _buffer[_consumed]; } - // The next character must be a key / value seperator. Validate and skip. - if (first != JsonConstants.KeyValueSeperator) + // The next character must be a key / value separator. Validate and skip. + if (first != JsonConstants.KeyValueSeparator) { ThrowHelper.ThrowJsonReaderException(ref this, ExceptionResource.ExpectedSeparatorAfterPropertyNameNotFound, first); } diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Bytes.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Bytes.cs index 4cc66797f65..1c95db2f6cc 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Bytes.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Bytes.cs @@ -234,7 +234,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -270,7 +270,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -319,7 +319,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; @@ -370,7 +370,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.DateTime.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.DateTime.cs index cdd3e8930b1..55c079f008f 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.DateTime.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.DateTime.cs @@ -237,7 +237,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -271,7 +271,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -319,7 +319,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; @@ -368,7 +368,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.DateTimeOffset.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.DateTimeOffset.cs index 3251fa4e1c1..f25b3eae833 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.DateTimeOffset.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.DateTimeOffset.cs @@ -236,7 +236,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -270,7 +270,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -318,7 +318,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; @@ -367,7 +367,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Decimal.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Decimal.cs index f90ad0ab5ab..933fcffc4fc 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Decimal.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Decimal.cs @@ -236,7 +236,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -267,7 +267,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -312,7 +312,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); @@ -358,7 +358,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Double.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Double.cs index 71e0f579936..73bcc75f72e 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Double.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Double.cs @@ -240,7 +240,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = TryFormatDouble(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -271,7 +271,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = TryFormatDouble(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -316,7 +316,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = TryFormatDouble(value, output.Slice(BytesPending), out int bytesWritten); @@ -362,7 +362,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = TryFormatDouble(value, output.Slice(BytesPending), out int bytesWritten); diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Float.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Float.cs index b6b952daa83..bb695740d29 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Float.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Float.cs @@ -240,7 +240,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = TryFormatSingle(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -271,7 +271,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = TryFormatSingle(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -316,7 +316,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = TryFormatSingle(value, output.Slice(BytesPending), out int bytesWritten); @@ -362,7 +362,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = TryFormatSingle(value, output.Slice(BytesPending), out int bytesWritten); diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Guid.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Guid.cs index 9178873dd2f..a0c5713374c 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Guid.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Guid.cs @@ -236,7 +236,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -271,7 +271,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -320,7 +320,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; @@ -370,7 +370,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Helpers.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Helpers.cs index 3ea7aeaa1aa..0c68ef88f8f 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Helpers.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Helpers.cs @@ -82,7 +82,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = token; } @@ -125,7 +125,7 @@ namespace System.Text.Json output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = token; } @@ -154,7 +154,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = token; } @@ -197,7 +197,7 @@ namespace System.Text.Json output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = token; } diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Literal.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Literal.cs index 7a68bc6512c..e73131b7192 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Literal.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.Literal.cs @@ -359,7 +359,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; value.CopyTo(output.Slice(BytesPending)); BytesPending += value.Length; @@ -390,7 +390,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; value.CopyTo(output.Slice(BytesPending)); BytesPending += value.Length; @@ -463,7 +463,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; value.CopyTo(output.Slice(BytesPending)); @@ -509,7 +509,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; value.CopyTo(output.Slice(BytesPending)); diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.SignedNumber.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.SignedNumber.cs index b7dfaaa8411..10c390a98ff 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.SignedNumber.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.SignedNumber.cs @@ -312,7 +312,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -343,7 +343,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -388,7 +388,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); @@ -434,7 +434,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.String.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.String.cs index 50b6fd38ef7..74eeb9eeed2 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.String.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.String.cs @@ -183,7 +183,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; } private void WriteStringIndentedPropertyName(ReadOnlySpan<char> escapedPropertyName) @@ -223,7 +223,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; } @@ -347,7 +347,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; } // AggressiveInlining used since this is only called from one location. @@ -416,7 +416,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; } @@ -1433,7 +1433,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -1468,7 +1468,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -1504,7 +1504,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -1541,7 +1541,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Quote; @@ -1590,7 +1590,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; @@ -1640,7 +1640,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; @@ -1691,7 +1691,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; @@ -1743,7 +1743,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; output[BytesPending++] = JsonConstants.Quote; diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.UnsignedNumber.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.UnsignedNumber.cs index d256de5517e..ab73c36582c 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.UnsignedNumber.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteProperties.UnsignedNumber.cs @@ -321,7 +321,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -352,7 +352,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); Debug.Assert(result); @@ -397,7 +397,7 @@ namespace System.Text.Json TranscodeAndWrite(escapedPropertyName, output); output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); @@ -443,7 +443,7 @@ namespace System.Text.Json BytesPending += escapedPropertyName.Length; output[BytesPending++] = JsonConstants.Quote; - output[BytesPending++] = JsonConstants.KeyValueSeperator; + output[BytesPending++] = JsonConstants.KeyValueSeparator; output[BytesPending++] = JsonConstants.Space; bool result = Utf8Formatter.TryFormat(value, output.Slice(BytesPending), out int bytesWritten); diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/MetadataContextTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/MetadataContextTests.cs index ffb5ca658eb..c1961e7c23c 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/MetadataContextTests.cs +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/MetadataContextTests.cs @@ -252,7 +252,7 @@ namespace System.Text.Json.SourceGeneration.Tests public void EnsureHelperMethodGenerated_ImplicitPropertyFactory() { // ContextWithImplicitStringEnum does not have an entry for EnumWrittenAsString since it is - // implictly added by PocoWithEnum. Verify helper methods are still being created properly. + // implicitly added by PocoWithEnum. Verify helper methods are still being created properly. const string Json = "{\"MyEnum\":\"A\"}"; diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/JsonPolymorphicTypeConfigurationTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/JsonPolymorphicTypeConfigurationTests.cs index 0c37dd0d7c5..5b94d2d9ec1 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/JsonPolymorphicTypeConfigurationTests.cs +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/JsonPolymorphicTypeConfigurationTests.cs @@ -16,7 +16,7 @@ namespace System.Text.Json.Tests.Serialization [InlineData(typeof(Interface))] [InlineData(typeof(Class))] [InlineData(typeof(GenericClass<int>))] - public static void SupportedBaseTypeArgument_ShouldSucced(Type baseType) + public static void SupportedBaseTypeArgument_ShouldSucceed(Type baseType) { var configuration = new JsonPolymorphicTypeConfiguration(baseType); Assert.Equal(baseType, configuration.BaseType); @@ -30,7 +30,7 @@ namespace System.Text.Json.Tests.Serialization [InlineData(typeof(Interface), typeof(Class))] [InlineData(typeof(Interface), typeof(Struct))] [InlineData(typeof(Class), typeof(GenericClass<int>))] - public static void SupportedDerivedTypeArgument_ShouldSucced(Type baseType, Type derivedType) + public static void SupportedDerivedTypeArgument_ShouldSucceed(Type baseType, Type derivedType) { var configuration = new JsonPolymorphicTypeConfiguration(baseType).WithDerivedType(derivedType); Assert.Equal(new[] { (derivedType, (string)null) }, configuration); @@ -153,6 +153,6 @@ namespace System.Text.Json.Tests.Serialization private class Class : Interface { } private struct Struct : Interface { } private sealed class SealedClass : Interface { } - private class GenericClass<T> : Class { } + private class GenericClass<T> : Class { } } } diff --git a/src/mono/mono/component/hot_reload.c b/src/mono/mono/component/hot_reload.c index 4935c588a62..4a9e012055c 100644 --- a/src/mono/mono/component/hot_reload.c +++ b/src/mono/mono/component/hot_reload.c @@ -217,7 +217,7 @@ typedef struct _delta_row_count { guint32 inserted_rows; } delta_row_count; -/* Additional informaiton for MonoImages representing deltas */ +/* Additional information for MonoImages representing deltas */ struct _DeltaInfo { uint32_t generation; /* global update ID that added this delta image */ MonoImage *delta_image; /* DeltaInfo doesn't own the image, the base MonoImage owns the reference */ @@ -240,7 +240,7 @@ struct _DeltaInfo { }; -/* Additional informaiton for baseline MonoImages */ +/* Additional information for baseline MonoImages */ struct _BaselineInfo { /* List of DeltaInfos of deltas*/ GList *delta_info; diff --git a/src/mono/mono/eglib/gpath.c b/src/mono/mono/eglib/gpath.c index 317130b243c..dee5e21d4a4 100644 --- a/src/mono/mono/eglib/gpath.c +++ b/src/mono/mono/eglib/gpath.c @@ -90,7 +90,7 @@ g_build_path (const gchar *separator, const gchar *first_element, ...) } static gchar* -strrchr_seperator (const gchar* filename) +strrchr_separator (const gchar* filename) { #ifdef G_OS_WIN32 char *p2; @@ -114,7 +114,7 @@ g_path_get_dirname (const gchar *filename) size_t count; g_return_val_if_fail (filename != NULL, NULL); - p = strrchr_seperator (filename); + p = strrchr_separator (filename); if (p == NULL) return g_strdup ("."); if (p == filename) @@ -138,7 +138,7 @@ g_path_get_basename (const char *filename) return g_strdup ("."); /* No separator -> filename */ - r = strrchr_seperator (filename); + r = strrchr_separator (filename); if (r == NULL) return g_strdup (filename); @@ -146,7 +146,7 @@ g_path_get_basename (const char *filename) if (r [1] == 0){ char *copy = g_strdup (filename); copy [r-filename] = 0; - r = strrchr_seperator (copy); + r = strrchr_separator (copy); if (r == NULL){ g_free (copy); @@ -194,7 +194,7 @@ cont: * Scan token (scan for delimiters: s += strcspn(s, delim), sort of). * Note that delim must have one NUL; we stop if we see that, too. */ - for (;;){ + while (true) { c = *s++; spanp = (char *)delim; do { @@ -321,7 +321,7 @@ g_ensure_directory_exists (const gchar *filename) p = dir_utf16; - /* make life easy and only use one directory seperator */ + /* make life easy and only use one directory separator */ while (*p != '\0') { if (*p == '/') diff --git a/src/mono/mono/eglib/test/ptrarray.c b/src/mono/mono/eglib/test/ptrarray.c index 5de21bafb54..53786fd0297 100644 --- a/src/mono/mono/eglib/test/ptrarray.c +++ b/src/mono/mono/eglib/test/ptrarray.c @@ -301,7 +301,7 @@ ptrarray_remove_fast (void) return FAILED ("First element wasn't replaced with last upon removal"); if (g_ptr_array_remove_fast (array, letters[0])) - return FAILED ("Succedeed removing a non-existing element"); + return FAILED ("Succeeded removing a non-existing element"); if (!g_ptr_array_remove_fast (array, letters[3]) || array->len != 3) return FAILED ("Failed removing \"D\""); diff --git a/src/mono/mono/eventpipe/test/ep-tests.h b/src/mono/mono/eventpipe/test/ep-tests.h index af7d0b4d4d0..5fd91ce797a 100644 --- a/src/mono/mono/eventpipe/test/ep-tests.h +++ b/src/mono/mono/eventpipe/test/ep-tests.h @@ -20,7 +20,7 @@ const static Group test_groups [] = { {"setup", ep_setup_tests_init}, {"rt", ep_rt_tests_init}, - {"fastserialzier", ep_fastserializer_tests_init}, + {"fastserializer", ep_fastserializer_tests_init}, {"provider-callback-dataqueue", ep_provider_callback_data_queue_tests_init}, {"file", ep_file_tests_init}, {"session", ep_session_tests_init}, diff --git a/src/mono/mono/metadata/class-setup-vtable.c b/src/mono/mono/metadata/class-setup-vtable.c index 009110f546d..461cab2b70c 100644 --- a/src/mono/mono/metadata/class-setup-vtable.c +++ b/src/mono/mono/metadata/class-setup-vtable.c @@ -1383,7 +1383,7 @@ mono_class_setup_vtable_ginst (MonoClass *klass, GList *in_setup) * vtable_slot_has_preserve_base_overrides_attribute: * * Needs to walk up the class hierarchy looking for the methods in this slot to - * see if any are tagged with PreserveBaseOverrideAtrribute. + * see if any are tagged with PreserveBaseOverrideAttribute. */ static gboolean vtable_slot_has_preserve_base_overrides_attribute (MonoClass *klass, int slot, MonoClass **out_klass) diff --git a/src/mono/mono/metadata/loader-internals.h b/src/mono/mono/metadata/loader-internals.h index 772c2dc875e..d7711ecd294 100644 --- a/src/mono/mono/metadata/loader-internals.h +++ b/src/mono/mono/metadata/loader-internals.h @@ -159,7 +159,7 @@ struct _MonoMemoryManager { // Hashtables for Reflection handles MonoGHashTable *type_hash; MonoConcGHashTable *refobject_hash; - // Maps class -> type initializaiton exception object + // Maps class -> type initialization exception object MonoGHashTable *type_init_exception_hash; // Maps delegate trampoline addr -> delegate object //MonoGHashTable *delegate_hash_table; diff --git a/src/mono/mono/metadata/loader.c b/src/mono/mono/metadata/loader.c index df93bf68648..b745f0c1247 100644 --- a/src/mono/mono/metadata/loader.c +++ b/src/mono/mono/metadata/loader.c @@ -1419,7 +1419,7 @@ mono_method_get_param_names (MonoMethod *method, const char **names) method = ((MonoMethodInflated *) method)->declaring; signature = mono_method_signature_internal (method); - /*FIXME this check is somewhat redundant since the caller usally will have to get the signature to figure out the + /*FIXME this check is somewhat redundant since the caller usually will have to get the signature to figure out the number of arguments and allocate a properly sized array. */ if (signature == NULL) return; diff --git a/src/mono/mono/metadata/marshal-ilgen.c b/src/mono/mono/metadata/marshal-ilgen.c index 7c03d64617e..9ff7f1c15de 100644 --- a/src/mono/mono/metadata/marshal-ilgen.c +++ b/src/mono/mono/metadata/marshal-ilgen.c @@ -321,7 +321,7 @@ emit_invoke_call (MonoMethodBuilder *mb, MonoMethod *method, if (m_type_is_byref (t)) { mono_mb_emit_byte (mb, CEE_LDIND_I); /* A Nullable<T> type don't have a boxed form, it's either null or a boxed T. - * So to make this work we unbox it to a local variablee and push a reference to that. + * So to make this work we unbox it to a local variable and push a reference to that. */ if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t))) { tmp_nullable_locals [i] = mono_mb_add_local (mb, m_class_get_byval_arg (mono_class_from_mono_type_internal (t))); diff --git a/src/mono/mono/metadata/metadata.c b/src/mono/mono/metadata/metadata.c index 0a1f427ee5e..c0ddb30214e 100644 --- a/src/mono/mono/metadata/metadata.c +++ b/src/mono/mono/metadata/metadata.c @@ -4485,7 +4485,7 @@ mono_metadata_free_mh (MonoMethodHeader *mh) * \param code_size memory location for returning the code size * \param max_stack memory location for returning the max stack * - * Method header accessor to retreive info about the IL code properties: + * Method header accessor to retrieve info about the IL code properties: * a pointer to the IL code itself, the size of the code and the max number * of stack slots used by the code. * @@ -4507,7 +4507,7 @@ mono_method_header_get_code (MonoMethodHeader *header, guint32* code_size, guint * \param num_locals memory location for returning the number of local variables * \param init_locals memory location for returning the init_locals flag * - * Method header accessor to retreive info about the local variables: + * Method header accessor to retrieve info about the local variables: * an array of local types, the number of locals and whether the locals * are supposed to be initialized to 0 on method entry * @@ -4527,7 +4527,7 @@ mono_method_header_get_locals (MonoMethodHeader *header, guint32* num_locals, gb * mono_method_header_get_num_clauses: * @header: a MonoMethodHeader pointer * - * Method header accessor to retreive the number of exception clauses. + * Method header accessor to retrieve the number of exception clauses. * * Returns: the number of exception clauses present */ diff --git a/src/mono/mono/metadata/object-internals.h b/src/mono/mono/metadata/object-internals.h index 87d48c7b944..7db19c41423 100644 --- a/src/mono/mono/metadata/object-internals.h +++ b/src/mono/mono/metadata/object-internals.h @@ -1183,7 +1183,7 @@ typedef struct { MonoArray *table_indexes; } MonoReflectionModuleBuilder; -/* Safely acess System.Reflection.Emit.ModuleBuidler from native code */ +/* Safely acess System.Reflection.Emit.ModuleBuilder from native code */ TYPED_HANDLE_DECL (MonoReflectionModuleBuilder); typedef enum { diff --git a/src/mono/mono/metadata/sre.c b/src/mono/mono/metadata/sre.c index 3bbdab9fc7a..03e989869ee 100644 --- a/src/mono/mono/metadata/sre.c +++ b/src/mono/mono/metadata/sre.c @@ -3632,7 +3632,7 @@ typebuilder_setup_fields (MonoClass *klass, MonoError *error) mono_class_set_field_def_values (klass, def_values); /* This is, guess what, a hack. - The issue is that the runtime doesn't know how to setup the fields of a typebuider and crash. + The issue is that the runtime doesn't know how to setup the fields of a typebuilder and crash. On the static path no field class is resolved, only types are built. This is the right thing to do but we suck. Setting size_inited is harmless because we're doing the same job as mono_class_setup_fields anyway. diff --git a/src/mono/mono/mini/abcremoval.h b/src/mono/mono/mini/abcremoval.h index 585a9072fbc..25f8995cd79 100644 --- a/src/mono/mono/mini/abcremoval.h +++ b/src/mono/mono/mini/abcremoval.h @@ -132,7 +132,7 @@ typedef enum { * The first variable (the one "on the left of the expression") is implicit. * relation: the relation between the variable and the value * related_value: the related value - * relation_is_static_definition: TRUE if the relation comes from a veriable + * relation_is_static_definition: TRUE if the relation comes from a variable * definition, FALSE if it comes from a branch * condition * next: pointer to the next relation of this variable in the evaluation area diff --git a/src/mono/mono/mini/aot-compiler.c b/src/mono/mono/mini/aot-compiler.c index 3ade4cce92b..27078e552aa 100644 --- a/src/mono/mono/mini/aot-compiler.c +++ b/src/mono/mono/mini/aot-compiler.c @@ -1672,7 +1672,7 @@ arch_emit_label_address (MonoAotCompile *acfg, const char *target, gboolean exte * - we use an approach similar to the x86 abi: reserve a register (r30) to hold * the GOT pointer. * - The full-aot trampolines need access to the GOT of mscorlib, so we store - * in in the 2. slot of every GOT, and require every method to place the GOT + * it in the second slot of every GOT, and require every method to place the GOT * address in r30, even when it doesn't access the GOT otherwise. This way, * the trampolines can compute the mscorlib GOT address by loading 4(r30). */ diff --git a/src/mono/mono/mini/branch-opts.c b/src/mono/mono/mini/branch-opts.c index c7c17b938b6..eaa5d1d894b 100644 --- a/src/mono/mono/mini/branch-opts.c +++ b/src/mono/mono/mini/branch-opts.c @@ -60,7 +60,7 @@ mono_branch_optimize_exception_target (MonoCompile *cfg, MonoBasicBlock *bb, con /* get the basic block for the handler and * check if the exception object is used. * Flag is set during method_to_ir due to - * pop-op is optmized away in codegen (burg). + * pop-op is optimized away in codegen (burg). */ tbb = cfg->cil_offset_to_bb [clause->handler_offset]; if (tbb && tbb->flags & BB_EXCEPTION_DEAD_OBJ && !(tbb->flags & BB_EXCEPTION_UNSAFE)) { diff --git a/src/mono/mono/mini/decompose.c b/src/mono/mono/mini/decompose.c index 8860abd0649..e465edc34f0 100644 --- a/src/mono/mono/mini/decompose.c +++ b/src/mono/mono/mini/decompose.c @@ -936,7 +936,7 @@ mono_decompose_long_opts (MonoCompile *cfg) if (tree->inst_c1 == 32) { /* The original code had this comment: */ - /* special case that gives a nice speedup and happens to workaorund a ppc jit but (for the release) + /* special case that gives a nice speedup and happens to workaround a ppc jit but (for the release) * later apply the speedup to the left shift as well * See BUG# 57957. */ diff --git a/src/mono/mono/mini/gshared.cs b/src/mono/mono/mini/gshared.cs index 65693924c05..c2989bc9342 100644 --- a/src/mono/mono/mini/gshared.cs +++ b/src/mono/mono/mini/gshared.cs @@ -150,7 +150,7 @@ public class Tests if (ldobj_stobj (ref d1, ref d2) != 2.0) return 3; if (d1 != 2.0 || d2 != 0.0) - return 4; + return 4; return 0; } @@ -303,7 +303,7 @@ public class Tests static void ldsflda<T> (int[] iarr) { iarr [0] = GFoo<T>.static_f.i; } - + public static int test_0_stsfld () { Foo[] farr = new Foo [] { new Foo () { i = 1, j = 2 } }; stsfld<Foo> (farr); @@ -497,7 +497,7 @@ public class Tests static GFoo3<T> newobj<T> (T t1, T t2) { return new GFoo3<T> (t1, t2); } - + public static int test_0_gshared_new () { var g1 = newobj (1, 2); if (g1.t != 1 || g1.t2 != 2) @@ -645,7 +645,7 @@ public class Tests public T foo; } - [MethodImplAttribute (MethodImplOptions.NoInlining)] + [MethodImplAttribute (MethodImplOptions.NoInlining)] public static void locals<T> (T t) { Foo2<T> t2 = new Foo2<T> (); object o = t2; @@ -874,13 +874,13 @@ public class Tests } [MethodImplAttribute (MethodImplOptions.NoInlining)] - static T2 rgctx_in_call_innner_inner<T1, T2> (T1 t1, T2 t2) { + static T2 rgctx_in_call_inner_inner<T1, T2> (T1 t1, T2 t2) { return t2; } [MethodImplAttribute (MethodImplOptions.NoInlining)] static GFoo3<T> rgctx_in_call_inner<T> (T t) { - return rgctx_in_call_innner_inner (1, new GFoo3<T> ()); + return rgctx_in_call_inner_inner (1, new GFoo3<T> ()); } public static int test_0_rgctx_in_call () { @@ -1249,7 +1249,7 @@ public class Tests object o2 = a.bar<long> (1024, 0, o1); if (o1 != o2) return 1; - return 0; + return 0; } interface BIFace { @@ -1459,7 +1459,7 @@ public class Tests } } - public static int test_0_nullable_unbox () { + public static int test_0_nullable_unbox () { IFaceUnbox2 c = new ClassUnbox2 (); int? i = c.unbox<int?> (5); if (i != 5) diff --git a/src/mono/mono/mini/method-to-ir.c b/src/mono/mono/mini/method-to-ir.c index 3aa7e6b3579..e5588087f8b 100644 --- a/src/mono/mono/mini/method-to-ir.c +++ b/src/mono/mono/mini/method-to-ir.c @@ -3777,7 +3777,7 @@ handle_constrained_gsharedvt_call (MonoCompile *cfg, MonoMethod *cmethod, MonoMe /* * Constrained calls need to behave differently at runtime dependending on whenever the receiver is instantiated as ref type or as a vtype. * This is hard to do with the current call code, since we would have to emit a branch and two different calls. So instead, we - * pack the arguments into an array, and do the rest of the work in in an icall. + * pack the arguments into an array, and do the rest of the work in an icall. */ supported = ((cmethod->klass == mono_defaults.object_class) || mono_class_is_interface (cmethod->klass) || (!m_class_is_valuetype (cmethod->klass) && m_class_get_image (cmethod->klass) != mono_defaults.corlib)); if (supported) @@ -5540,7 +5540,7 @@ is_supported_tailcall (MonoCompile *cfg, const guint8 *ip, MonoMethod *method, M if (!tailcall && !tailcall_calli) goto exit; - // FIXME in calli, there is no type for for the this parameter, + // FIXME in calli, there is no type for the this parameter, // so we assume it might be valuetype; in future we should issue a range // check, so rule out pointing to frame (for other reference parameters also) diff --git a/src/mono/mono/mini/mini-amd64.h b/src/mono/mono/mini/mini-amd64.h index 672d8a7ffa6..e1569445748 100644 --- a/src/mono/mono/mini/mini-amd64.h +++ b/src/mono/mono/mini/mini-amd64.h @@ -256,10 +256,10 @@ typedef struct { gpointer addr; /* The trampoline reads this, so keep the size explicit */ int ret_marshal; - /* If ret_marshal != NONE, this is the reg of the vret arg, else -1 (used in out case) */ + /* If ret_marshal != NONE, this is the reg of the vret arg, else -1 (used bu "out" case) */ /* Equivalent of vret_arg_slot in the x86 implementation. */ int vret_arg_reg; - /* The stack slot where the return value will be stored (used in in case) */ + /* The stack slot where the return value will be stored (used by "in" case) */ int vret_slot; int stack_usage, map_count; /* If not -1, then make a virtual call using this vtable offset */ diff --git a/src/mono/mono/tests/verifier/make_tests.sh b/src/mono/mono/tests/verifier/make_tests.sh index 45866b274af..1ef63a5f9d5 100755 --- a/src/mono/mono/tests/verifier/make_tests.sh +++ b/src/mono/mono/tests/verifier/make_tests.sh @@ -1306,7 +1306,7 @@ done #test variance with delegates #generic methods -#generic atributes +#generic attributes #generic delegates #generic code #the verifier must check if the generic instantiation is valid @@ -1394,7 +1394,7 @@ do ./make_bool_branch_test.sh boolean_branch_${I}_4 valid ${OP} int64 ./make_bool_branch_test.sh boolean_branch_${I}_5 valid ${OP} 'native int' - #unmanaged pointers are not veriable types, all ops on unmanaged pointers are unverifiable + #unmanaged pointers are not verifiable types, all ops on unmanaged pointers are unverifiable ./make_bool_branch_test.sh boolean_branch_${I}_6 unverifiable ${OP} 'int32*' ./make_bool_branch_test.sh boolean_branch_${I}_8 unverifiable ${OP} 'method int32 *(int32)' diff --git a/src/mono/mono/tests/w32message.cs b/src/mono/mono/tests/w32message.cs index cacfa691420..48503acdeda 100644 --- a/src/mono/mono/tests/w32message.cs +++ b/src/mono/mono/tests/w32message.cs @@ -1,7 +1,7 @@ // // This test merely creates a Win32Exception that triggers the // code in mono/io-layer/message.c that validates that the -// error table is propertly sorted +// error table is properly sorted using System; using System.ComponentModel; @@ -19,7 +19,7 @@ class X { } return true; } - + static int Main () { // @@ -39,5 +39,5 @@ class X { return 0; } - + } diff --git a/src/mono/mono/utils/mono-threads-coop.h b/src/mono/mono/utils/mono-threads-coop.h index 3fff0c8a64f..176deade826 100644 --- a/src/mono/mono/utils/mono-threads-coop.h +++ b/src/mono/mono/utils/mono-threads-coop.h @@ -120,7 +120,7 @@ void mono_threads_suspend_override_policy (MonoThreadsSuspendPolicy new_policy); /* * The following are used when detaching a thread. We need to pass the MonoThreadInfo* - * as a paramater as the thread info TLS key is being destructed, meaning that + * as a parameter as the thread info TLS key is being destructed, meaning that * mono_thread_info_current_unchecked will return NULL, which would lead to a * runtime assertion error when trying to switch the state of the current thread. */ diff --git a/src/mono/wasm/runtime/modularize-dotnet.md b/src/mono/wasm/runtime/modularize-dotnet.md index 0ec846fa759..37ece417721 100644 --- a/src/mono/wasm/runtime/modularize-dotnet.md +++ b/src/mono/wasm/runtime/modularize-dotnet.md @@ -34,7 +34,7 @@ In `src\mono\wasm\runtime\CMakeLists.txt` which links only in-tree, we use same # dotnet.*.post.js - Executed last (4) - When `onRuntimeInitialized` is overriden it would wait for emscriptens `Module.ready` -- Otherwise it would wait for for MonoVM to load all assets and assemblies. +- Otherwise it would wait for MonoVM to load all assets and assemblies. - It would pass on the API exports # About new API @@ -56,7 +56,7 @@ More complex scenario with using APIs, commented ``` import createDotnetRuntime from './dotnet.js' -export const { MONO, BINDING } = await createDotnetRuntime(({ MONO, BINDING, Module }) => +export const { MONO, BINDING } = await createDotnetRuntime(({ MONO, BINDING, Module }) => // this is callback with no statement, the APIs are only empty shells here and are populated later. ({ disableDotnet6Compatibility: true, @@ -67,15 +67,15 @@ export const { MONO, BINDING } = await createDotnetRuntime(({ MONO, BINDING, Mod // Module.config is loaded and could be tweaked before application Module.config.environment_variables["MONO_LOG_LEVEL"]="debug" - // here we could use API passed into this callback + // here we could use API passed into this callback // call some early available functions MONO.mono_wasm_setenv("HELLO", "WORLD); } onDotnetReady: () => { // Only when there is no `onRuntimeInitialized` override. - // This is called after all assets are loaded , mapping to legacy `config.loaded_cb`. - // It happens during emscripten `onRuntimeInitialized` after monoVm init + globalization + assemblies. - // This also matches when the top level promise is resolved. + // This is called after all assets are loaded , mapping to legacy `config.loaded_cb`. + // It happens during emscripten `onRuntimeInitialized` after monoVm init + globalization + assemblies. + // This also matches when the top level promise is resolved. // The original emscripten `Module.ready` promise is replaced with this. // at this point both emscripten and monoVM are fully initialized. diff --git a/src/native/corehost/deps_entry.cpp b/src/native/corehost/deps_entry.cpp index e65b1fec590..981d86305e6 100644 --- a/src/native/corehost/deps_entry.cpp +++ b/src/native/corehost/deps_entry.cpp @@ -33,9 +33,9 @@ static pal::string_t normalize_dir_separator(const pal::string_t& path) // str - (out parameter) If the method returns true, contains the file path for this deps entry // search_options - Flags to instruct where to look for this deps entry // found_in_bundle - (out parameter) True if the candidate is located within the single-file bundle. -// +// // Returns: -// If the file exists in the path relative to the "base" directory within the +// If the file exists in the path relative to the "base" directory within the // single-file or on disk. bool deps_entry_t::to_path(const pal::string_t& base, const pal::string_t& ietf_dir, pal::string_t* str, uint32_t search_options, bool &found_in_bundle) const @@ -113,7 +113,7 @@ bool deps_entry_t::to_path(const pal::string_t& base, const pal::string_t& ietf_ } // If a file is resolved to the servicing directory, mark it as disabled in the bundle. - // This step is necessary because runtime will try to resolve assemblies from the bundle + // This step is necessary because runtime will try to resolve assemblies from the bundle // before it uses the TPA. So putting the servicing entry into TPA is not enough, since runtime would // resolve it from the bundle first anyway. Disabling the file's entry in the bundle // ensures that the servicing entry in the TPA gets priority. @@ -137,7 +137,7 @@ bool deps_entry_t::to_path(const pal::string_t& base, const pal::string_t& ietf_ // // Parameters: // base - The base directory to look for the relative path of this entry -// str - If the method returns true, contains the file path for this deps entry +// str - If the method returns true, contains the file path for this deps entry // search_options - Flags to instruct where to look for this deps entry // look_in_bundle - Whether to look within the single-file bundle // @@ -157,7 +157,7 @@ bool deps_entry_t::to_dir_path(const pal::string_t& base, pal::string_t* str, ui ietf_dir = get_directory(pal_relative_path); // get_directory returns with DIR_SEPARATOR appended that we need to remove. - remove_trailing_dir_seperator(&ietf_dir); + remove_trailing_dir_separator(&ietf_dir); // Extract IETF code from "lib/<netstandrd_ver>/<ietf-code>" ietf_dir = get_filename(ietf_dir); @@ -178,7 +178,7 @@ bool deps_entry_t::to_dir_path(const pal::string_t& base, pal::string_t* str, ui // // Parameters: // base - The base directory to look for the relative path of this entry -// str - If the method returns true, contains the file path for this deps entry +// str - If the method returns true, contains the file path for this deps entry // search_options - Flags to instruct where to look for this deps entry // // Returns: @@ -199,7 +199,7 @@ bool deps_entry_t::to_rel_path(const pal::string_t& base, pal::string_t* str, ui // // Parameters: // base - The base directory to look for the relative path of this entry -// str - If the method returns true, contains the file path for this deps entry +// str - If the method returns true, contains the file path for this deps entry // search_options - Flags to instruct where to look for this deps entry // // Returns: diff --git a/src/native/corehost/fxr/fx_muxer.cpp b/src/native/corehost/fxr/fx_muxer.cpp index a97da2f90f7..877dd03e454 100644 --- a/src/native/corehost/fxr/fx_muxer.cpp +++ b/src/native/corehost/fxr/fx_muxer.cpp @@ -234,7 +234,7 @@ void append_probe_realpath(const pal::string_t& path, std::vector<pal::string_t> else { // Check if we can extrapolate |arch|<DIR_SEPARATOR>|tfm| for probing stores - // Check for for both forward and back slashes + // Check for both forward and back slashes pal::string_t placeholder = _X("|arch|\\|tfm|"); auto pos_placeholder = probe_path.find(placeholder); if (pos_placeholder == pal::string_t::npos) diff --git a/src/native/corehost/hostmisc/pal.windows.cpp b/src/native/corehost/hostmisc/pal.windows.cpp index d372b6f16d7..0eacdd8f5bc 100644 --- a/src/native/corehost/hostmisc/pal.windows.cpp +++ b/src/native/corehost/hostmisc/pal.windows.cpp @@ -415,13 +415,13 @@ bool pal::get_global_dotnet_dirs(std::vector<pal::string_t>* dirs) bool dir_found = false; if (pal::get_dotnet_self_registered_dir(&custom_dir)) { - remove_trailing_dir_seperator(&custom_dir); + remove_trailing_dir_separator(&custom_dir); dirs->push_back(custom_dir); dir_found = true; } if (get_default_installation_dir(&default_dir)) { - remove_trailing_dir_seperator(&default_dir); + remove_trailing_dir_separator(&default_dir); // Avoid duplicate global dirs. if (!dir_found || !are_paths_equal_with_normalized_casing(custom_dir, default_dir)) diff --git a/src/native/corehost/hostmisc/utils.cpp b/src/native/corehost/hostmisc/utils.cpp index 977d3d0e4d5..e768b04f251 100644 --- a/src/native/corehost/hostmisc/utils.cpp +++ b/src/native/corehost/hostmisc/utils.cpp @@ -160,7 +160,7 @@ pal::string_t get_directory(const pal::string_t& path) return ret.substr(0, static_cast<size_t>(pos) + 1) + DIR_SEPARATOR; } -void remove_trailing_dir_seperator(pal::string_t* dir) +void remove_trailing_dir_separator(pal::string_t* dir) { if (dir->back() == DIR_SEPARATOR) { @@ -308,7 +308,7 @@ void get_framework_and_sdk_locations(const pal::string_t& dotnet_dir, const bool { // own_dir contains DIR_SEPARATOR appended that we need to remove. dotnet_dir_temp = dotnet_dir; - remove_trailing_dir_seperator(&dotnet_dir_temp); + remove_trailing_dir_separator(&dotnet_dir_temp); locations->push_back(dotnet_dir_temp); } diff --git a/src/native/corehost/hostmisc/utils.h b/src/native/corehost/hostmisc/utils.h index 183a123d9fc..0260f52f599 100644 --- a/src/native/corehost/hostmisc/utils.h +++ b/src/native/corehost/hostmisc/utils.h @@ -66,7 +66,7 @@ pal::string_t get_filename_without_ext(const pal::string_t& path); void append_path(pal::string_t* path1, const pal::char_t* path2); bool library_exists_in_dir(const pal::string_t& lib_dir, const pal::string_t& lib_name, pal::string_t* p_lib_path); bool coreclr_exists_in_dir(const pal::string_t& candidate); -void remove_trailing_dir_seperator(pal::string_t* dir); +void remove_trailing_dir_separator(pal::string_t* dir); void replace_char(pal::string_t* path, pal::char_t match, pal::char_t repl); pal::string_t get_replaced_char(const pal::string_t& path, pal::char_t match, pal::char_t repl); const pal::char_t* get_arch(); diff --git a/src/native/corehost/nethost/nethost.h b/src/native/corehost/nethost/nethost.h index 31adde5e8da..cb568b9bc85 100644 --- a/src/native/corehost/nethost/nethost.h +++ b/src/native/corehost/nethost/nethost.h @@ -13,7 +13,7 @@ // Consuming the nethost as a static library // Shouldn't export attempt to dllimport. #ifdef NETHOST_USE_AS_STATIC - #define NETHOST_API + #define NETHOST_API #else #define NETHOST_API __declspec(dllimport) #endif @@ -77,7 +77,7 @@ struct get_hostfxr_parameters { // // get_hostfxr_parameters // Optional. Parameters that modify the behaviour for locating the hostfxr library. -// If nullptr, hostfxr is located using the enviroment variable or global registration +// If nullptr, hostfxr is located using the environment variable or global registration // // Return value: // 0 on success, otherwise failure diff --git a/src/native/eventpipe/ep-sample-profiler.c b/src/native/eventpipe/ep-sample-profiler.c index 20ba42a764a..a62ce432e91 100644 --- a/src/native/eventpipe/ep-sample-profiler.c +++ b/src/native/eventpipe/ep-sample-profiler.c @@ -46,11 +46,11 @@ sample_profiler_reset_time_granularity (void); static bool -sample_profiler_load_dependecies (void); +sample_profiler_load_dependencies (void); static void -sample_profiler_unload_dependecies (void); +sample_profiler_unload_dependencies (void); static void @@ -143,7 +143,7 @@ sample_profiler_reset_time_granularity (void) static bool -sample_profiler_load_dependecies (void) +sample_profiler_load_dependencies (void) { #ifdef HOST_WIN32 if (_ref_count > 0) @@ -168,7 +168,7 @@ sample_profiler_load_dependecies (void) static void -sample_profiler_unload_dependecies (void) +sample_profiler_unload_dependencies (void) { #ifdef HOST_WIN32 if (_multimedia_library_handle != NULL) { @@ -261,7 +261,7 @@ ep_sample_profiler_enable (void) if (!ep_event_is_enabled (_thread_time_event)) return; - sample_profiler_load_dependecies (); + sample_profiler_load_dependencies (); if (_can_start_sampling) sample_profiler_enable (); @@ -295,7 +295,7 @@ ep_sample_profiler_disable (void) if (_time_period_is_set) sample_profiler_reset_time_granularity (); - sample_profiler_unload_dependecies (); + sample_profiler_unload_dependencies (); } --_ref_count; diff --git a/src/native/eventpipe/ep-stream.h b/src/native/eventpipe/ep-stream.h index c4b3dee44e2..4e4215e5ffe 100644 --- a/src/native/eventpipe/ep-stream.h +++ b/src/native/eventpipe/ep-stream.h @@ -16,7 +16,7 @@ // it's sibling is defined in https://github.com/Microsoft/perfview/blob/10d1f92b242c98073b3817ac5ee6d98cd595d39b/src/FastSerialization/FastSerialization.cs#L2295 typedef enum { - FAST_SERIALIZER_TAGS_ERROR = 0, // To improve debugabilty, 0 is an illegal tag. + FAST_SERIALIZER_TAGS_ERROR = 0, // To improve debugability, 0 is an illegal tag. FAST_SERIALIZER_TAGS_NULL_REFERENCE = 1, // Tag for a null object forwardReference. FAST_SERIALIZER_TAGS_OBJECT_REFERENCE = 2, // Followed by StreamLabel // 3 used to belong to ForwardReference, which got removed in V3 diff --git a/src/native/libs/System.Native/pal_signal.c b/src/native/libs/System.Native/pal_signal.c index 6d08c655418..8defd8d343c 100644 --- a/src/native/libs/System.Native/pal_signal.c +++ b/src/native/libs/System.Native/pal_signal.c @@ -28,7 +28,7 @@ static volatile TerminalInvalidationCallback g_terminalInvalidationCallback = NU static volatile SigChldCallback g_sigChldCallback = NULL; static volatile bool g_sigChldConsoleConfigurationDelayed; static void (*g_sigChldConsoleConfigurationCallback)(void); -// Callback invoked for for SIGTTOU while terminal settings are changed. +// Callback invoked for SIGTTOU while terminal settings are changed. static volatile ConsoleSigTtouHandler g_consoleTtouHandler; // Callback invoked for PosixSignal handling. @@ -228,7 +228,7 @@ static void SignalHandler(int sig, siginfo_t* siginfo, void* context) assert(origHandler->sa_handler); origHandler->sa_handler(sig); } - + } } diff --git a/src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h b/src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h index 07a40bf8315..8e769e615a4 100644 --- a/src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h +++ b/src/native/libs/System.Security.Cryptography.Native.Android/pal_sslstream.h @@ -60,7 +60,7 @@ Initialize an SSL context - isServer : true if the context should be created in server mode - streamReader : callback for reading data from the connection - streamWriter : callback for writing data to the connection - - appBufferSize : initial buffer size for applicaiton data + - appBufferSize : initial buffer size for application data Returns 1 on success, 0 otherwise */ diff --git a/src/tasks/AndroidAppBuilder/ApkBuilder.cs b/src/tasks/AndroidAppBuilder/ApkBuilder.cs index 8ebff5d2683..ace6fcb0c0c 100644 --- a/src/tasks/AndroidAppBuilder/ApkBuilder.cs +++ b/src/tasks/AndroidAppBuilder/ApkBuilder.cs @@ -292,9 +292,9 @@ public class ApkBuilder nativeLibraries += $" {componentLibToLink}{Environment.NewLine}"; } - // There's a circular dependecy between static mono runtime lib and static component libraries. + // There's a circular dependency between static mono runtime lib and static component libraries. // Adding mono runtime lib before and after component libs will resolve issues with undefined symbols - // due to circular dependecy. + // due to circular dependency. nativeLibraries += $" {monoRuntimeLib}{Environment.NewLine}"; } diff --git a/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs b/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs index f035a5617bb..a36ef188ba7 100644 --- a/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs +++ b/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs @@ -398,7 +398,7 @@ namespace Microsoft.NET.Build.Tasks } else { - // If previously compiled as R2R, treat as reference if this would be compiled seperately + // If previously compiled as R2R, treat as reference if this would be compiled separately if (!compositeCompile || excludeFromComposite) { return Eligibility.CreateReferenceEligibility(excludeFromComposite); diff --git a/src/tests/Common/Platform/platformdefines.h b/src/tests/Common/Platform/platformdefines.h index c8dd750add3..043aedee30e 100644 --- a/src/tests/Common/Platform/platformdefines.h +++ b/src/tests/Common/Platform/platformdefines.h @@ -40,8 +40,6 @@ #include <windows.h> #include <combaseapi.h> -#define FS_SEPERATOR L"\\" -#define PATH_DELIMITER L";" #define L(t) L##t #define W(str) L##str @@ -134,8 +132,6 @@ typedef unsigned int ULONG, *PULONG; LPWSTR HackyConvertToWSTR(const char* pszInput); -#define FS_SEPERATOR L("/") -#define PATH_DELIMITER L(":") #define L(t) HackyConvertToWSTR(t) #define W(str) u##str #define MAX_PATH 260 diff --git a/src/tests/Common/scripts/exclusion.py b/src/tests/Common/scripts/exclusion.py index e73d21166cf..91bea5075b0 100644 --- a/src/tests/Common/scripts/exclusion.py +++ b/src/tests/Common/scripts/exclusion.py @@ -60,19 +60,18 @@ if __name__ == "__main__": currLine = oldTests[j] matchObj = re.search( r'[(.+)]', currLine) if matchObj: - nextLine = oldTests[j+1] + nextLine = oldTests[j+1] matchObj = re.search( r'(RelativePath=)(.+)(\\)(.+)(.exe)', nextLine) if matchObj: relPath = matchObj.group(2) if (relPath in exclusions): # Skip to the next item. Currently each test consists of 7 lines. removed += 1 - j += 7 + j += 7 continue newTestsHandle.write(currLine) j += 1 print "Removed Tests: ", removed - print newTestFile + " is successfuly built." - + print newTestFile + " is successfully built." diff --git a/src/tests/Common/scripts/lst_creator.py b/src/tests/Common/scripts/lst_creator.py index 211872df572..76139a4a352 100755 --- a/src/tests/Common/scripts/lst_creator.py +++ b/src/tests/Common/scripts/lst_creator.py @@ -70,7 +70,7 @@ def create_list_file(file_name, metadata): file_handle.write("## Commit: %s\n" % ARGS.commit_hash) file_handle.write("## \n") - order = ["RelativePath", "WorkingDir", "Expected", + order = ["RelativePath", "WorkingDir", "Expected", "MaxAllowedDurationSeconds", "Categories", "HostStyle"] def write_metadata(data, count=None): @@ -130,7 +130,7 @@ def create_metadata(tests): with open(failures_csv, "r") as file_handle: lines = file_handle.readlines() - + try: for line in lines: split = line.split(",") @@ -147,15 +147,15 @@ def create_metadata(tests): working_directory = os.path.dirname(test_name).replace("/", "\\") - # Make sure the tests use the windows \ seperator. + # Make sure the tests use the windows \ separator. relative_path = test_name.replace("/", "\\") max_duration = "600" - + if priority == 0: categories = "EXPECTED_PASS" else: categories = "EXPECTED_PASS;Pri%d" % priority - + expected = "0" host_style = "0" @@ -185,8 +185,8 @@ def get_all_tests(base_dir): : cmd file under the base_dir. Note: - To find the tests correctly you must build the tests correctly and - pass that directory. This method will NOT check to make sure that + To find the tests correctly you must build the tests correctly and + pass that directory. This method will NOT check to make sure that this has been done correctly. This is a recursive method. @@ -315,7 +315,7 @@ def main(args): print priority_marked_tests = defaultdict(lambda: None) - + for test in pri1_tests: priority_marked_tests[test] = 1 for test in pri0_tests: diff --git a/src/tests/CoreMangLib/system/environment/environment_version.cs b/src/tests/CoreMangLib/system/environment/environment_version.cs index b435e186ea9..56c9a593c22 100644 --- a/src/tests/CoreMangLib/system/environment/environment_version.cs +++ b/src/tests/CoreMangLib/system/environment/environment_version.cs @@ -3,7 +3,7 @@ using System; -class enviroment_version +class environment_version { static int Main() { diff --git a/src/tests/Interop/NativeLibrary/API/GetMainProgramHandleTests.cs b/src/tests/Interop/NativeLibrary/API/GetMainProgramHandleTests.cs index 694446fc8a9..58ec31f5d60 100644 --- a/src/tests/Interop/NativeLibrary/API/GetMainProgramHandleTests.cs +++ b/src/tests/Interop/NativeLibrary/API/GetMainProgramHandleTests.cs @@ -26,8 +26,8 @@ class GetMainProgramHandleTests IntPtr handle = NativeLibrary.Load(NativeLibraryToLoad.GetFullPath()); try { - // NativeLibrary does not load symbols globally, so we shouldn't be able to discover symbols from libaries loaded - // with NativeLibary.Load. + // NativeLibrary does not load symbols globally, so we shouldn't be able to discover symbols from libraries loaded + // with NativeLibrary.Load. EXPECT(GetSymbolFromMainProgramHandle("LocallyLoadedNativeLib", TestLibrary.Utilities.IsX86 ? "_NativeSum@8" : "NativeSum"), TestResult.ReturnFailure); EXPECT(GetSymbolFromMainProgramHandle("LocallyLoadedNativeLib", "NonNativeSum"), TestResult.ReturnFailure); diff --git a/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.cs b/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.cs index e46415992e4..03a21bdd7a0 100644 --- a/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.cs +++ b/src/tests/Interop/NativeLibrary/API/NativeLibraryTests.cs @@ -36,7 +36,7 @@ public class NativeLibraryTests : IDisposable EXPECT(LoadLibrary_NameOnly(libName), TestResult.DllNotFound); EXPECT(TryLoadLibrary_NameOnly(libName), TestResult.ReturnFailure); } - + [Fact] public void LoadLibraryOnInvalidFile_NameOnly() { @@ -109,7 +109,7 @@ public class NativeLibraryTests : IDisposable EXPECT(TryLoadLibrary_WithAssembly(libName, assembly, null), TestResult.ReturnFailure); } - public static bool HasKnownLibraryInSystemDirectory => + public static bool HasKnownLibraryInSystemDirectory => OperatingSystem.IsWindows() && File.Exists(Path.Combine(Environment.SystemDirectory, "url.dll")); @@ -142,7 +142,7 @@ public class NativeLibraryTests : IDisposable } [Fact] - public void LoadLibary_UsesFullPath_EvenWhen_AssemblyDirectory_Specified() + public void LoadLibrary_UsesFullPath_EvenWhen_AssemblyDirectory_Specified() { string libName = Path.Combine(testBinDir, Path.Combine("lib", NativeLibraryToLoad.Name)); EXPECT(LoadLibrary_WithAssembly(libName, assembly, DllImportSearchPath.AssemblyDirectory), TestResult.DllNotFound); diff --git a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/helper.cs b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/helper.cs index 696fb1413e5..bf691dd16dd 100644 --- a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/helper.cs +++ b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/helper.cs @@ -39,7 +39,7 @@ public class Helper } else if (!actualSize.Equals(expectedSize)) { - Console.WriteLine("\tTwo array are not equal.The sizes are not equal:Expected:{0},Actaul:{1}", expectedSize, actualSize); + Console.WriteLine("\tTwo array are not equal.The sizes are not equal. Expected: {0}, Actual: {1}", expectedSize, actualSize); return false; } for (int i = 0; i < expectedSize; ++i) diff --git a/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.cs b/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.cs index 553f8b99ccd..b4957dc12e9 100644 --- a/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.cs +++ b/src/tests/JIT/Performance/CodeQuality/Layout/SearchLoops.cs @@ -56,7 +56,7 @@ namespace Layout } } - // Variant with code written awkwardly but which acheives the desired + // Variant with code written awkwardly but which achieves the desired // performance if JIT simply lays out code in source order. public static bool LoopGoto(String strA, String strB) { diff --git a/src/tests/JIT/Performance/RunBenchmarks/RunBenchmarks.cs b/src/tests/JIT/Performance/RunBenchmarks/RunBenchmarks.cs index 3ba439d7a83..3d0e4dcd67e 100644 --- a/src/tests/JIT/Performance/RunBenchmarks/RunBenchmarks.cs +++ b/src/tests/JIT/Performance/RunBenchmarks/RunBenchmarks.cs @@ -4,13 +4,13 @@ // RunBenchmark - .NET Benchmark Performance Harness // // Note: This harness is currently built as a CoreCLR test case for ease of running -// against test CORE_ROOT assemblies. As such, when run with out any parameters, +// against test CORE_ROOT assemblies. As such, when run with out any parameters, // it will do nothing and simply return 100. Use "-run" to actually run tests cases. // // Usage: RunBenchmarks [options] -// +// // options: -// +// // -f <xmlFile> specify benchmark xml control file (default benchmarks.xml) // -n <number> specify number of runs for each benchmark (default is 1) // -w specify that warmup run should be done first @@ -30,7 +30,7 @@ // -norun prints what would be run, but don't run benchmarks // -tags <tags> specify benchmarks with tags to include // -notags <tags> specify benchmarks with tags to exclude -// -csvfile specify name of Comma Seperated Value output file (default console) +// -csvfile specify name of Comma Separated Value output file (default console) // // Benchmark .XML Control File format: // @@ -159,7 +159,7 @@ namespace BenchmarkConsoleApplication // Benchmark Results - includes benchmark, array of times for each iteration of the benchmark // minimum time, maximum time, average time, standard deviation and number // of failures. - + internal class Results { public Benchmark Benchmark; @@ -186,7 +186,7 @@ namespace BenchmarkConsoleApplication } } - // Controls - command line controls used to + // Controls - command line controls used to internal class Controls { @@ -448,7 +448,7 @@ namespace BenchmarkConsoleApplication Console.WriteLine(" -norun prints what would be run, but don't run benchmarks"); Console.WriteLine(" -tags <tags> specify benchmarks with tags to include"); Console.WriteLine(" -notags <tags> specify benchmarks with tags to exclude"); - Console.WriteLine(" -csvfile specify name of Comma Seperated Value output file (default coreclr_benchmarks.csv)"); + Console.WriteLine(" -csvfile specify name of Comma Separated Value output file (default coreclr_benchmarks.csv)"); Exit(-1); } @@ -514,7 +514,7 @@ namespace BenchmarkConsoleApplication // Constructed platform specific field name given either Unix style or Windows style // directory name. - + public string PlatformSpecificDirectoryName ( string directoryName @@ -610,7 +610,7 @@ namespace BenchmarkConsoleApplication // If we aren't being asked to run benchmarks or print results // then we must be being executed as a simple CoreCLR test case. // Don't bother reading XML file. - + if (doRunAsTestCase) { return; @@ -622,13 +622,13 @@ namespace BenchmarkConsoleApplication XElement benchmarkXml = XElement.Load(benchmarkXmlFullFileName); - // Get root directory for benchmark system. Command line argument overrides + // Get root directory for benchmark system. Command line argument overrides // specification in benchmark control file. benchmarkRootDirectoryName = Controls.BenchmarksRootDirectory; if (benchmarkRootDirectoryName == "") { - benchmarkRootDirectoryName = + benchmarkRootDirectoryName = Controls.BenchmarksRootDirectory = benchmarkRootDirectoryName; } benchmarkRootDirectoryName = PlatformSpecificDirectoryName(benchmarkRootDirectoryName); @@ -745,7 +745,7 @@ namespace BenchmarkConsoleApplication } } - // Select benchmarks to run based on controls for suite, tag, or specfic + // Select benchmarks to run based on controls for suite, tag, or specfic // benchmark inclusion/exclusion. public void SelectBenchmarks() @@ -1054,13 +1054,13 @@ namespace BenchmarkConsoleApplication { string name = results.Benchmark.Name; outputFile.Write("{0},", name); - + long minimum = results.Minimum; long maximum = results.Maximum; long average = results.Average; double standardDeviation = results.StandardDeviation; outputFile.Write("{0},{1},{2},{3}", minimum, maximum, average, standardDeviation); - + numberOfFailuresPerBenchmark = results.Failures; numberOfPasses = (numberOfPasses < 0) ? 0 : numberOfPasses; if (numberOfFailuresPerBenchmark > 0) @@ -1073,7 +1073,7 @@ namespace BenchmarkConsoleApplication } outputFile.WriteLine(""); } - + outputFile.WriteLine("TOTAL BENCHMARKS({0}), PASSED({1}), FAILED({2})", numberOfBenchmarksRun, numberOfPasses, numberOfFailures); } diff --git a/src/tests/baseservices/threading/commitstackonlyasneeded/StackCommitCommon.cs b/src/tests/baseservices/threading/commitstackonlyasneeded/StackCommitCommon.cs index 55c30ff97f5..995b78cc104 100644 --- a/src/tests/baseservices/threading/commitstackonlyasneeded/StackCommitCommon.cs +++ b/src/tests/baseservices/threading/commitstackonlyasneeded/StackCommitCommon.cs @@ -236,7 +236,7 @@ namespace StackCommitTest public static void Run(Action action) { - //We need to allocate the object inside of a seperate method to ensure that + //We need to allocate the object inside of a separate method to ensure that //the reference will be eliminated before GC.Collect is called. Technically //even across methods we probably don't make any formal guarantees but this //is sufficient for current runtime implementations. diff --git a/src/tests/nativeaot/SmokeTests/ComWrappers/ComWrappers.cs b/src/tests/nativeaot/SmokeTests/ComWrappers/ComWrappers.cs index df2c9942cef..b62eca4f86e 100644 --- a/src/tests/nativeaot/SmokeTests/ComWrappers/ComWrappers.cs +++ b/src/tests/nativeaot/SmokeTests/ComWrappers/ComWrappers.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. - using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; @@ -53,10 +52,10 @@ namespace ComWrappersTests static extern int CaptureComPointer(IComInterface foo); [DllImport("ComWrappersNative", CallingConvention = CallingConvention.StdCall)] - static extern int RetreiveCapturedComPointer(out IComInterface foo); + static extern int RetrieveCapturedComPointer(out IComInterface foo); - [DllImport("ComWrappersNative", EntryPoint="RetreiveCapturedComPointer", CallingConvention = CallingConvention.StdCall)] - static extern int RetreiveCapturedComPointerRaw(out IntPtr foo); + [DllImport("ComWrappersNative", EntryPoint="RetrieveCapturedComPointer", CallingConvention = CallingConvention.StdCall)] + static extern int RetrieveCapturedComPointerRaw(out IntPtr foo); [DllImport("ComWrappersNative", CallingConvention = CallingConvention.StdCall)] static extern void ReleaseComPointer(); @@ -109,7 +108,7 @@ namespace ComWrappersTests var target = new ComObject(); int result = CaptureComPointer(target); ThrowIfNotEquals(0, result, "Seems to be COM marshalling behave strange."); - result = RetreiveCapturedComPointerRaw(out var comPtr); + result = RetrieveCapturedComPointerRaw(out var comPtr); var roundTripObject = GlobalComWrappers.GetOrCreateObjectForComInstance(comPtr, CreateObjectFlags.Unwrap); ThrowIfNotEquals(0, result, "Seems to be COM marshalling behave strange."); if (roundTripObject != target) @@ -123,7 +122,7 @@ namespace ComWrappersTests var target = new ComObject(); int result = CaptureComPointer(target); ThrowIfNotEquals(0, result, "Seems to be COM marshalling behave strange."); - result = RetreiveCapturedComPointer(out var capturedObject); + result = RetrieveCapturedComPointer(out var capturedObject); ThrowIfNotEquals(0, result, "Seems to be COM marshalling behave strange."); if (capturedObject != target) { diff --git a/src/tests/nativeaot/SmokeTests/ComWrappers/ComWrappersNative.cpp b/src/tests/nativeaot/SmokeTests/ComWrappers/ComWrappersNative.cpp index db80f22418e..164d677fa94 100644 --- a/src/tests/nativeaot/SmokeTests/ComWrappers/ComWrappersNative.cpp +++ b/src/tests/nativeaot/SmokeTests/ComWrappers/ComWrappersNative.cpp @@ -78,7 +78,7 @@ DLL_EXPORT int __stdcall CaptureComPointer(IComInterface* pUnk) return capturedComObject->DoWork(11); } -DLL_EXPORT int __stdcall RetreiveCapturedComPointer(IComInterface** ppUnk) +DLL_EXPORT int __stdcall RetrieveCapturedComPointer(IComInterface** ppUnk) { *ppUnk = capturedComObject; return S_OK; diff --git a/src/tests/nativeaot/SmokeTests/DynamicGenerics/universal_generics.cs b/src/tests/nativeaot/SmokeTests/DynamicGenerics/universal_generics.cs index ce6aa64f799..12415d8ec58 100644 --- a/src/tests/nativeaot/SmokeTests/DynamicGenerics/universal_generics.cs +++ b/src/tests/nativeaot/SmokeTests/DynamicGenerics/universal_generics.cs @@ -503,9 +503,9 @@ namespace UniversalGen public class UCGSamples<T, U> : Base { public T[] _elements = new T[10]; - + public T member; - + public T getMember() { return this.member; } public override object GetElementAt(int index) @@ -524,18 +524,18 @@ namespace UniversalGen _elements[index] = (T)value; } } - + private void Empty(T t, T u) { } - + public override void nestedTest() { testMethodInner(); //testMethodInner2(); testMethodInner3(); } - + private MyGenStruct<UCGSamples<T,U>> testMethodInner() { return default(MyGenStruct<UCGSamples<T,U>>); @@ -544,14 +544,14 @@ namespace UniversalGen { return default(MyGenStruct<MyGenStruct<UCGSamples<T,U>>>); } - + public override bool EmptyMethodTest(object param) { T t = (T) param; Empty(t, t); return true; } - + private T dupTestInternal(T t1, T t2) { // IL for this method uses a 'dup' opcode @@ -560,46 +560,46 @@ namespace UniversalGen { local = t2; } - return local; + return local; } - + public override object dupTest(object o1, object o2) { return (object) dupTestInternal((T) o1, (T) o2); } - + private void set(T t) { member = t; } - + private void setEQ(T t1, T t2) { t2 = t1; } - + private void setByRefInner(T t, ref T tRef) { tRef = t; - } - + } + [MethodImpl(MethodImplOptions.NoInlining)] private void setInner(T t1, T t2) { t1 = t2; } - + [MethodImpl(MethodImplOptions.NoInlining)] private void setOuter(T t1, T t2) { setInner(t1, t2); } - + private void setByRef(T t, ref T tRef) { setByRefInner(t, ref tRef); } - + public override bool FunctionCallTestsSetMember(object o1) { // eventually calls this.set(T) which sets this.member @@ -607,7 +607,7 @@ namespace UniversalGen set(t); return this.member.Equals(t) && t.Equals(this.getMember()); } - + public override bool FunctionCallTestsSetMemberByRef(object o1) { // same as 'FunctionCallTestsSetMember', but sets this.member via passing it byref @@ -616,7 +616,7 @@ namespace UniversalGen setByRef(t, ref this.member); return this.member.Equals(t); } - + public override bool FunctionCallTestsSetByValue(object o1) { // Calls setEQ, which sets second arg equal to first @@ -625,7 +625,7 @@ namespace UniversalGen setEQ(t, this.member); return !this.member.Equals(t); } - + public override bool FunctionCallTestsSetLocalByRef(object o1) { // same as 'FunctionCallTests', but sets a local via passing it byref @@ -644,7 +644,7 @@ namespace UniversalGen return !this.member.Equals(t); } } - + public class InterlockedClass<T, U> : Base where T : class { T member= default(T); @@ -675,14 +675,14 @@ namespace UniversalGen this.setMember((T)o1); T ret = this.exchangeTest((T)o2); Assert.IsTrue(ret.Equals(o1)); - + this.setMember((T)o1); Assert.IsTrue(this.member.Equals((T) o1)); ret = this.compareExchangeTest((T)o2); - Assert.IsTrue(ret.Equals(o1)); + Assert.IsTrue(ret.Equals(o1)); } } - + public class Test { [TestMethod] @@ -692,7 +692,7 @@ namespace UniversalGen Base o = (Base)Activator.CreateInstance(t); o.InterlockedTests((object)"abc", (object)"def"); } - + [TestMethod] public static void TestArraysAndGC() { @@ -738,15 +738,15 @@ namespace UniversalGen Assert.IsTrue(o.EmptyMethodTest((short) 45)); Assert.AreEqual((short)o.dupTest((short)12, (short)-453), (short)12); - - o.nestedTest(); - + + o.nestedTest(); + Assert.IsTrue(o.FunctionCallTestsSetMember((short) 79)); Assert.IsTrue(o.FunctionCallTestsSetMemberByRef((short) 85)); Assert.IsTrue(o.FunctionCallTestsSetByValue((short) 138)); Assert.IsTrue(o.FunctionCallTestsSetLocalByRef((short) 19)); Assert.IsTrue(o.FunctionCallTestsSetByValue2((short) 99)); - + for (int i = 0; i < 10; i++) { // No explicit typecasts @@ -774,7 +774,7 @@ namespace UniversalGen Assert.AreEqual(((short)o.GetElementAt(i)).ToString(), val.ToString()); } } - + [TestMethod] public static void TestMakeGenericType() { @@ -919,7 +919,7 @@ namespace UniversalGen { // In this test, we set values using static code, and the universal shared generic is supposed to read from // the same static variables - + // Test with primitive types as field types TestFieldsBase o = new UCGStaticFieldsLayoutCompatStatic<int, int>(); o.SetVal1(10); @@ -1007,7 +1007,7 @@ namespace PartialUSC public virtual void TestVirtualCall3(object o, bool TAndUAreTheSame, string instTypeName) { } public virtual void TestVirtualCall4(object o, string instTypeName) { } } - + public class UCGTestVirtualCalls<T, U> : TestVirtualCallsBase { public override void TestVirtualCall0(object o) @@ -1169,7 +1169,7 @@ namespace PartialUSC Assert.IsTrue(result == (short)123); } - + [TestMethod] public static void TestVirtualCalls() { @@ -1605,7 +1605,7 @@ namespace CallingConvention public virtual object TestNonVirtualInstanceFunction(object o, object value) { return null; } } - public class UCGSeperateClass<T> + public class UCGSeparateClass<T> { [MethodImpl(MethodImplOptions.NoInlining)] public object BoxParam(T t) @@ -1618,7 +1618,7 @@ namespace CallingConvention { public override object TestNonVirtualInstanceFunction(object o, object value) { - return ((UCGSeperateClass<T>)o).BoxParam((T)value); + return ((UCGSeparateClass<T>)o).BoxParam((T)value); } } @@ -2084,17 +2084,17 @@ namespace CallingConvention } } - + [TestMethod] public static void TestCallInstanceFunction() { var t = TypeOf.CCT_UCGTestNonVirtualFunctionCallUse.MakeGenericType(TypeOf.Short); TestNonVirtualFunctionCallUseBase o = (TestNonVirtualFunctionCallUseBase)Activator.CreateInstance(t); - new UCGSeperateClass<short>().BoxParam(4); + new UCGSeparateClass<short>().BoxParam(4); short testValue = (short)3817; - object returnValue = o.TestNonVirtualInstanceFunction(new UCGSeperateClass<short>(), (object)testValue); + object returnValue = o.TestNonVirtualInstanceFunction(new UCGSeparateClass<short>(), (object)testValue); Assert.AreEqual(testValue, (short)returnValue); } @@ -2251,10 +2251,10 @@ namespace DynamicInvoke // SimpleMethod2 { MethodInfo simpleMethod2 = t.GetTypeInfo().GetDeclaredMethod("SimpleMethod2"); - object[] args = new object[] { - 123, - "456", - new Dictionary<object, string>(), + object[] args = new object[] { + 123, + "456", + new Dictionary<object, string>(), new List<float>(new float[]{1.2f, 3.4f, 5.6f}) }; @@ -2340,7 +2340,7 @@ namespace TypeLayout public X x; public Y y; public Z z; - + // This forces recursive type layout to ensure that we come up with a sensible result. public static GenStructDynamic<X, Y, Z> test; } @@ -2379,7 +2379,7 @@ namespace TypeLayout return t.GetType(); } } - + public class Test { @@ -2435,7 +2435,7 @@ namespace TypeLayout s_staticClass.x = s_dynamicClass.x; s_staticClass.y = s_dynamicClass.y; s_staticClass.z = s_dynamicClass.z; - + GenStructDynamic<sbyte, sbyte, sbyte>.test.x = 0; Type staticType = null; @@ -2535,7 +2535,7 @@ namespace TypeLayout s_dynamicStruct.x = s_staticStruct.x; s_dynamicStruct.y = s_staticStruct.y; s_dynamicStruct.z = s_staticStruct.z; - + Type staticType = null; Type dynamicType = null; @@ -2655,7 +2655,7 @@ namespace TypeLayout staticType = typeof(GenStructStatic<short, double, double>); dynamicType = typeof(GenStructDynamic<,,>).MakeGenericType(TypeOf.Int16, TypeOf.Double, TypeOf.Double); AssertTypesSimilar(staticType, dynamicType); - + // top level int // mid level bool staticType = typeof(GenStructStatic<int, bool, bool>); @@ -2712,7 +2712,7 @@ namespace TypeLayout staticType = typeof(GenStructStatic<int, double, double>); dynamicType = typeof(GenStructDynamic<,,>).MakeGenericType(TypeOf.Int32, TypeOf.Double, TypeOf.Double); AssertTypesSimilar(staticType, dynamicType); - + // top level double // mid level bool staticType = typeof(GenStructStatic<double, bool, bool>); @@ -2781,7 +2781,7 @@ namespace ActivatorCreateInstance public ReferenceType() { _field = "ReferenceType.ctor"; } public override string ToString() { return _field; } } - public class GenReferenceType<T> + public class GenReferenceType<T> { string _field; public GenReferenceType() { _field = "GenReferenceType<" + typeof(T) + ">.ctor"; } @@ -2816,8 +2816,8 @@ namespace ActivatorCreateInstance } - public class Base - { + public class Base + { public virtual string Func() { return null; } } public class ACI_Instantiator<T, U> : Base @@ -2861,7 +2861,7 @@ namespace ActivatorCreateInstance TestActivatorCreateInstance_Inner(TypeOf.ACI_GenReferenceTypeNoDefaultCtor.MakeGenericType(TypeOf.Double), null, true); TestActivatorCreateInstance_Inner(typeof(GenReferenceTypeNoDefaultCtor<CommonType1>), null, true); - TestActivatorCreateInstance_Inner(typeof(AValueType), "AValueType.ctor00"); + TestActivatorCreateInstance_Inner(typeof(AValueType), "AValueType.ctor00"); TestActivatorCreateInstance_Inner(TypeOf.ACI_AGenValueType.MakeGenericType(TypeOf.String), "AGenValueType<System.String>.ctor"); TestActivatorCreateInstance_Inner(TypeOf.ACI_AGenValueType.MakeGenericType(TypeOf.Double), "AGenValueType<System.Double>.ctor0"); #if USC @@ -2970,15 +2970,15 @@ namespace Heuristics return typeof(T).ToString(); } } - + // - // Test USG reflection heuristics by using an rd.xml entry to root the type. + // Test USG reflection heuristics by using an rd.xml entry to root the type. // Only look up the type with Type.GetType(string) so it is never statically referenced. // public struct OnlyUseViaReflection<T> { T _a; - + public OnlyUseViaReflection(int dummyToMakeCscPass) { _a = default(T); } public override string ToString() { return "OnlyUseViaReflection<" + typeof(T) + ">.ctor" + _a; } public string GenericMethodNotCalledStatically<U>(U u) @@ -2986,7 +2986,7 @@ namespace Heuristics return typeof(U).ToString(); } } - + public class OnlyUseViaReflectionGenMethod { public string GenericMethodNotCalledStatically<T>(T t) @@ -2994,7 +2994,7 @@ namespace Heuristics return typeof(T).ToString(); } } - + public class TestHeuristics { [TestMethod] @@ -3004,12 +3004,12 @@ namespace Heuristics t = TypeOf.OnlyUseViaReflection.MakeGenericType(TypeOf.Double); Object o = Activator.CreateInstance(t); Assert.IsTrue(o != null); - + t = TypeOf.OnlyUseViaReflectionGenMethod; Object obj = Activator.CreateInstance(t); Assert.IsTrue(obj != null); } - + // // Try instantiating all reflectable generics in this test app over a specific value type to ensure // everything marked reflectable works with USG @@ -3065,7 +3065,7 @@ namespace ArrayVarianceTest { public string RunTest(object input_obj, int testId) { - // These typecases will cause RhTypeCast_IsInstanceOfInterface to execute, + // These typecases will cause RhTypeCast_IsInstanceOfInterface to execute, // which will check for variance equalities between types. IEnumerable<T> source = input_obj as IEnumerable<T>; ICollection<T> collection = source as ICollection<T>; @@ -3317,7 +3317,7 @@ namespace FieldLayoutBugRepro } public interface IMyComparer<T> { } - public class MyComparer<T> : IMyComparer<T> + public class MyComparer<T> : IMyComparer<T> { public override string ToString() { return "MyComparer<" + typeof(T) + ">"; } } @@ -4180,7 +4180,7 @@ namespace ComparerOfTTests int actualResult = 0; bool actualThrow = false; - + try { actualResult = e.Compare(x,y); @@ -4293,7 +4293,7 @@ namespace DefaultValueDelegateParameterTests // Test not using default parameter result = del.DynamicInvoke(new object[]{ (object)(short)3, 5}); - Assert.AreEqual(result, 5); + Assert.AreEqual(result, 5); } } } diff --git a/src/tests/readytorun/crossboundarylayout/crossboundarytests.cmd b/src/tests/readytorun/crossboundarylayout/crossboundarytests.cmd index cbc8047593d..9346e7844f3 100644 --- a/src/tests/readytorun/crossboundarylayout/crossboundarytests.cmd +++ b/src/tests/readytorun/crossboundarylayout/crossboundarytests.cmd @@ -1,5 +1,5 @@ echo off -setlocal +setlocal set TESTDIR=%~dp0\..\..\..\..\..\..\artifacts\tests\coreclr\windows.x64.Debug\readytorun\crossboundarylayout\crossboundarytest\crossboundarytest set TESTBATCHROOT=%~dp0 @@ -175,10 +175,10 @@ call %TESTBATCHROOT%\runindividualtest.cmd %TESTBATCHROOT% %TESTDIR% cg2bubble_A goto done :testCG2SingleInputBubbleCompiledWithoutReferenceToBCE -echo TEST All combinations of the 5 dlls compiled with Crossgen2 with input bubble enabled and all assemblies passed as -echo reference inputs to crossgen2 when compiled b, crossboundarytest and e. a, and d are compiled with the reference +echo TEST All combinations of the 5 dlls compiled with Crossgen2 with input bubble enabled and all assemblies passed as +echo reference inputs to crossgen2 when compiled b, crossboundarytest and e. a, and d are compiled with the reference echo set limited to a and d. This simulates a the model of two different sets of input bubble matched assemblies where there is a -echo root set such as the runtime repo worth of libraries, and a seperately compiled application set. +echo root set such as the runtime repo worth of libraries, and a separately compiled application set. call %TESTBATCHROOT%\runindividualtest.cmd %TESTBATCHROOT% %TESTDIR% cg2bubble2_A____ a CG2SingleBubbleADOnly d CG2NoMethods call %TESTBATCHROOT%\runindividualtest.cmd %TESTBATCHROOT% %TESTDIR% cg2bubble2__B___ b CG2SingleInputBubble a CG2NoMethods d CG2NoMethods e CG2NoMethods @@ -216,7 +216,7 @@ goto done :testCG2SingleMixedInputBubble echo TEST All combinations of the 5 dlls compiled with Crossgen2 with input bubble enabled for the root set and not -echo for the more derived set of assemblies. b, crossboundarytest, and e are compiled as standard R2R and +echo for the more derived set of assemblies. b, crossboundarytest, and e are compiled as standard R2R and echo a, and d are compiled with the reference echo set limited to a and d with input bubble enabled. This simulates a the model echo of a framework that ships with input bubble enabled, and the application with standard R2R rules. diff --git a/src/tests/run.cmd b/src/tests/run.cmd index 05af04071ea..496da7af7c3 100644 --- a/src/tests/run.cmd +++ b/src/tests/run.cmd @@ -177,7 +177,7 @@ exit /b %ERRORLEVEL% :: Note: We've disabled node reuse because it causes file locking issues. :: The issue is that we extend the build with our own targets which -:: means that that rebuilding cannot successfully delete the task +:: means that rebuilding cannot successfully delete the task :: assembly. set __msbuildCommonArgs=/nologo /nodeReuse:false %__msbuildExtraArgs% /p:Platform=%__MSBuildBuildArch% diff --git a/src/tests/sizeondisk/sodbench/SoDBench.cs b/src/tests/sizeondisk/sodbench/SoDBench.cs index 60361f16daf..47e40b938fd 100644 --- a/src/tests/sizeondisk/sodbench/SoDBench.cs +++ b/src/tests/sizeondisk/sodbench/SoDBench.cs @@ -216,10 +216,10 @@ namespace SoDBench if (s_dotnetExe == null) { - if(!String.IsNullOrEmpty(options.CoreLibariesDirectory)) + if(!String.IsNullOrEmpty(options.CoreLibrariesDirectory)) { - Console.WriteLine($"** Using core libraries found at {options.CoreLibariesDirectory}"); - s_corelibsDir = new DirectoryInfo(options.CoreLibariesDirectory); + Console.WriteLine($"** Using core libraries found at {options.CoreLibrariesDirectory}"); + s_corelibsDir = new DirectoryInfo(options.CoreLibrariesDirectory); } else { @@ -578,8 +578,8 @@ namespace SoDBench } } - [Option("corelibs", Required = false, HelpText = "Specifies the location of .NET Core libaries to patch into dotnet. Cannot be used with --dotnet")] - public string CoreLibariesDirectory + [Option("corelibs", Required = false, HelpText = "Specifies the location of .NET Core libraries to patch into dotnet. Cannot be used with --dotnet")] + public string CoreLibrariesDirectory { get { return _corelibsDir; } @@ -644,7 +644,7 @@ namespace SoDBench } }); - if (options != null && !String.IsNullOrEmpty(options.DotnetExecutable) && !String.IsNullOrEmpty(options.CoreLibariesDirectory)) + if (options != null && !String.IsNullOrEmpty(options.DotnetExecutable) && !String.IsNullOrEmpty(options.CoreLibrariesDirectory)) { throw new ArgumentException("--dotnet and --corlibs cannot be used together"); } |