Skip to content

Commit fbdf52f

Browse files
committed
wip
1 parent b116caf commit fbdf52f

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Interop/JavaScriptExports.CoreCLR.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ public static void BindAssemblyExports(JSMarshalerArgument* argumentsBuffer)
146146
}
147147
}
148148

149-
#pragma warning disable IDE0060
150149
[UnmanagedCallersOnly(EntryPoint = "SystemInteropJS_CallJSExport")]
151150
public static void CallJSExport(int methodHandle, JSMarshalerArgument* argumentsBuffer)
152151
{

src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHostImplementation.CoreCLR.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static unsafe JSFunctionBinding BindManagedFunction(string fullyQualified
6565
wrapperInfo.Invoke(null, new object?[] { boxedLegacyArgs });
6666
};
6767

68-
int methodHandle = ctx.s_JSExportByHandle.Count;
68+
int methodHandle = ctx.NextJSExportHandle++;
6969
ctx.s_JSExportByHandle[methodHandle] = wrapper;
7070

7171
var signature = GetMethodSignature(signatures, null, null);

src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSProxyContext.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ internal sealed class JSProxyContext : IDisposable
2424
private nint NextJSVHandle = -2;
2525
private readonly List<nint> JSVHandleFreeList = new();
2626
internal Dictionary<int, Action<IntPtr>> s_JSExportByHandle = new Dictionary<int, Action<IntPtr>>();
27+
internal int NextJSExportHandle = 1;
2728

2829
#if !FEATURE_WASM_MANAGED_THREADS
2930
private JSProxyContext()

src/native/corehost/browserhost/host/host.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ export async function runMain(mainAssemblyName?: string, args?: string[]): Promi
105105
if (!mainAssemblyName) {
106106
mainAssemblyName = config.mainAssemblyName!;
107107
}
108+
if (!mainAssemblyName.endsWith(".dll")) {
109+
mainAssemblyName += ".dll";
110+
}
108111
const mainAssemblyNamePtr = dotnetBrowserUtilsExports.stringToUTF8Ptr(mainAssemblyName) as any;
109112

110113
if (!args) {

0 commit comments

Comments
 (0)