[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292

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
fanyang-mono merged 5 commits into from
Aug 31, 2023
Merged

[Mono] Fix offset calculation for nested struct, when pinvoke is enabled #91292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6d6db4
Fix offset calculation for nested struct
fanyang-mono Aug 29, 2023
75a844a
Add a test for nested struct with pinvoke
fanyang-mono Aug 30, 2023
4b7011e
Move and update test with real c++ implementation
fanyang-mono Aug 30, 2023
7df731c
Exclude newly added test from wasm
fanyang-mono Aug 30, 2023
3898d7f
Disable interop tests on android and apple devices
fanyang-mono Aug 31, 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
4 changes: 2 additions & 2 deletions src/mono/mono/mini/mini-amd64.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
g_assert(info);
for (guint32 i = 0; i < info->num_fields; ++i) {
if (MONO_TYPE_ISSTRUCT (info->fields [i].field->type)) {
collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, info->fields [i].offset, pinvoke, unicode);
collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, (offset + info->fields [i].offset), pinvoke, unicode);
} else {
guint32 align;
StructFieldInfo f;
Expand All@@ -367,7 +367,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
info->fields [i].mspec,
&align, TRUE, unicode);
f.offset = offset + info->fields [i].offset;
if (i == info->num_fields - 1 && f.size + f.offset < info->native_size) {
if ((i == info->num_fields - 1) && ((f.size + f.offset) < info->native_size)) {
/* This can happen with .pack directives eg. 'fixed' arrays */
if (MONO_TYPE_IS_PRIMITIVE (f.type)) {
/* Replicate the last field to fill out the remaining place, since the code in add_valuetype () needs type information */
Expand Down
63 changes: 63 additions & 0 deletions src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Text;

public unsafe partial struct GameControllerButtonBind
{
public GameControllerButtonBind
(
GameControllerBindType? bindType = null,
GameControllerButtonBindValue? value = null
) : this()
{
if (bindType is not null)
{
BindType = bindType.Value;
}

if (value is not null)
{
Value = value.Value;
}
}

public GameControllerBindType BindType;

public GameControllerButtonBindValue Value;
}

public enum GameControllerBindType : int
{
ControllerBindtypeNone = 0x0,
ControllerBindtypeButton = 0x1,
ControllerBindtypeAxis = 0x2,
ControllerBindtypeHat = 0x3,
None = 0x0,
Button = 0x1,
Axis = 0x2,
Hat = 0x3,
}

[StructLayout(LayoutKind.Explicit)]
public unsafe partial struct GameControllerButtonBindValue
{
[FieldOffset(0)]
public int Button;

[FieldOffset(0)]
public int Axis;

[FieldOffset(0)]
public GameControllerButtonBindValueHat Hat;
}

public unsafe partial struct GameControllerButtonBindValueHat
{
public int Hat;

public int HatMask;
}
5 changes: 5 additions & 0 deletions src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1297,3 +1297,8 @@ extern "C" DLL_EXPORT Int32CLongStruct STDMETHODCALLTYPE AddCLongs(Int32CLongStr
{
return { lhs.i + rhs.i, lhs.l + rhs.l };
}

extern "C" DLL_EXPORT SDL_GameControllerBindType STDMETHODCALLTYPE getBindType(SDL_GameControllerButtonBind button)
{
return button.bindType;
}
23 changes: 23 additions & 0 deletions src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -974,3 +974,26 @@ struct Int32CLongStruct
int32_t i;
long l;
};

typedef enum
{
SDL_CONTROLLER_BINDTYPE_NONE = 0,
SDL_CONTROLLER_BINDTYPE_BUTTON,
SDL_CONTROLLER_BINDTYPE_AXIS,
SDL_CONTROLLER_BINDTYPE_HAT
} SDL_GameControllerBindType;

typedef struct SDL_GameControllerButtonBind
{
SDL_GameControllerBindType bindType;
union
{
int button;
int axis;
struct {
int hat;
int hat_mask;
} hat;
} value;

} SDL_GameControllerButtonBind;
27 changes: 27 additions & 0 deletions src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using Xunit;

public class Managed
{
[DllImport("MarshalStructAsParam")]
static extern GameControllerBindType getBindType (GameControllerButtonBind button);

public static int Main()
{
GameControllerButtonBind button = new GameControllerButtonBind(GameControllerBindType.ControllerBindtypeAxis, null);
if (getBindType(button) == GameControllerBindType.ControllerBindtypeAxis)
{
Console.WriteLine("\nTEST PASSED!");
return 100;
}
else
{
Console.WriteLine("\nTEST FAILED!");
return 1;
}
}
}
14 changes: 14 additions & 0 deletions src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Compile Include="NestedStruct.cs" />
<Compile Include="GameControllerButtonBind.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
<CMakeProjectReference Include="CMakeLists.txt" />
</ItemGroup>
</Project>
12 changes: 12 additions & 0 deletions src/tests/issues.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2929,6 +2929,9 @@
<ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/SetLastError/**">
<Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
<Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
<Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
</ExcludeList>
Expand DownExpand Up@@ -3464,6 +3467,15 @@
<ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
<Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
<Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/NativeLibrary/MainProgramHandle/MainProgramHandleTests/**">
<Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/DllImportSearchPaths/DllImportSearchPathsTest/**">
<Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
</ExcludeList>
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292

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

fanyang-mono
merged 5 commits into

from

Aug 31, 2023
 Merged


[Mono] Fix offset calculation for nested struct, when pinvoke is enabled
#91292
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b6d6db4

Fix offset calculation for nested struct


fanyang-mono Aug 29, 2023
75a844a

Add a test for nested struct with pinvoke


fanyang-mono Aug 30, 2023
4b7011e

Move and update test with real c++ implementation


fanyang-mono Aug 30, 2023
7df731c

Exclude newly added test from wasm


fanyang-mono Aug 30, 2023
3898d7f

Disable interop tests on android and apple devices


fanyang-mono Aug 31, 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


4 changes: 2 additions & 2 deletions
src/mono/mono/mini/mini-amd64.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 g_assert(info);
 for (guint32 i = 0; i < info->num_fields; ++i) {
 if (MONO_TYPE_ISSTRUCT (info->fields [i].field->type)) {
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, info->fields [i].offset, pinvoke, unicode);
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, (offset + info->fields [i].offset), pinvoke, unicode);
 } else {
 guint32 align;
 StructFieldInfo f;
Expand All@@ -367,7 +367,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 info->fields [i].mspec,
 &align, TRUE, unicode);
 f.offset = offset + info->fields [i].offset;
 if (i == info->num_fields - 1 && f.size + f.offset < info->native_size) {
 if ((i == info->num_fields - 1) && ((f.size + f.offset) < info->native_size)) {
 /* This can happen with .pack directives eg. 'fixed' arrays */
 if (MONO_TYPE_IS_PRIMITIVE (f.type)) {
 /* Replicate the last field to fill out the remaining place, since the code in add_valuetype () needs type information */
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Text;

public unsafe partial struct GameControllerButtonBind
{
 public GameControllerButtonBind
 (
 GameControllerBindType? bindType = null,
 GameControllerButtonBindValue? value = null
 ) : this()
 {
 if (bindType is not null)
 {
 BindType = bindType.Value;
 }

 if (value is not null)
 {
 Value = value.Value;
 }
 }

 public GameControllerBindType BindType;

 public GameControllerButtonBindValue Value;
}

public enum GameControllerBindType : int
{
 ControllerBindtypeNone = 0x0,
 ControllerBindtypeButton = 0x1,
 ControllerBindtypeAxis = 0x2,
 ControllerBindtypeHat = 0x3,
 None = 0x0,
 Button = 0x1,
 Axis = 0x2,
 Hat = 0x3,
}

[StructLayout(LayoutKind.Explicit)]
public unsafe partial struct GameControllerButtonBindValue
{
 [FieldOffset(0)]
 public int Button;

 [FieldOffset(0)]
 public int Axis;

 [FieldOffset(0)]
 public GameControllerButtonBindValueHat Hat;
}

public unsafe partial struct GameControllerButtonBindValueHat
{
 public int Hat;

 public int HatMask;
}

5 changes: 5 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1297,3 +1297,8 @@ extern "C" DLL_EXPORT Int32CLongStruct STDMETHODCALLTYPE AddCLongs(Int32CLongStr
{
 return { lhs.i + rhs.i, lhs.l + rhs.l };
}

extern "C" DLL_EXPORT SDL_GameControllerBindType STDMETHODCALLTYPE getBindType(SDL_GameControllerButtonBind button)
{
 return button.bindType;
}

23 changes: 23 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -974,3 +974,26 @@ struct Int32CLongStruct
 int32_t i;
 long l;
};

typedef enum
{
 SDL_CONTROLLER_BINDTYPE_NONE = 0,
 SDL_CONTROLLER_BINDTYPE_BUTTON,
 SDL_CONTROLLER_BINDTYPE_AXIS,
 SDL_CONTROLLER_BINDTYPE_HAT
} SDL_GameControllerBindType;

typedef struct SDL_GameControllerButtonBind
{
 SDL_GameControllerBindType bindType;
 union
 {
 int button;
 int axis;
 struct {
 int hat;
 int hat_mask;
 } hat;
 } value;

} SDL_GameControllerButtonBind;

27 changes: 27 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using Xunit;

public class Managed
{
 [DllImport("MarshalStructAsParam")]
 static extern GameControllerBindType getBindType (GameControllerButtonBind button);

 public static int Main()
 {
 GameControllerButtonBind button = new GameControllerButtonBind(GameControllerBindType.ControllerBindtypeAxis, null);
 if (getBindType(button) == GameControllerBindType.ControllerBindtypeAxis)
 {
 Console.WriteLine("\nTEST PASSED!");
 return 100;
 }
 else
 {
 Console.WriteLine("\nTEST FAILED!");
 return 1;
 }
 }
}

14 changes: 14 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="NestedStruct.cs" />
 <Compile Include="GameControllerButtonBind.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <CMakeProjectReference Include="CMakeLists.txt" />
 </ItemGroup>
</Project>

12 changes: 12 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2929,6 +2929,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/SetLastError/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include = "$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -3464,6 +3467,15 @@
 <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
 <Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/NativeLibrary/MainProgramHandle/MainProgramHandleTests/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/DllImportSearchPaths/DllImportSearchPathsTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">
Expand Down

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

Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292

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

fanyang-mono
merged 5 commits into

from

Aug 31, 2023
 Merged


[Mono] Fix offset calculation for nested struct, when pinvoke is enabled
#91292
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b6d6db4

Fix offset calculation for nested struct


fanyang-mono Aug 29, 2023
75a844a

Add a test for nested struct with pinvoke


fanyang-mono Aug 30, 2023
4b7011e

Move and update test with real c++ implementation


fanyang-mono Aug 30, 2023
7df731c

Exclude newly added test from wasm


fanyang-mono Aug 30, 2023
3898d7f

Disable interop tests on android and apple devices


fanyang-mono Aug 31, 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


4 changes: 2 additions & 2 deletions
src/mono/mono/mini/mini-amd64.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 g_assert(info);
 for (guint32 i = 0; i < info->num_fields; ++i) {
 if (MONO_TYPE_ISSTRUCT (info->fields [i].field->type)) {
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, info->fields [i].offset, pinvoke, unicode);
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, (offset + info->fields [i].offset), pinvoke, unicode);
 } else {
 guint32 align;
 StructFieldInfo f;
Expand All@@ -367,7 +367,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 info->fields [i].mspec,
 &align, TRUE, unicode);
 f.offset = offset + info->fields [i].offset;
 if (i == info->num_fields - 1 && f.size + f.offset < info->native_size) {
 if ((i == info->num_fields - 1) && ((f.size + f.offset) < info->native_size)) {
 /* This can happen with .pack directives eg. 'fixed' arrays */
 if (MONO_TYPE_IS_PRIMITIVE (f.type)) {
 /* Replicate the last field to fill out the remaining place, since the code in add_valuetype () needs type information */
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Text;

public unsafe partial struct GameControllerButtonBind
{
 public GameControllerButtonBind
 (
 GameControllerBindType? bindType = null,
 GameControllerButtonBindValue? value = null
 ) : this()
 {
 if (bindType is not null)
 {
 BindType = bindType.Value;
 }

 if (value is not null)
 {
 Value = value.Value;
 }
 }

 public GameControllerBindType BindType;

 public GameControllerButtonBindValue Value;
}

public enum GameControllerBindType : int
{
 ControllerBindtypeNone = 0x0,
 ControllerBindtypeButton = 0x1,
 ControllerBindtypeAxis = 0x2,
 ControllerBindtypeHat = 0x3,
 None = 0x0,
 Button = 0x1,
 Axis = 0x2,
 Hat = 0x3,
}

[StructLayout(LayoutKind.Explicit)]
public unsafe partial struct GameControllerButtonBindValue
{
 [FieldOffset(0)]
 public int Button;

 [FieldOffset(0)]
 public int Axis;

 [FieldOffset(0)]
 public GameControllerButtonBindValueHat Hat;
}

public unsafe partial struct GameControllerButtonBindValueHat
{
 public int Hat;

 public int HatMask;
}

5 changes: 5 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1297,3 +1297,8 @@ extern "C" DLL_EXPORT Int32CLongStruct STDMETHODCALLTYPE AddCLongs(Int32CLongStr
{
 return { lhs.i + rhs.i, lhs.l + rhs.l };
}

extern "C" DLL_EXPORT SDL_GameControllerBindType STDMETHODCALLTYPE getBindType(SDL_GameControllerButtonBind button)
{
 return button.bindType;
}

23 changes: 23 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -974,3 +974,26 @@ struct Int32CLongStruct
 int32_t i;
 long l;
};

typedef enum
{
 SDL_CONTROLLER_BINDTYPE_NONE = 0,
 SDL_CONTROLLER_BINDTYPE_BUTTON,
 SDL_CONTROLLER_BINDTYPE_AXIS,
 SDL_CONTROLLER_BINDTYPE_HAT
} SDL_GameControllerBindType;

typedef struct SDL_GameControllerButtonBind
{
 SDL_GameControllerBindType bindType;
 union
 {
 int button;
 int axis;
 struct {
 int hat;
 int hat_mask;
 } hat;
 } value;

} SDL_GameControllerButtonBind;

27 changes: 27 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using Xunit;

public class Managed
{
 [DllImport("MarshalStructAsParam")]
 static extern GameControllerBindType getBindType (GameControllerButtonBind button);

 public static int Main()
 {
 GameControllerButtonBind button = new GameControllerButtonBind(GameControllerBindType.ControllerBindtypeAxis, null);
 if (getBindType(button) == GameControllerBindType.ControllerBindtypeAxis)
 {
 Console.WriteLine("\nTEST PASSED!");
 return 100;
 }
 else
 {
 Console.WriteLine("\nTEST FAILED!");
 return 1;
 }
 }
}

14 changes: 14 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="NestedStruct.cs" />
 <Compile Include="GameControllerButtonBind.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <CMakeProjectReference Include="CMakeLists.txt" />
 </ItemGroup>
</Project>

12 changes: 12 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2929,6 +2929,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/SetLastError/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include = "$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -3464,6 +3467,15 @@
 <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
 <Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/NativeLibrary/MainProgramHandle/MainProgramHandleTests/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/DllImportSearchPaths/DllImportSearchPathsTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">
Expand Down

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

Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292

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

fanyang-mono
merged 5 commits into

from

Aug 31, 2023
 Merged


[Mono] Fix offset calculation for nested struct, when pinvoke is enabled
#91292
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b6d6db4

Fix offset calculation for nested struct


fanyang-mono Aug 29, 2023
75a844a

Add a test for nested struct with pinvoke


fanyang-mono Aug 30, 2023
4b7011e

Move and update test with real c++ implementation


fanyang-mono Aug 30, 2023
7df731c

Exclude newly added test from wasm


fanyang-mono Aug 30, 2023
3898d7f

Disable interop tests on android and apple devices


fanyang-mono Aug 31, 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


4 changes: 2 additions & 2 deletions
src/mono/mono/mini/mini-amd64.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 g_assert(info);
 for (guint32 i = 0; i < info->num_fields; ++i) {
 if (MONO_TYPE_ISSTRUCT (info->fields [i].field->type)) {
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, info->fields [i].offset, pinvoke, unicode);
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, (offset + info->fields [i].offset), pinvoke, unicode);
 } else {
 guint32 align;
 StructFieldInfo f;
Expand All@@ -367,7 +367,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 info->fields [i].mspec,
 &align, TRUE, unicode);
 f.offset = offset + info->fields [i].offset;
 if (i == info->num_fields - 1 && f.size + f.offset < info->native_size) {
 if ((i == info->num_fields - 1) && ((f.size + f.offset) < info->native_size)) {
 /* This can happen with .pack directives eg. 'fixed' arrays */
 if (MONO_TYPE_IS_PRIMITIVE (f.type)) {
 /* Replicate the last field to fill out the remaining place, since the code in add_valuetype () needs type information */
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Text;

public unsafe partial struct GameControllerButtonBind
{
 public GameControllerButtonBind
 (
 GameControllerBindType? bindType = null,
 GameControllerButtonBindValue? value = null
 ) : this()
 {
 if (bindType is not null)
 {
 BindType = bindType.Value;
 }

 if (value is not null)
 {
 Value = value.Value;
 }
 }

 public GameControllerBindType BindType;

 public GameControllerButtonBindValue Value;
}

public enum GameControllerBindType : int
{
 ControllerBindtypeNone = 0x0,
 ControllerBindtypeButton = 0x1,
 ControllerBindtypeAxis = 0x2,
 ControllerBindtypeHat = 0x3,
 None = 0x0,
 Button = 0x1,
 Axis = 0x2,
 Hat = 0x3,
}

[StructLayout(LayoutKind.Explicit)]
public unsafe partial struct GameControllerButtonBindValue
{
 [FieldOffset(0)]
 public int Button;

 [FieldOffset(0)]
 public int Axis;

 [FieldOffset(0)]
 public GameControllerButtonBindValueHat Hat;
}

public unsafe partial struct GameControllerButtonBindValueHat
{
 public int Hat;

 public int HatMask;
}

5 changes: 5 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1297,3 +1297,8 @@ extern "C" DLL_EXPORT Int32CLongStruct STDMETHODCALLTYPE AddCLongs(Int32CLongStr
{
 return { lhs.i + rhs.i, lhs.l + rhs.l };
}

extern "C" DLL_EXPORT SDL_GameControllerBindType STDMETHODCALLTYPE getBindType(SDL_GameControllerButtonBind button)
{
 return button.bindType;
}

23 changes: 23 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -974,3 +974,26 @@ struct Int32CLongStruct
 int32_t i;
 long l;
};

typedef enum
{
 SDL_CONTROLLER_BINDTYPE_NONE = 0,
 SDL_CONTROLLER_BINDTYPE_BUTTON,
 SDL_CONTROLLER_BINDTYPE_AXIS,
 SDL_CONTROLLER_BINDTYPE_HAT
} SDL_GameControllerBindType;

typedef struct SDL_GameControllerButtonBind
{
 SDL_GameControllerBindType bindType;
 union
 {
 int button;
 int axis;
 struct {
 int hat;
 int hat_mask;
 } hat;
 } value;

} SDL_GameControllerButtonBind;

27 changes: 27 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using Xunit;

public class Managed
{
 [DllImport("MarshalStructAsParam")]
 static extern GameControllerBindType getBindType (GameControllerButtonBind button);

 public static int Main()
 {
 GameControllerButtonBind button = new GameControllerButtonBind(GameControllerBindType.ControllerBindtypeAxis, null);
 if (getBindType(button) == GameControllerBindType.ControllerBindtypeAxis)
 {
 Console.WriteLine("\nTEST PASSED!");
 return 100;
 }
 else
 {
 Console.WriteLine("\nTEST FAILED!");
 return 1;
 }
 }
}

14 changes: 14 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="NestedStruct.cs" />
 <Compile Include="GameControllerButtonBind.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <CMakeProjectReference Include="CMakeLists.txt" />
 </ItemGroup>
</Project>

12 changes: 12 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2929,6 +2929,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/SetLastError/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include = "$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -3464,6 +3467,15 @@
 <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
 <Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/NativeLibrary/MainProgramHandle/MainProgramHandleTests/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/DllImportSearchPaths/DllImportSearchPathsTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292

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

fanyang-mono
merged 5 commits into

from

Aug 31, 2023
 Merged


[Mono] Fix offset calculation for nested struct, when pinvoke is enabled
#91292
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b6d6db4

Fix offset calculation for nested struct


fanyang-mono Aug 29, 2023
75a844a

Add a test for nested struct with pinvoke


fanyang-mono Aug 30, 2023
4b7011e

Move and update test with real c++ implementation


fanyang-mono Aug 30, 2023
7df731c

Exclude newly added test from wasm


fanyang-mono Aug 30, 2023
3898d7f

Disable interop tests on android and apple devices


fanyang-mono Aug 31, 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


4 changes: 2 additions & 2 deletions
src/mono/mono/mini/mini-amd64.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 g_assert(info);
 for (guint32 i = 0; i < info->num_fields; ++i) {
 if (MONO_TYPE_ISSTRUCT (info->fields [i].field->type)) {
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, info->fields [i].offset, pinvoke, unicode);
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, (offset + info->fields [i].offset), pinvoke, unicode);
 } else {
 guint32 align;
 StructFieldInfo f;
Expand All@@ -367,7 +367,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 info->fields [i].mspec,
 &align, TRUE, unicode);
 f.offset = offset + info->fields [i].offset;
 if (i == info->num_fields - 1 && f.size + f.offset < info->native_size) {
 if ((i == info->num_fields - 1) && ((f.size + f.offset) < info->native_size)) {
 /* This can happen with .pack directives eg. 'fixed' arrays */
 if (MONO_TYPE_IS_PRIMITIVE (f.type)) {
 /* Replicate the last field to fill out the remaining place, since the code in add_valuetype () needs type information */
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Text;

public unsafe partial struct GameControllerButtonBind
{
 public GameControllerButtonBind
 (
 GameControllerBindType? bindType = null,
 GameControllerButtonBindValue? value = null
 ) : this()
 {
 if (bindType is not null)
 {
 BindType = bindType.Value;
 }

 if (value is not null)
 {
 Value = value.Value;
 }
 }

 public GameControllerBindType BindType;

 public GameControllerButtonBindValue Value;
}

public enum GameControllerBindType : int
{
 ControllerBindtypeNone = 0x0,
 ControllerBindtypeButton = 0x1,
 ControllerBindtypeAxis = 0x2,
 ControllerBindtypeHat = 0x3,
 None = 0x0,
 Button = 0x1,
 Axis = 0x2,
 Hat = 0x3,
}

[StructLayout(LayoutKind.Explicit)]
public unsafe partial struct GameControllerButtonBindValue
{
 [FieldOffset(0)]
 public int Button;

 [FieldOffset(0)]
 public int Axis;

 [FieldOffset(0)]
 public GameControllerButtonBindValueHat Hat;
}

public unsafe partial struct GameControllerButtonBindValueHat
{
 public int Hat;

 public int HatMask;
}

5 changes: 5 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1297,3 +1297,8 @@ extern "C" DLL_EXPORT Int32CLongStruct STDMETHODCALLTYPE AddCLongs(Int32CLongStr
{
 return { lhs.i + rhs.i, lhs.l + rhs.l };
}

extern "C" DLL_EXPORT SDL_GameControllerBindType STDMETHODCALLTYPE getBindType(SDL_GameControllerButtonBind button)
{
 return button.bindType;
}

23 changes: 23 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -974,3 +974,26 @@ struct Int32CLongStruct
 int32_t i;
 long l;
};

typedef enum
{
 SDL_CONTROLLER_BINDTYPE_NONE = 0,
 SDL_CONTROLLER_BINDTYPE_BUTTON,
 SDL_CONTROLLER_BINDTYPE_AXIS,
 SDL_CONTROLLER_BINDTYPE_HAT
} SDL_GameControllerBindType;

typedef struct SDL_GameControllerButtonBind
{
 SDL_GameControllerBindType bindType;
 union
 {
 int button;
 int axis;
 struct {
 int hat;
 int hat_mask;
 } hat;
 } value;

} SDL_GameControllerButtonBind;

27 changes: 27 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using Xunit;

public class Managed
{
 [DllImport("MarshalStructAsParam")]
 static extern GameControllerBindType getBindType (GameControllerButtonBind button);

 public static int Main()
 {
 GameControllerButtonBind button = new GameControllerButtonBind(GameControllerBindType.ControllerBindtypeAxis, null);
 if (getBindType(button) == GameControllerBindType.ControllerBindtypeAxis)
 {
 Console.WriteLine("\nTEST PASSED!");
 return 100;
 }
 else
 {
 Console.WriteLine("\nTEST FAILED!");
 return 1;
 }
 }
}

14 changes: 14 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="NestedStruct.cs" />
 <Compile Include="GameControllerButtonBind.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <CMakeProjectReference Include="CMakeLists.txt" />
 </ItemGroup>
</Project>

12 changes: 12 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2929,6 +2929,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/SetLastError/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include = "$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -3464,6 +3467,15 @@
 <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
 <Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/NativeLibrary/MainProgramHandle/MainProgramHandleTests/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/DllImportSearchPaths/DllImportSearchPathsTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">
Expand Down

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

Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292

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

fanyang-mono
merged 5 commits into

from

Aug 31, 2023
 Merged


[Mono] Fix offset calculation for nested struct, when pinvoke is enabled
#91292
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b6d6db4

Fix offset calculation for nested struct


fanyang-mono Aug 29, 2023
75a844a

Add a test for nested struct with pinvoke


fanyang-mono Aug 30, 2023
4b7011e

Move and update test with real c++ implementation


fanyang-mono Aug 30, 2023
7df731c

Exclude newly added test from wasm


fanyang-mono Aug 30, 2023
3898d7f

Disable interop tests on android and apple devices


fanyang-mono Aug 31, 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


4 changes: 2 additions & 2 deletions
src/mono/mono/mini/mini-amd64.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 g_assert(info);
 for (guint32 i = 0; i < info->num_fields; ++i) {
 if (MONO_TYPE_ISSTRUCT (info->fields [i].field->type)) {
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, info->fields [i].offset, pinvoke, unicode);
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, (offset + info->fields [i].offset), pinvoke, unicode);
 } else {
 guint32 align;
 StructFieldInfo f;
Expand All@@ -367,7 +367,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 info->fields [i].mspec,
 &align, TRUE, unicode);
 f.offset = offset + info->fields [i].offset;
 if (i == info->num_fields - 1 && f.size + f.offset < info->native_size) {
 if ((i == info->num_fields - 1) && ((f.size + f.offset) < info->native_size)) {
 /* This can happen with .pack directives eg. 'fixed' arrays */
 if (MONO_TYPE_IS_PRIMITIVE (f.type)) {
 /* Replicate the last field to fill out the remaining place, since the code in add_valuetype () needs type information */
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Text;

public unsafe partial struct GameControllerButtonBind
{
 public GameControllerButtonBind
 (
 GameControllerBindType? bindType = null,
 GameControllerButtonBindValue? value = null
 ) : this()
 {
 if (bindType is not null)
 {
 BindType = bindType.Value;
 }

 if (value is not null)
 {
 Value = value.Value;
 }
 }

 public GameControllerBindType BindType;

 public GameControllerButtonBindValue Value;
}

public enum GameControllerBindType : int
{
 ControllerBindtypeNone = 0x0,
 ControllerBindtypeButton = 0x1,
 ControllerBindtypeAxis = 0x2,
 ControllerBindtypeHat = 0x3,
 None = 0x0,
 Button = 0x1,
 Axis = 0x2,
 Hat = 0x3,
}

[StructLayout(LayoutKind.Explicit)]
public unsafe partial struct GameControllerButtonBindValue
{
 [FieldOffset(0)]
 public int Button;

 [FieldOffset(0)]
 public int Axis;

 [FieldOffset(0)]
 public GameControllerButtonBindValueHat Hat;
}

public unsafe partial struct GameControllerButtonBindValueHat
{
 public int Hat;

 public int HatMask;
}

5 changes: 5 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1297,3 +1297,8 @@ extern "C" DLL_EXPORT Int32CLongStruct STDMETHODCALLTYPE AddCLongs(Int32CLongStr
{
 return { lhs.i + rhs.i, lhs.l + rhs.l };
}

extern "C" DLL_EXPORT SDL_GameControllerBindType STDMETHODCALLTYPE getBindType(SDL_GameControllerButtonBind button)
{
 return button.bindType;
}

23 changes: 23 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -974,3 +974,26 @@ struct Int32CLongStruct
 int32_t i;
 long l;
};

typedef enum
{
 SDL_CONTROLLER_BINDTYPE_NONE = 0,
 SDL_CONTROLLER_BINDTYPE_BUTTON,
 SDL_CONTROLLER_BINDTYPE_AXIS,
 SDL_CONTROLLER_BINDTYPE_HAT
} SDL_GameControllerBindType;

typedef struct SDL_GameControllerButtonBind
{
 SDL_GameControllerBindType bindType;
 union
 {
 int button;
 int axis;
 struct {
 int hat;
 int hat_mask;
 } hat;
 } value;

} SDL_GameControllerButtonBind;

27 changes: 27 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using Xunit;

public class Managed
{
 [DllImport("MarshalStructAsParam")]
 static extern GameControllerBindType getBindType (GameControllerButtonBind button);

 public static int Main()
 {
 GameControllerButtonBind button = new GameControllerButtonBind(GameControllerBindType.ControllerBindtypeAxis, null);
 if (getBindType(button) == GameControllerBindType.ControllerBindtypeAxis)
 {
 Console.WriteLine("\nTEST PASSED!");
 return 100;
 }
 else
 {
 Console.WriteLine("\nTEST FAILED!");
 return 1;
 }
 }
}

14 changes: 14 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="NestedStruct.cs" />
 <Compile Include="GameControllerButtonBind.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <CMakeProjectReference Include="CMakeLists.txt" />
 </ItemGroup>
</Project>

12 changes: 12 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2929,6 +2929,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/SetLastError/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include = "$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -3464,6 +3467,15 @@
 <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
 <Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/NativeLibrary/MainProgramHandle/MainProgramHandleTests/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/DllImportSearchPaths/DllImportSearchPathsTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">
Expand Down

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

Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292

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

fanyang-mono
merged 5 commits into

from

Aug 31, 2023
 Merged


[Mono] Fix offset calculation for nested struct, when pinvoke is enabled
#91292
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b6d6db4

Fix offset calculation for nested struct


fanyang-mono Aug 29, 2023
75a844a

Add a test for nested struct with pinvoke


fanyang-mono Aug 30, 2023
4b7011e

Move and update test with real c++ implementation


fanyang-mono Aug 30, 2023
7df731c

Exclude newly added test from wasm


fanyang-mono Aug 30, 2023
3898d7f

Disable interop tests on android and apple devices


fanyang-mono Aug 31, 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


4 changes: 2 additions & 2 deletions
src/mono/mono/mini/mini-amd64.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 g_assert(info);
 for (guint32 i = 0; i < info->num_fields; ++i) {
 if (MONO_TYPE_ISSTRUCT (info->fields [i].field->type)) {
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, info->fields [i].offset, pinvoke, unicode);
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, (offset + info->fields [i].offset), pinvoke, unicode);
 } else {
 guint32 align;
 StructFieldInfo f;
Expand All@@ -367,7 +367,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 info->fields [i].mspec,
 &align, TRUE, unicode);
 f.offset = offset + info->fields [i].offset;
 if (i == info->num_fields - 1 && f.size + f.offset < info->native_size) {
 if ((i == info->num_fields - 1) && ((f.size + f.offset) < info->native_size)) {
 /* This can happen with .pack directives eg. 'fixed' arrays */
 if (MONO_TYPE_IS_PRIMITIVE (f.type)) {
 /* Replicate the last field to fill out the remaining place, since the code in add_valuetype () needs type information */
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Text;

public unsafe partial struct GameControllerButtonBind
{
 public GameControllerButtonBind
 (
 GameControllerBindType? bindType = null,
 GameControllerButtonBindValue? value = null
 ) : this()
 {
 if (bindType is not null)
 {
 BindType = bindType.Value;
 }

 if (value is not null)
 {
 Value = value.Value;
 }
 }

 public GameControllerBindType BindType;

 public GameControllerButtonBindValue Value;
}

public enum GameControllerBindType : int
{
 ControllerBindtypeNone = 0x0,
 ControllerBindtypeButton = 0x1,
 ControllerBindtypeAxis = 0x2,
 ControllerBindtypeHat = 0x3,
 None = 0x0,
 Button = 0x1,
 Axis = 0x2,
 Hat = 0x3,
}

[StructLayout(LayoutKind.Explicit)]
public unsafe partial struct GameControllerButtonBindValue
{
 [FieldOffset(0)]
 public int Button;

 [FieldOffset(0)]
 public int Axis;

 [FieldOffset(0)]
 public GameControllerButtonBindValueHat Hat;
}

public unsafe partial struct GameControllerButtonBindValueHat
{
 public int Hat;

 public int HatMask;
}

5 changes: 5 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1297,3 +1297,8 @@ extern "C" DLL_EXPORT Int32CLongStruct STDMETHODCALLTYPE AddCLongs(Int32CLongStr
{
 return { lhs.i + rhs.i, lhs.l + rhs.l };
}

extern "C" DLL_EXPORT SDL_GameControllerBindType STDMETHODCALLTYPE getBindType(SDL_GameControllerButtonBind button)
{
 return button.bindType;
}

23 changes: 23 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -974,3 +974,26 @@ struct Int32CLongStruct
 int32_t i;
 long l;
};

typedef enum
{
 SDL_CONTROLLER_BINDTYPE_NONE = 0,
 SDL_CONTROLLER_BINDTYPE_BUTTON,
 SDL_CONTROLLER_BINDTYPE_AXIS,
 SDL_CONTROLLER_BINDTYPE_HAT
} SDL_GameControllerBindType;

typedef struct SDL_GameControllerButtonBind
{
 SDL_GameControllerBindType bindType;
 union
 {
 int button;
 int axis;
 struct {
 int hat;
 int hat_mask;
 } hat;
 } value;

} SDL_GameControllerButtonBind;

27 changes: 27 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using Xunit;

public class Managed
{
 [DllImport("MarshalStructAsParam")]
 static extern GameControllerBindType getBindType (GameControllerButtonBind button);

 public static int Main()
 {
 GameControllerButtonBind button = new GameControllerButtonBind(GameControllerBindType.ControllerBindtypeAxis, null);
 if (getBindType(button) == GameControllerBindType.ControllerBindtypeAxis)
 {
 Console.WriteLine("\nTEST PASSED!");
 return 100;
 }
 else
 {
 Console.WriteLine("\nTEST FAILED!");
 return 1;
 }
 }
}

14 changes: 14 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="NestedStruct.cs" />
 <Compile Include="GameControllerButtonBind.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <CMakeProjectReference Include="CMakeLists.txt" />
 </ItemGroup>
</Project>

12 changes: 12 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2929,6 +2929,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/SetLastError/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include = "$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -3464,6 +3467,15 @@
 <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
 <Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/NativeLibrary/MainProgramHandle/MainProgramHandleTests/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/DllImportSearchPaths/DllImportSearchPathsTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">
Expand Down

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

Skip to content
[Mono] Fix offset calculation for nested struct, when pinvoke is enabled#91292

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

fanyang-mono
merged 5 commits into

from

Aug 31, 2023
 Merged


[Mono] Fix offset calculation for nested struct, when pinvoke is enabled
#91292
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b6d6db4

Fix offset calculation for nested struct


fanyang-mono Aug 29, 2023
75a844a

Add a test for nested struct with pinvoke


fanyang-mono Aug 30, 2023
4b7011e

Move and update test with real c++ implementation


fanyang-mono Aug 30, 2023
7df731c

Exclude newly added test from wasm


fanyang-mono Aug 30, 2023
3898d7f

Disable interop tests on android and apple devices


fanyang-mono Aug 31, 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


4 changes: 2 additions & 2 deletions
src/mono/mono/mini/mini-amd64.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,7 +357,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 g_assert(info);
 for (guint32 i = 0; i < info->num_fields; ++i) {
 if (MONO_TYPE_ISSTRUCT (info->fields [i].field->type)) {
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, info->fields [i].offset, pinvoke, unicode);
 collect_field_info_nested (mono_class_from_mono_type_internal (info->fields [i].field->type), fields_array, (offset + info->fields [i].offset), pinvoke, unicode);
 } else {
 guint32 align;
 StructFieldInfo f;
Expand All@@ -367,7 +367,7 @@ collect_field_info_nested (MonoClass *klass, GArray *fields_array, int offset, g
 info->fields [i].mspec,
 &align, TRUE, unicode);
 f.offset = offset + info->fields [i].offset;
 if (i == info->num_fields - 1 && f.size + f.offset < info->native_size) {
 if ((i == info->num_fields - 1) && ((f.size + f.offset) < info->native_size)) {
 /* This can happen with .pack directives eg. 'fixed' arrays */
 if (MONO_TYPE_IS_PRIMITIVE (f.type)) {
 /* Replicate the last field to fill out the remaining place, since the code in add_valuetype () needs type information */
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/GameControllerButtonBind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Text;

public unsafe partial struct GameControllerButtonBind
{
 public GameControllerButtonBind
 (
 GameControllerBindType? bindType = null,
 GameControllerButtonBindValue? value = null
 ) : this()
 {
 if (bindType is not null)
 {
 BindType = bindType.Value;
 }

 if (value is not null)
 {
 Value = value.Value;
 }
 }

 public GameControllerBindType BindType;

 public GameControllerButtonBindValue Value;
}

public enum GameControllerBindType : int
{
 ControllerBindtypeNone = 0x0,
 ControllerBindtypeButton = 0x1,
 ControllerBindtypeAxis = 0x2,
 ControllerBindtypeHat = 0x3,
 None = 0x0,
 Button = 0x1,
 Axis = 0x2,
 Hat = 0x3,
}

[StructLayout(LayoutKind.Explicit)]
public unsafe partial struct GameControllerButtonBindValue
{
 [FieldOffset(0)]
 public int Button;

 [FieldOffset(0)]
 public int Axis;

 [FieldOffset(0)]
 public GameControllerButtonBindValueHat Hat;
}

public unsafe partial struct GameControllerButtonBindValueHat
{
 public int Hat;

 public int HatMask;
}

5 changes: 5 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1297,3 +1297,8 @@ extern "C" DLL_EXPORT Int32CLongStruct STDMETHODCALLTYPE AddCLongs(Int32CLongStr
{
 return { lhs.i + rhs.i, lhs.l + rhs.l };
}

extern "C" DLL_EXPORT SDL_GameControllerBindType STDMETHODCALLTYPE getBindType(SDL_GameControllerButtonBind button)
{
 return button.bindType;
}

23 changes: 23 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -974,3 +974,26 @@ struct Int32CLongStruct
 int32_t i;
 long l;
};

typedef enum
{
 SDL_CONTROLLER_BINDTYPE_NONE = 0,
 SDL_CONTROLLER_BINDTYPE_BUTTON,
 SDL_CONTROLLER_BINDTYPE_AXIS,
 SDL_CONTROLLER_BINDTYPE_HAT
} SDL_GameControllerBindType;

typedef struct SDL_GameControllerButtonBind
{
 SDL_GameControllerBindType bindType;
 union
 {
 int button;
 int axis;
 struct {
 int hat;
 int hat_mask;
 } hat;
 } value;

} SDL_GameControllerButtonBind;

27 changes: 27 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using Xunit;

public class Managed
{
 [DllImport("MarshalStructAsParam")]
 static extern GameControllerBindType getBindType (GameControllerButtonBind button);

 public static int Main()
 {
 GameControllerButtonBind button = new GameControllerButtonBind(GameControllerBindType.ControllerBindtypeAxis, null);
 if (getBindType(button) == GameControllerBindType.ControllerBindtypeAxis)
 {
 Console.WriteLine("\nTEST PASSED!");
 return 100;
 }
 else
 {
 Console.WriteLine("\nTEST FAILED!");
 return 1;
 }
 }
}

14 changes: 14 additions & 0 deletions
src/tests/Interop/StructMarshalling/PInvoke/NestedStruct.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <OutputType>exe</OutputType>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="NestedStruct.cs" />
 <Compile Include="GameControllerButtonBind.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
 <CMakeProjectReference Include="CMakeLists.txt" />
 </ItemGroup>
</Project>

12 changes: 12 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2929,6 +2929,9 @@
 <ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/SetLastError/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
 <ExcludeList Include = "$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/64127</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -3464,6 +3467,15 @@
 <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/**">
 <Issue>https://github.com/dotnet/runtime/issues/67359</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/NestedStruct/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/NativeLibrary/MainProgramHandle/MainProgramHandleTests/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/DllImportSearchPaths/DllImportSearchPathsTest/**">
 <Issue>https://github.com/dotnet/runtime/issues/91388</Issue>
 </ExcludeList>
 </ItemGroup>

 <ItemGroup Condition="'$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64'">
Expand Down