Prep CompareInfo for spanification#32385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GrabYourPitchforks merged 6 commits into from
Mar 14, 2020
Merged

Prep CompareInfo for spanification #32385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fb2514
Update SortKey.GetHashCode not to call directly into Marvin
GrabYourPitchforks Feb 13, 2020
f23d3c5
Spanify CompareInfo p/invoke APIs
GrabYourPitchforks Feb 13, 2020
82f98ea
Only call GetLastError under debug mode
GrabYourPitchforks Mar 13, 2020
b3e0855
PR feedback - cleanup signature of FindStringOrdinal
GrabYourPitchforks Mar 13, 2020
8dda77a
PR feedback - use BOOL over bool
GrabYourPitchforks Mar 13, 2020
d76a5ed
Fix missing edge case checks in IndexOfOrdinal
GrabYourPitchforks Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Globalization.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,15 @@ internal static partial class Interop
{
internal static unsafe partial class Kernel32
{
// Under debug mode only, we'll want to check the error codes
// of some of the p/invokes we make.

#if DEBUG
private const bool SetLastErrorForDebug = true;
#else
private const bool SetLastErrorForDebug = false;
#endif

internal const uint LOCALE_ALLOW_NEUTRAL_NAMES = 0x08000000; // Flag to allow returning neutral names/lcids for name conversion
internal const uint LOCALE_ILANGUAGE = 0x00000001;
internal const uint LOCALE_SUPPLEMENTAL = 0x00000002;
Expand DownExpand Up@@ -52,7 +61,7 @@ internal static extern int LCMapStringEx(
void* lpReserved,
IntPtr sortHandle);

[DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx")]
[DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx", SetLastError = SetLastErrorForDebug)]
internal static extern int FindNLSStringEx(
char* lpLocaleName,
uint dwFindNLSStringFlags,
Expand DownExpand Up@@ -85,14 +94,14 @@ internal static extern int CompareStringOrdinal(
int cchCount2,
bool bIgnoreCase);

[DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal")]
[DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal", SetLastError = SetLastErrorForDebug)]
internal static extern int FindStringOrdinal(
Comment thread
GrabYourPitchforks marked this conversation as resolved.
uint dwFindStringOrdinalFlags,
char* lpStringSource,
int cchSource,
char* lpStringValue,
int cchValue,
int bIgnoreCase);
BOOL bIgnoreCase);

[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
internal static extern bool IsNLSDefinedString(
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ private SortKey InvariantCreateSortKey(string source, CompareOptions options)
}
}

return new SortKey(Name, source, options, keyData);
return new SortKey(this, source, options, keyData);
}

private static void InvariantCreateSortKeyOrdinal(ReadOnlySpan<char> source, Span<byte> sortKey)
Expand Down
85 changes: 24 additions & 61 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,64 +43,22 @@ private void InitSort(CultureInfo culture)
}
}

internal static unsafe int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase)
{
Debug.Assert(!GlobalizationMode.Invariant);

Debug.Assert(source != null);
Debug.Assert(value != null);

if (value.Length == 0)
{
return startIndex;
}

if (count < value.Length)
{
return -1;
}

if (ignoreCase)
{
fixed (char* pSource = source)
{
int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + startIndex, count, findLast: false);
return index != -1 ?
startIndex + index :
-1;
}
}

int endIndex = startIndex + (count - value.Length);
for (int i = startIndex; i <= endIndex; i++)
{
int valueIndex, sourceIndex;

for (valueIndex = 0, sourceIndex = i;
valueIndex < value.Length && source[sourceIndex] == value[valueIndex];
valueIndex++, sourceIndex++) ;

if (valueIndex == value.Length)
{
return i;
}
}

return -1;
}

internal static unsafe int IndexOfOrdinalCore(ReadOnlySpan<char> source, ReadOnlySpan<char> value, bool ignoreCase, bool fromBeginning)
{
Debug.Assert(!GlobalizationMode.Invariant);
Debug.Assert(!value.IsEmpty);

Debug.Assert(source.Length != 0);
Debug.Assert(value.Length != 0);
// Ordinal (non-linguistic) comparisons require the length of the target string to be no greater
// than the length of the search space. Since our caller already checked for empty target strings,
// the below check also handles the case of empty search space strings.

if (source.Length < value.Length)
{
return -1;
}

Debug.Assert(!source.IsEmpty);

if (ignoreCase)
{
fixed (char* pSource = &MemoryMarshal.GetReference(source))
Expand DownExpand Up@@ -199,9 +157,14 @@ private static unsafe int CompareStringOrdinalIgnoreCase(ref char string1, int c
{
Debug.Assert(!GlobalizationMode.Invariant);

Debug.Assert(count1 > 0);
Debug.Assert(count2 > 0);

fixed (char* char1 = &string1)
fixed (char* char2 = &string2)
{
Debug.Assert(char1 != null);
Debug.Assert(char2 != null);
return Interop.Globalization.CompareStringOrdinalIgnoreCase(char1, count1, char2, count2);
}
}
Expand All@@ -215,6 +178,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, string string2, Com
Debug.Assert(string2 != null);
Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

// Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
// as long as the corresponding length parameter is 0.

fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
fixed (char* pString2 = &string2.GetRawStringData())
{
Expand All@@ -227,6 +193,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, ReadOnlySpan<char>
Debug.Assert(!GlobalizationMode.Invariant);
Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

// Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
// as long as the corresponding length parameter is 0.

fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
fixed (char* pString2 = &MemoryMarshal.GetReference(string2))
{
Expand DownExpand Up@@ -540,7 +509,6 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
{
Debug.Assert(!GlobalizationMode.Invariant);

Debug.Assert(!source.IsEmpty);
Debug.Assert(!prefix.IsEmpty);
Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -553,7 +521,7 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
}
else
{
fixed (char* pSource = &MemoryMarshal.GetReference(source))
fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
{
return Interop.Globalization.StartsWith(_sortHandle, pPrefix, prefix.Length, pSource, source.Length, options);
Expand All@@ -565,13 +533,12 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
{
Debug.Assert(!GlobalizationMode.Invariant);

Debug.Assert(!source.IsEmpty);
Debug.Assert(!prefix.IsEmpty);
Debug.Assert(_isAsciiEqualityOrdinal);

int length = Math.Min(source.Length, prefix.Length);

fixed (char* ap = &MemoryMarshal.GetReference(source))
fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
fixed (char* bp = &MemoryMarshal.GetReference(prefix))
{
char* a = ap;
Expand DownExpand Up@@ -636,13 +603,12 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
{
Debug.Assert(!GlobalizationMode.Invariant);

Debug.Assert(!source.IsEmpty);
Debug.Assert(!prefix.IsEmpty);
Debug.Assert(_isAsciiEqualityOrdinal);

int length = Math.Min(source.Length, prefix.Length);

fixed (char* ap = &MemoryMarshal.GetReference(source))
fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
fixed (char* bp = &MemoryMarshal.GetReference(prefix))
{
char* a = ap;
Expand DownExpand Up@@ -696,7 +662,6 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
{
Debug.Assert(!GlobalizationMode.Invariant);

Debug.Assert(!source.IsEmpty);
Debug.Assert(!suffix.IsEmpty);
Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -709,7 +674,7 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
}
else
{
fixed (char* pSource = &MemoryMarshal.GetReference(source))
fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
{
return Interop.Globalization.EndsWith(_sortHandle, pSuffix, suffix.Length, pSource, source.Length, options);
Expand All@@ -721,13 +686,12 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
{
Debug.Assert(!GlobalizationMode.Invariant);

Debug.Assert(!source.IsEmpty);
Debug.Assert(!suffix.IsEmpty);
Debug.Assert(_isAsciiEqualityOrdinal);

int length = Math.Min(source.Length, suffix.Length);

fixed (char* ap = &MemoryMarshal.GetReference(source))
fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
fixed (char* bp = &MemoryMarshal.GetReference(suffix))
{
char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -773,13 +737,12 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
{
Debug.Assert(!GlobalizationMode.Invariant);

Debug.Assert(!source.IsEmpty);
Debug.Assert(!suffix.IsEmpty);
Debug.Assert(_isAsciiEqualityOrdinal);

int length = Math.Min(source.Length, suffix.Length);

fixed (char* ap = &MemoryMarshal.GetReference(source))
fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
fixed (char* bp = &MemoryMarshal.GetReference(suffix))
{
char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -836,7 +799,7 @@ private unsafe SortKey CreateSortKey(string source, CompareOptions options)
}
}

return new SortKey(Name, source, options, keyData);
return new SortKey(this, source, options, keyData);
}

private static unsafe bool IsSortable(char *text, int length)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Prep CompareInfo for spanification#32385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

GrabYourPitchforks
merged 6 commits into

from

Mar 14, 2020
 Merged


Prep CompareInfo for spanification
#32385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1fb2514

Update SortKey.GetHashCode not to call directly into Marvin


GrabYourPitchforks Feb 13, 2020
f23d3c5

Spanify CompareInfo p/invoke APIs


GrabYourPitchforks Feb 13, 2020
82f98ea

Only call GetLastError under debug mode


GrabYourPitchforks Mar 13, 2020
b3e0855

PR feedback - cleanup signature of FindStringOrdinal


GrabYourPitchforks Mar 13, 2020
8dda77a

PR feedback - use BOOL over bool


GrabYourPitchforks Mar 13, 2020
d76a5ed

Fix missing edge case checks in IndexOfOrdinal


GrabYourPitchforks Mar 14, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 12 additions & 3 deletions
src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Globalization.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,15 @@ internal static partial class Interop
{
 internal static unsafe partial class Kernel32
 {
 // Under debug mode only, we'll want to check the error codes
 // of some of the p/invokes we make.

#if DEBUG
 private const bool SetLastErrorForDebug = true;
#else
 private const bool SetLastErrorForDebug = false;
#endif

 internal const uint LOCALE_ALLOW_NEUTRAL_NAMES = 0x08000000; // Flag to allow returning neutral names/lcids for name conversion
 internal const uint LOCALE_ILANGUAGE = 0x00000001;
 internal const uint LOCALE_SUPPLEMENTAL = 0x00000002;
Expand DownExpand Up@@ -52,7 +61,7 @@ internal static extern int LCMapStringEx(
 void* lpReserved,
 IntPtr sortHandle);

 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx")]
 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindNLSStringEx(
 char* lpLocaleName,
 uint dwFindNLSStringFlags,
Expand DownExpand Up@@ -85,14 +94,14 @@ internal static extern int CompareStringOrdinal(
 int cchCount2,
 bool bIgnoreCase);

 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal")]
 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindStringOrdinal(
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 uint dwFindStringOrdinalFlags,
 char* lpStringSource,
 int cchSource,
 char* lpStringValue,
 int cchValue,
int bIgnoreCase);
BOOL bIgnoreCase);

 [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 internal static extern bool IsNLSDefinedString(
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ private SortKey InvariantCreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static void InvariantCreateSortKeyOrdinal(ReadOnlySpan<char> source, Span<byte> sortKey)
Expand Down

85 changes: 24 additions & 61 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,64 +43,22 @@ private void InitSort(CultureInfo culture)
 }
 }

 internal static unsafe int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase)
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(source != null);
 Debug.Assert(value != null);

 if (value.Length == 0)
 {
 return startIndex;
 }

 if (count < value.Length)
 {
 return -1;
 }

 if (ignoreCase)
 {
 fixed (char* pSource = source)
 {
 int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + startIndex, count, findLast: false);
 return index != -1 ?
 startIndex + index :
 -1;
 }
 }

 int endIndex = startIndex + (count - value.Length);
 for (int i = startIndex; i <= endIndex; i++)
 {
 int valueIndex, sourceIndex;

 for (valueIndex = 0, sourceIndex = i;
 valueIndex < value.Length && source[sourceIndex] == value[valueIndex];
 valueIndex++, sourceIndex++) ;

 if (valueIndex == value.Length)
 {
 return i;
 }
 }

 return -1;
 }

 internal static unsafe int IndexOfOrdinalCore(ReadOnlySpan<char> source, ReadOnlySpan<char> value, bool ignoreCase, bool fromBeginning)
 {
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert(!value.IsEmpty);

 Debug.Assert(source.Length != 0);
 Debug.Assert(value.Length != 0);
 // Ordinal (non-linguistic) comparisons require the length of the target string to be no greater
 // than the length of the search space. Since our caller already checked for empty target strings,
 // the below check also handles the case of empty search space strings.

 if (source.Length < value.Length)
 {
 return -1;
 }

 Debug.Assert(!source.IsEmpty);

 if (ignoreCase)
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
Expand DownExpand Up@@ -199,9 +157,14 @@ private static unsafe int CompareStringOrdinalIgnoreCase(ref char string1, int c
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(count1 > 0);
 Debug.Assert(count2 > 0);

 fixed (char* char1 = &string1)
 fixed (char* char2 = &string2)
 {
 Debug.Assert(char1 != null);
 Debug.Assert(char2 != null);
 return Interop.Globalization.CompareStringOrdinalIgnoreCase(char1, count1, char2, count2);
 }
 }
Expand All@@ -215,6 +178,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, string string2, Com
 Debug.Assert(string2 != null);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &string2.GetRawStringData())
 {
Expand All@@ -227,6 +193,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, ReadOnlySpan<char>
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &MemoryMarshal.GetReference(string2))
 {
Expand DownExpand Up@@ -540,7 +509,6 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -553,7 +521,7 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
 return Interop.Globalization.StartsWith(_sortHandle, pPrefix, prefix.Length, pSource, source.Length, options);
Expand All@@ -565,13 +533,12 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -636,13 +603,12 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -696,7 +662,6 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -709,7 +674,7 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
 return Interop.Globalization.EndsWith(_sortHandle, pSuffix, suffix.Length, pSource, source.Length, options);
Expand All@@ -721,13 +686,12 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -773,13 +737,12 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -836,7 +799,7 @@ private unsafe SortKey CreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static unsafe bool IsSortable(char *text, int length)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Prep CompareInfo for spanification#32385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

GrabYourPitchforks
merged 6 commits into

from

Mar 14, 2020
 Merged


Prep CompareInfo for spanification
#32385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1fb2514

Update SortKey.GetHashCode not to call directly into Marvin


GrabYourPitchforks Feb 13, 2020
f23d3c5

Spanify CompareInfo p/invoke APIs


GrabYourPitchforks Feb 13, 2020
82f98ea

Only call GetLastError under debug mode


GrabYourPitchforks Mar 13, 2020
b3e0855

PR feedback - cleanup signature of FindStringOrdinal


GrabYourPitchforks Mar 13, 2020
8dda77a

PR feedback - use BOOL over bool


GrabYourPitchforks Mar 13, 2020
d76a5ed

Fix missing edge case checks in IndexOfOrdinal


GrabYourPitchforks Mar 14, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 12 additions & 3 deletions
src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Globalization.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,15 @@ internal static partial class Interop
{
 internal static unsafe partial class Kernel32
 {
 // Under debug mode only, we'll want to check the error codes
 // of some of the p/invokes we make.

#if DEBUG
 private const bool SetLastErrorForDebug = true;
#else
 private const bool SetLastErrorForDebug = false;
#endif

 internal const uint LOCALE_ALLOW_NEUTRAL_NAMES = 0x08000000; // Flag to allow returning neutral names/lcids for name conversion
 internal const uint LOCALE_ILANGUAGE = 0x00000001;
 internal const uint LOCALE_SUPPLEMENTAL = 0x00000002;
Expand DownExpand Up@@ -52,7 +61,7 @@ internal static extern int LCMapStringEx(
 void* lpReserved,
 IntPtr sortHandle);

 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx")]
 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindNLSStringEx(
 char* lpLocaleName,
 uint dwFindNLSStringFlags,
Expand DownExpand Up@@ -85,14 +94,14 @@ internal static extern int CompareStringOrdinal(
 int cchCount2,
 bool bIgnoreCase);

 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal")]
 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindStringOrdinal(
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 uint dwFindStringOrdinalFlags,
 char* lpStringSource,
 int cchSource,
 char* lpStringValue,
 int cchValue,
int bIgnoreCase);
BOOL bIgnoreCase);

 [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 internal static extern bool IsNLSDefinedString(
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ private SortKey InvariantCreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static void InvariantCreateSortKeyOrdinal(ReadOnlySpan<char> source, Span<byte> sortKey)
Expand Down

85 changes: 24 additions & 61 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,64 +43,22 @@ private void InitSort(CultureInfo culture)
 }
 }

 internal static unsafe int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase)
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(source != null);
 Debug.Assert(value != null);

 if (value.Length == 0)
 {
 return startIndex;
 }

 if (count < value.Length)
 {
 return -1;
 }

 if (ignoreCase)
 {
 fixed (char* pSource = source)
 {
 int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + startIndex, count, findLast: false);
 return index != -1 ?
 startIndex + index :
 -1;
 }
 }

 int endIndex = startIndex + (count - value.Length);
 for (int i = startIndex; i <= endIndex; i++)
 {
 int valueIndex, sourceIndex;

 for (valueIndex = 0, sourceIndex = i;
 valueIndex < value.Length && source[sourceIndex] == value[valueIndex];
 valueIndex++, sourceIndex++) ;

 if (valueIndex == value.Length)
 {
 return i;
 }
 }

 return -1;
 }

 internal static unsafe int IndexOfOrdinalCore(ReadOnlySpan<char> source, ReadOnlySpan<char> value, bool ignoreCase, bool fromBeginning)
 {
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert(!value.IsEmpty);

 Debug.Assert(source.Length != 0);
 Debug.Assert(value.Length != 0);
 // Ordinal (non-linguistic) comparisons require the length of the target string to be no greater
 // than the length of the search space. Since our caller already checked for empty target strings,
 // the below check also handles the case of empty search space strings.

 if (source.Length < value.Length)
 {
 return -1;
 }

 Debug.Assert(!source.IsEmpty);

 if (ignoreCase)
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
Expand DownExpand Up@@ -199,9 +157,14 @@ private static unsafe int CompareStringOrdinalIgnoreCase(ref char string1, int c
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(count1 > 0);
 Debug.Assert(count2 > 0);

 fixed (char* char1 = &string1)
 fixed (char* char2 = &string2)
 {
 Debug.Assert(char1 != null);
 Debug.Assert(char2 != null);
 return Interop.Globalization.CompareStringOrdinalIgnoreCase(char1, count1, char2, count2);
 }
 }
Expand All@@ -215,6 +178,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, string string2, Com
 Debug.Assert(string2 != null);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &string2.GetRawStringData())
 {
Expand All@@ -227,6 +193,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, ReadOnlySpan<char>
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &MemoryMarshal.GetReference(string2))
 {
Expand DownExpand Up@@ -540,7 +509,6 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -553,7 +521,7 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
 return Interop.Globalization.StartsWith(_sortHandle, pPrefix, prefix.Length, pSource, source.Length, options);
Expand All@@ -565,13 +533,12 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -636,13 +603,12 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -696,7 +662,6 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -709,7 +674,7 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
 return Interop.Globalization.EndsWith(_sortHandle, pSuffix, suffix.Length, pSource, source.Length, options);
Expand All@@ -721,13 +686,12 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -773,13 +737,12 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -836,7 +799,7 @@ private unsafe SortKey CreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static unsafe bool IsSortable(char *text, int length)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Prep CompareInfo for spanification#32385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

GrabYourPitchforks
merged 6 commits into

from

Mar 14, 2020
 Merged


Prep CompareInfo for spanification
#32385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1fb2514

Update SortKey.GetHashCode not to call directly into Marvin


GrabYourPitchforks Feb 13, 2020
f23d3c5

Spanify CompareInfo p/invoke APIs


GrabYourPitchforks Feb 13, 2020
82f98ea

Only call GetLastError under debug mode


GrabYourPitchforks Mar 13, 2020
b3e0855

PR feedback - cleanup signature of FindStringOrdinal


GrabYourPitchforks Mar 13, 2020
8dda77a

PR feedback - use BOOL over bool


GrabYourPitchforks Mar 13, 2020
d76a5ed

Fix missing edge case checks in IndexOfOrdinal


GrabYourPitchforks Mar 14, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 12 additions & 3 deletions
src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Globalization.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,15 @@ internal static partial class Interop
{
 internal static unsafe partial class Kernel32
 {
 // Under debug mode only, we'll want to check the error codes
 // of some of the p/invokes we make.

#if DEBUG
 private const bool SetLastErrorForDebug = true;
#else
 private const bool SetLastErrorForDebug = false;
#endif

 internal const uint LOCALE_ALLOW_NEUTRAL_NAMES = 0x08000000; // Flag to allow returning neutral names/lcids for name conversion
 internal const uint LOCALE_ILANGUAGE = 0x00000001;
 internal const uint LOCALE_SUPPLEMENTAL = 0x00000002;
Expand DownExpand Up@@ -52,7 +61,7 @@ internal static extern int LCMapStringEx(
 void* lpReserved,
 IntPtr sortHandle);

 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx")]
 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindNLSStringEx(
 char* lpLocaleName,
 uint dwFindNLSStringFlags,
Expand DownExpand Up@@ -85,14 +94,14 @@ internal static extern int CompareStringOrdinal(
 int cchCount2,
 bool bIgnoreCase);

 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal")]
 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindStringOrdinal(
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 uint dwFindStringOrdinalFlags,
 char* lpStringSource,
 int cchSource,
 char* lpStringValue,
 int cchValue,
int bIgnoreCase);
BOOL bIgnoreCase);

 [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 internal static extern bool IsNLSDefinedString(
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ private SortKey InvariantCreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static void InvariantCreateSortKeyOrdinal(ReadOnlySpan<char> source, Span<byte> sortKey)
Expand Down

85 changes: 24 additions & 61 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,64 +43,22 @@ private void InitSort(CultureInfo culture)
 }
 }

 internal static unsafe int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase)
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(source != null);
 Debug.Assert(value != null);

 if (value.Length == 0)
 {
 return startIndex;
 }

 if (count < value.Length)
 {
 return -1;
 }

 if (ignoreCase)
 {
 fixed (char* pSource = source)
 {
 int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + startIndex, count, findLast: false);
 return index != -1 ?
 startIndex + index :
 -1;
 }
 }

 int endIndex = startIndex + (count - value.Length);
 for (int i = startIndex; i <= endIndex; i++)
 {
 int valueIndex, sourceIndex;

 for (valueIndex = 0, sourceIndex = i;
 valueIndex < value.Length && source[sourceIndex] == value[valueIndex];
 valueIndex++, sourceIndex++) ;

 if (valueIndex == value.Length)
 {
 return i;
 }
 }

 return -1;
 }

 internal static unsafe int IndexOfOrdinalCore(ReadOnlySpan<char> source, ReadOnlySpan<char> value, bool ignoreCase, bool fromBeginning)
 {
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert(!value.IsEmpty);

 Debug.Assert(source.Length != 0);
 Debug.Assert(value.Length != 0);
 // Ordinal (non-linguistic) comparisons require the length of the target string to be no greater
 // than the length of the search space. Since our caller already checked for empty target strings,
 // the below check also handles the case of empty search space strings.

 if (source.Length < value.Length)
 {
 return -1;
 }

 Debug.Assert(!source.IsEmpty);

 if (ignoreCase)
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
Expand DownExpand Up@@ -199,9 +157,14 @@ private static unsafe int CompareStringOrdinalIgnoreCase(ref char string1, int c
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(count1 > 0);
 Debug.Assert(count2 > 0);

 fixed (char* char1 = &string1)
 fixed (char* char2 = &string2)
 {
 Debug.Assert(char1 != null);
 Debug.Assert(char2 != null);
 return Interop.Globalization.CompareStringOrdinalIgnoreCase(char1, count1, char2, count2);
 }
 }
Expand All@@ -215,6 +178,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, string string2, Com
 Debug.Assert(string2 != null);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &string2.GetRawStringData())
 {
Expand All@@ -227,6 +193,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, ReadOnlySpan<char>
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &MemoryMarshal.GetReference(string2))
 {
Expand DownExpand Up@@ -540,7 +509,6 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -553,7 +521,7 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
 return Interop.Globalization.StartsWith(_sortHandle, pPrefix, prefix.Length, pSource, source.Length, options);
Expand All@@ -565,13 +533,12 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -636,13 +603,12 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -696,7 +662,6 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -709,7 +674,7 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
 return Interop.Globalization.EndsWith(_sortHandle, pSuffix, suffix.Length, pSource, source.Length, options);
Expand All@@ -721,13 +686,12 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -773,13 +737,12 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -836,7 +799,7 @@ private unsafe SortKey CreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static unsafe bool IsSortable(char *text, int length)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Prep CompareInfo for spanification#32385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

GrabYourPitchforks
merged 6 commits into

from

Mar 14, 2020
 Merged


Prep CompareInfo for spanification
#32385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1fb2514

Update SortKey.GetHashCode not to call directly into Marvin


GrabYourPitchforks Feb 13, 2020
f23d3c5

Spanify CompareInfo p/invoke APIs


GrabYourPitchforks Feb 13, 2020
82f98ea

Only call GetLastError under debug mode


GrabYourPitchforks Mar 13, 2020
b3e0855

PR feedback - cleanup signature of FindStringOrdinal


GrabYourPitchforks Mar 13, 2020
8dda77a

PR feedback - use BOOL over bool


GrabYourPitchforks Mar 13, 2020
d76a5ed

Fix missing edge case checks in IndexOfOrdinal


GrabYourPitchforks Mar 14, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 12 additions & 3 deletions
src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Globalization.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,15 @@ internal static partial class Interop
{
 internal static unsafe partial class Kernel32
 {
 // Under debug mode only, we'll want to check the error codes
 // of some of the p/invokes we make.

#if DEBUG
 private const bool SetLastErrorForDebug = true;
#else
 private const bool SetLastErrorForDebug = false;
#endif

 internal const uint LOCALE_ALLOW_NEUTRAL_NAMES = 0x08000000; // Flag to allow returning neutral names/lcids for name conversion
 internal const uint LOCALE_ILANGUAGE = 0x00000001;
 internal const uint LOCALE_SUPPLEMENTAL = 0x00000002;
Expand DownExpand Up@@ -52,7 +61,7 @@ internal static extern int LCMapStringEx(
 void* lpReserved,
 IntPtr sortHandle);

 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx")]
 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindNLSStringEx(
 char* lpLocaleName,
 uint dwFindNLSStringFlags,
Expand DownExpand Up@@ -85,14 +94,14 @@ internal static extern int CompareStringOrdinal(
 int cchCount2,
 bool bIgnoreCase);

 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal")]
 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindStringOrdinal(
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 uint dwFindStringOrdinalFlags,
 char* lpStringSource,
 int cchSource,
 char* lpStringValue,
 int cchValue,
int bIgnoreCase);
BOOL bIgnoreCase);

 [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 internal static extern bool IsNLSDefinedString(
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ private SortKey InvariantCreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static void InvariantCreateSortKeyOrdinal(ReadOnlySpan<char> source, Span<byte> sortKey)
Expand Down

85 changes: 24 additions & 61 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,64 +43,22 @@ private void InitSort(CultureInfo culture)
 }
 }

 internal static unsafe int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase)
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(source != null);
 Debug.Assert(value != null);

 if (value.Length == 0)
 {
 return startIndex;
 }

 if (count < value.Length)
 {
 return -1;
 }

 if (ignoreCase)
 {
 fixed (char* pSource = source)
 {
 int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + startIndex, count, findLast: false);
 return index != -1 ?
 startIndex + index :
 -1;
 }
 }

 int endIndex = startIndex + (count - value.Length);
 for (int i = startIndex; i <= endIndex; i++)
 {
 int valueIndex, sourceIndex;

 for (valueIndex = 0, sourceIndex = i;
 valueIndex < value.Length && source[sourceIndex] == value[valueIndex];
 valueIndex++, sourceIndex++) ;

 if (valueIndex == value.Length)
 {
 return i;
 }
 }

 return -1;
 }

 internal static unsafe int IndexOfOrdinalCore(ReadOnlySpan<char> source, ReadOnlySpan<char> value, bool ignoreCase, bool fromBeginning)
 {
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert(!value.IsEmpty);

 Debug.Assert(source.Length != 0);
 Debug.Assert(value.Length != 0);
 // Ordinal (non-linguistic) comparisons require the length of the target string to be no greater
 // than the length of the search space. Since our caller already checked for empty target strings,
 // the below check also handles the case of empty search space strings.

 if (source.Length < value.Length)
 {
 return -1;
 }

 Debug.Assert(!source.IsEmpty);

 if (ignoreCase)
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
Expand DownExpand Up@@ -199,9 +157,14 @@ private static unsafe int CompareStringOrdinalIgnoreCase(ref char string1, int c
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(count1 > 0);
 Debug.Assert(count2 > 0);

 fixed (char* char1 = &string1)
 fixed (char* char2 = &string2)
 {
 Debug.Assert(char1 != null);
 Debug.Assert(char2 != null);
 return Interop.Globalization.CompareStringOrdinalIgnoreCase(char1, count1, char2, count2);
 }
 }
Expand All@@ -215,6 +178,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, string string2, Com
 Debug.Assert(string2 != null);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &string2.GetRawStringData())
 {
Expand All@@ -227,6 +193,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, ReadOnlySpan<char>
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &MemoryMarshal.GetReference(string2))
 {
Expand DownExpand Up@@ -540,7 +509,6 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -553,7 +521,7 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
 return Interop.Globalization.StartsWith(_sortHandle, pPrefix, prefix.Length, pSource, source.Length, options);
Expand All@@ -565,13 +533,12 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -636,13 +603,12 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -696,7 +662,6 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -709,7 +674,7 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
 return Interop.Globalization.EndsWith(_sortHandle, pSuffix, suffix.Length, pSource, source.Length, options);
Expand All@@ -721,13 +686,12 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -773,13 +737,12 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -836,7 +799,7 @@ private unsafe SortKey CreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static unsafe bool IsSortable(char *text, int length)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Prep CompareInfo for spanification#32385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

GrabYourPitchforks
merged 6 commits into

from

Mar 14, 2020
 Merged


Prep CompareInfo for spanification
#32385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1fb2514

Update SortKey.GetHashCode not to call directly into Marvin


GrabYourPitchforks Feb 13, 2020
f23d3c5

Spanify CompareInfo p/invoke APIs


GrabYourPitchforks Feb 13, 2020
82f98ea

Only call GetLastError under debug mode


GrabYourPitchforks Mar 13, 2020
b3e0855

PR feedback - cleanup signature of FindStringOrdinal


GrabYourPitchforks Mar 13, 2020
8dda77a

PR feedback - use BOOL over bool


GrabYourPitchforks Mar 13, 2020
d76a5ed

Fix missing edge case checks in IndexOfOrdinal


GrabYourPitchforks Mar 14, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 12 additions & 3 deletions
src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Globalization.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,15 @@ internal static partial class Interop
{
 internal static unsafe partial class Kernel32
 {
 // Under debug mode only, we'll want to check the error codes
 // of some of the p/invokes we make.

#if DEBUG
 private const bool SetLastErrorForDebug = true;
#else
 private const bool SetLastErrorForDebug = false;
#endif

 internal const uint LOCALE_ALLOW_NEUTRAL_NAMES = 0x08000000; // Flag to allow returning neutral names/lcids for name conversion
 internal const uint LOCALE_ILANGUAGE = 0x00000001;
 internal const uint LOCALE_SUPPLEMENTAL = 0x00000002;
Expand DownExpand Up@@ -52,7 +61,7 @@ internal static extern int LCMapStringEx(
 void* lpReserved,
 IntPtr sortHandle);

 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx")]
 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindNLSStringEx(
 char* lpLocaleName,
 uint dwFindNLSStringFlags,
Expand DownExpand Up@@ -85,14 +94,14 @@ internal static extern int CompareStringOrdinal(
 int cchCount2,
 bool bIgnoreCase);

 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal")]
 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindStringOrdinal(
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 uint dwFindStringOrdinalFlags,
 char* lpStringSource,
 int cchSource,
 char* lpStringValue,
 int cchValue,
int bIgnoreCase);
BOOL bIgnoreCase);

 [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 internal static extern bool IsNLSDefinedString(
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ private SortKey InvariantCreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static void InvariantCreateSortKeyOrdinal(ReadOnlySpan<char> source, Span<byte> sortKey)
Expand Down

85 changes: 24 additions & 61 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,64 +43,22 @@ private void InitSort(CultureInfo culture)
 }
 }

 internal static unsafe int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase)
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(source != null);
 Debug.Assert(value != null);

 if (value.Length == 0)
 {
 return startIndex;
 }

 if (count < value.Length)
 {
 return -1;
 }

 if (ignoreCase)
 {
 fixed (char* pSource = source)
 {
 int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + startIndex, count, findLast: false);
 return index != -1 ?
 startIndex + index :
 -1;
 }
 }

 int endIndex = startIndex + (count - value.Length);
 for (int i = startIndex; i <= endIndex; i++)
 {
 int valueIndex, sourceIndex;

 for (valueIndex = 0, sourceIndex = i;
 valueIndex < value.Length && source[sourceIndex] == value[valueIndex];
 valueIndex++, sourceIndex++) ;

 if (valueIndex == value.Length)
 {
 return i;
 }
 }

 return -1;
 }

 internal static unsafe int IndexOfOrdinalCore(ReadOnlySpan<char> source, ReadOnlySpan<char> value, bool ignoreCase, bool fromBeginning)
 {
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert(!value.IsEmpty);

 Debug.Assert(source.Length != 0);
 Debug.Assert(value.Length != 0);
 // Ordinal (non-linguistic) comparisons require the length of the target string to be no greater
 // than the length of the search space. Since our caller already checked for empty target strings,
 // the below check also handles the case of empty search space strings.

 if (source.Length < value.Length)
 {
 return -1;
 }

 Debug.Assert(!source.IsEmpty);

 if (ignoreCase)
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
Expand DownExpand Up@@ -199,9 +157,14 @@ private static unsafe int CompareStringOrdinalIgnoreCase(ref char string1, int c
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(count1 > 0);
 Debug.Assert(count2 > 0);

 fixed (char* char1 = &string1)
 fixed (char* char2 = &string2)
 {
 Debug.Assert(char1 != null);
 Debug.Assert(char2 != null);
 return Interop.Globalization.CompareStringOrdinalIgnoreCase(char1, count1, char2, count2);
 }
 }
Expand All@@ -215,6 +178,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, string string2, Com
 Debug.Assert(string2 != null);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &string2.GetRawStringData())
 {
Expand All@@ -227,6 +193,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, ReadOnlySpan<char>
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &MemoryMarshal.GetReference(string2))
 {
Expand DownExpand Up@@ -540,7 +509,6 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -553,7 +521,7 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
 return Interop.Globalization.StartsWith(_sortHandle, pPrefix, prefix.Length, pSource, source.Length, options);
Expand All@@ -565,13 +533,12 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -636,13 +603,12 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -696,7 +662,6 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -709,7 +674,7 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
 return Interop.Globalization.EndsWith(_sortHandle, pSuffix, suffix.Length, pSource, source.Length, options);
Expand All@@ -721,13 +686,12 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -773,13 +737,12 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -836,7 +799,7 @@ private unsafe SortKey CreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static unsafe bool IsSortable(char *text, int length)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Prep CompareInfo for spanification#32385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

GrabYourPitchforks
merged 6 commits into

from

Mar 14, 2020
 Merged


Prep CompareInfo for spanification
#32385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1fb2514

Update SortKey.GetHashCode not to call directly into Marvin


GrabYourPitchforks Feb 13, 2020
f23d3c5

Spanify CompareInfo p/invoke APIs


GrabYourPitchforks Feb 13, 2020
82f98ea

Only call GetLastError under debug mode


GrabYourPitchforks Mar 13, 2020
b3e0855

PR feedback - cleanup signature of FindStringOrdinal


GrabYourPitchforks Mar 13, 2020
8dda77a

PR feedback - use BOOL over bool


GrabYourPitchforks Mar 13, 2020
d76a5ed

Fix missing edge case checks in IndexOfOrdinal


GrabYourPitchforks Mar 14, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 12 additions & 3 deletions
src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Globalization.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,15 @@ internal static partial class Interop
{
 internal static unsafe partial class Kernel32
 {
 // Under debug mode only, we'll want to check the error codes
 // of some of the p/invokes we make.

#if DEBUG
 private const bool SetLastErrorForDebug = true;
#else
 private const bool SetLastErrorForDebug = false;
#endif

 internal const uint LOCALE_ALLOW_NEUTRAL_NAMES = 0x08000000; // Flag to allow returning neutral names/lcids for name conversion
 internal const uint LOCALE_ILANGUAGE = 0x00000001;
 internal const uint LOCALE_SUPPLEMENTAL = 0x00000002;
Expand DownExpand Up@@ -52,7 +61,7 @@ internal static extern int LCMapStringEx(
 void* lpReserved,
 IntPtr sortHandle);

 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx")]
 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindNLSStringEx(
 char* lpLocaleName,
 uint dwFindNLSStringFlags,
Expand DownExpand Up@@ -85,14 +94,14 @@ internal static extern int CompareStringOrdinal(
 int cchCount2,
 bool bIgnoreCase);

 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal")]
 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindStringOrdinal(
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 uint dwFindStringOrdinalFlags,
 char* lpStringSource,
 int cchSource,
 char* lpStringValue,
 int cchValue,
int bIgnoreCase);
BOOL bIgnoreCase);

 [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 internal static extern bool IsNLSDefinedString(
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ private SortKey InvariantCreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static void InvariantCreateSortKeyOrdinal(ReadOnlySpan<char> source, Span<byte> sortKey)
Expand Down

85 changes: 24 additions & 61 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,64 +43,22 @@ private void InitSort(CultureInfo culture)
 }
 }

 internal static unsafe int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase)
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(source != null);
 Debug.Assert(value != null);

 if (value.Length == 0)
 {
 return startIndex;
 }

 if (count < value.Length)
 {
 return -1;
 }

 if (ignoreCase)
 {
 fixed (char* pSource = source)
 {
 int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + startIndex, count, findLast: false);
 return index != -1 ?
 startIndex + index :
 -1;
 }
 }

 int endIndex = startIndex + (count - value.Length);
 for (int i = startIndex; i <= endIndex; i++)
 {
 int valueIndex, sourceIndex;

 for (valueIndex = 0, sourceIndex = i;
 valueIndex < value.Length && source[sourceIndex] == value[valueIndex];
 valueIndex++, sourceIndex++) ;

 if (valueIndex == value.Length)
 {
 return i;
 }
 }

 return -1;
 }

 internal static unsafe int IndexOfOrdinalCore(ReadOnlySpan<char> source, ReadOnlySpan<char> value, bool ignoreCase, bool fromBeginning)
 {
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert(!value.IsEmpty);

 Debug.Assert(source.Length != 0);
 Debug.Assert(value.Length != 0);
 // Ordinal (non-linguistic) comparisons require the length of the target string to be no greater
 // than the length of the search space. Since our caller already checked for empty target strings,
 // the below check also handles the case of empty search space strings.

 if (source.Length < value.Length)
 {
 return -1;
 }

 Debug.Assert(!source.IsEmpty);

 if (ignoreCase)
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
Expand DownExpand Up@@ -199,9 +157,14 @@ private static unsafe int CompareStringOrdinalIgnoreCase(ref char string1, int c
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(count1 > 0);
 Debug.Assert(count2 > 0);

 fixed (char* char1 = &string1)
 fixed (char* char2 = &string2)
 {
 Debug.Assert(char1 != null);
 Debug.Assert(char2 != null);
 return Interop.Globalization.CompareStringOrdinalIgnoreCase(char1, count1, char2, count2);
 }
 }
Expand All@@ -215,6 +178,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, string string2, Com
 Debug.Assert(string2 != null);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &string2.GetRawStringData())
 {
Expand All@@ -227,6 +193,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, ReadOnlySpan<char>
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &MemoryMarshal.GetReference(string2))
 {
Expand DownExpand Up@@ -540,7 +509,6 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -553,7 +521,7 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
 return Interop.Globalization.StartsWith(_sortHandle, pPrefix, prefix.Length, pSource, source.Length, options);
Expand All@@ -565,13 +533,12 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -636,13 +603,12 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -696,7 +662,6 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -709,7 +674,7 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
 return Interop.Globalization.EndsWith(_sortHandle, pSuffix, suffix.Length, pSource, source.Length, options);
Expand All@@ -721,13 +686,12 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -773,13 +737,12 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -836,7 +799,7 @@ private unsafe SortKey CreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static unsafe bool IsSortable(char *text, int length)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Prep CompareInfo for spanification#32385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

GrabYourPitchforks
merged 6 commits into

from

Mar 14, 2020
 Merged


Prep CompareInfo for spanification
#32385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1fb2514

Update SortKey.GetHashCode not to call directly into Marvin


GrabYourPitchforks Feb 13, 2020
f23d3c5

Spanify CompareInfo p/invoke APIs


GrabYourPitchforks Feb 13, 2020
82f98ea

Only call GetLastError under debug mode


GrabYourPitchforks Mar 13, 2020
b3e0855

PR feedback - cleanup signature of FindStringOrdinal


GrabYourPitchforks Mar 13, 2020
8dda77a

PR feedback - use BOOL over bool


GrabYourPitchforks Mar 13, 2020
d76a5ed

Fix missing edge case checks in IndexOfOrdinal


GrabYourPitchforks Mar 14, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 12 additions & 3 deletions
src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Globalization.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,15 @@ internal static partial class Interop
{
 internal static unsafe partial class Kernel32
 {
 // Under debug mode only, we'll want to check the error codes
 // of some of the p/invokes we make.

#if DEBUG
 private const bool SetLastErrorForDebug = true;
#else
 private const bool SetLastErrorForDebug = false;
#endif

 internal const uint LOCALE_ALLOW_NEUTRAL_NAMES = 0x08000000; // Flag to allow returning neutral names/lcids for name conversion
 internal const uint LOCALE_ILANGUAGE = 0x00000001;
 internal const uint LOCALE_SUPPLEMENTAL = 0x00000002;
Expand DownExpand Up@@ -52,7 +61,7 @@ internal static extern int LCMapStringEx(
 void* lpReserved,
 IntPtr sortHandle);

 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx")]
 [DllImport("kernel32.dll", EntryPoint = "FindNLSStringEx", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindNLSStringEx(
 char* lpLocaleName,
 uint dwFindNLSStringFlags,
Expand DownExpand Up@@ -85,14 +94,14 @@ internal static extern int CompareStringOrdinal(
 int cchCount2,
 bool bIgnoreCase);

 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal")]
 [DllImport("kernel32.dll", EntryPoint = "FindStringOrdinal", SetLastError = SetLastErrorForDebug)]
 internal static extern int FindStringOrdinal(
Comment thread
GrabYourPitchforks marked this conversation as resolved.

 uint dwFindStringOrdinalFlags,
 char* lpStringSource,
 int cchSource,
 char* lpStringValue,
 int cchValue,
int bIgnoreCase);
BOOL bIgnoreCase);

 [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 internal static extern bool IsNLSDefinedString(
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ private SortKey InvariantCreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static void InvariantCreateSortKeyOrdinal(ReadOnlySpan<char> source, Span<byte> sortKey)
Expand Down

85 changes: 24 additions & 61 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,64 +43,22 @@ private void InitSort(CultureInfo culture)
 }
 }

 internal static unsafe int IndexOfOrdinalCore(string source, string value, int startIndex, int count, bool ignoreCase)
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(source != null);
 Debug.Assert(value != null);

 if (value.Length == 0)
 {
 return startIndex;
 }

 if (count < value.Length)
 {
 return -1;
 }

 if (ignoreCase)
 {
 fixed (char* pSource = source)
 {
 int index = Interop.Globalization.IndexOfOrdinalIgnoreCase(value, value.Length, pSource + startIndex, count, findLast: false);
 return index != -1 ?
 startIndex + index :
 -1;
 }
 }

 int endIndex = startIndex + (count - value.Length);
 for (int i = startIndex; i <= endIndex; i++)
 {
 int valueIndex, sourceIndex;

 for (valueIndex = 0, sourceIndex = i;
 valueIndex < value.Length && source[sourceIndex] == value[valueIndex];
 valueIndex++, sourceIndex++) ;

 if (valueIndex == value.Length)
 {
 return i;
 }
 }

 return -1;
 }

 internal static unsafe int IndexOfOrdinalCore(ReadOnlySpan<char> source, ReadOnlySpan<char> value, bool ignoreCase, bool fromBeginning)
 {
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert(!value.IsEmpty);

 Debug.Assert(source.Length != 0);
 Debug.Assert(value.Length != 0);
 // Ordinal (non-linguistic) comparisons require the length of the target string to be no greater
 // than the length of the search space. Since our caller already checked for empty target strings,
 // the below check also handles the case of empty search space strings.

 if (source.Length < value.Length)
 {
 return -1;
 }

 Debug.Assert(!source.IsEmpty);

 if (ignoreCase)
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
Expand DownExpand Up@@ -199,9 +157,14 @@ private static unsafe int CompareStringOrdinalIgnoreCase(ref char string1, int c
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(count1 > 0);
 Debug.Assert(count2 > 0);

 fixed (char* char1 = &string1)
 fixed (char* char2 = &string2)
 {
 Debug.Assert(char1 != null);
 Debug.Assert(char2 != null);
 return Interop.Globalization.CompareStringOrdinalIgnoreCase(char1, count1, char2, count2);
 }
 }
Expand All@@ -215,6 +178,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, string string2, Com
 Debug.Assert(string2 != null);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &string2.GetRawStringData())
 {
Expand All@@ -227,6 +193,9 @@ private unsafe int CompareString(ReadOnlySpan<char> string1, ReadOnlySpan<char>
 Debug.Assert(!GlobalizationMode.Invariant);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

 // Unlike NLS, ICU (ucol_getSortKey) allows passing nullptr for either of the source arguments
 // as long as the corresponding length parameter is 0.

 fixed (char* pString1 = &MemoryMarshal.GetReference(string1))
 fixed (char* pString2 = &MemoryMarshal.GetReference(string2))
 {
Expand DownExpand Up@@ -540,7 +509,6 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -553,7 +521,7 @@ private unsafe bool StartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> pre
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
 return Interop.Globalization.StartsWith(_sortHandle, pPrefix, prefix.Length, pSource, source.Length, options);
Expand All@@ -565,13 +533,12 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -636,13 +603,12 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!prefix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, prefix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(prefix))
 {
 char* a = ap;
Expand DownExpand Up@@ -696,7 +662,6 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert((options & (CompareOptions.Ordinal | CompareOptions.OrdinalIgnoreCase)) == 0);

Expand All@@ -709,7 +674,7 @@ private unsafe bool EndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> suffi
 }
 else
 {
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
 return Interop.Globalization.EndsWith(_sortHandle, pSuffix, suffix.Length, pSource, source.Length, options);
Expand All@@ -721,13 +686,12 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -773,13 +737,12 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 {
 Debug.Assert(!GlobalizationMode.Invariant);

 Debug.Assert(!source.IsEmpty);
 Debug.Assert(!suffix.IsEmpty);
 Debug.Assert(_isAsciiEqualityOrdinal);

 int length = Math.Min(source.Length, suffix.Length);

 fixed (char* ap = &MemoryMarshal.GetReference(source))
 fixed (char* ap = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* bp = &MemoryMarshal.GetReference(suffix))
 {
 char* a = ap + source.Length - 1;
Expand DownExpand Up@@ -836,7 +799,7 @@ private unsafe SortKey CreateSortKey(string source, CompareOptions options)
 }
 }

 return new SortKey(Name, source, options, keyData);
 return new SortKey(this, source, options, keyData);
 }

 private static unsafe bool IsSortable(char *text, int length)
Expand Down
Loading