Skip to content
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

[browser][non-icu] HybridGlobalization update string decoding for comparison #85098

Merged
merged 2 commits into from
Apr 21, 2023
Merged

[browser][non-icu] HybridGlobalization update string decoding for comparison #85098

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb473d2
Use well tested decoding in comparison.
ilonatommy Apr 20, 2023
68d72f0
Fix length calculation.
ilonatommy Apr 21, 2023
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
22 changes: 11 additions & 11 deletions src/mono/wasm/runtime/net6-legacy/hybrid-globalization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Module } from "../imports";
import { mono_wasm_new_external_root } from "../roots";
import {MonoString, MonoStringRef } from "../types";
import { Int32Ptr } from "../types/emscripten";
import { conv_string_root, js_string_to_mono_string_root } from "../strings";
import { conv_string_root, js_string_to_mono_string_root, string_decoder } from "../strings";
import { setU16 } from "../memory";

export function mono_wasm_change_case_invariant(exceptionMessage: Int32Ptr, src: number, srcLength: number, dst: number, dstLength: number, toUpper: number) : void{
Expand Down Expand Up @@ -47,12 +47,20 @@ export function mono_wasm_change_case(exceptionMessage: Int32Ptr, culture: MonoS
}
}

function get_utf16_string(ptr: number, length: number): string{
const view = new Uint16Array(Module.HEAPU16.buffer, ptr, length);
let string = "";
for (let i = 0; i < length; i++)
string += String.fromCharCode(view[i]);
return string;
}

export function mono_wasm_compare_string(exceptionMessage: Int32Ptr, culture: MonoStringRef, str1: number, str1Length: number, str2: number, str2Length: number, options: number) : number{
const cultureRoot = mono_wasm_new_external_root<MonoString>(culture);
try{
const cultureName = conv_string_root(cultureRoot);
const string1 = get_utf16_string(str1, str1Length);
const string2 = get_utf16_string(str2, str2Length);
const string1 = string_decoder.decode(<any>str1, <any>(str1 + 2*str1Length));
const string2 = string_decoder.decode(<any>str2, <any>(str2 + 2*str2Length));
const casePicker = (options & 0x1f);
const locale = cultureName ? cultureName : undefined;
const result = compare_strings(string1, string2, locale, casePicker);
Expand All @@ -69,14 +77,6 @@ export function mono_wasm_compare_string(exceptionMessage: Int32Ptr, culture: Mo
}
}

export function get_utf16_string(ptr: number, length: number): string{
const view = new Uint16Array(Module.HEAPU16.buffer, ptr, length);
let string = "";
for (let i = 0; i < length; i++)
string += String.fromCharCode(view[i]);
return string;
}

export function pass_exception_details(ex: any, exceptionMessage: Int32Ptr){
const exceptionJsString = ex.message + "\n" + ex.stack;
const exceptionRoot = mono_wasm_new_external_root<MonoString>(<any>exceptionMessage);
Expand Down