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

Handle NativeLibrary.GetExport/Free on libs not loaded through NativeLibrary.*Load* on Mono. #47705

Merged
merged 3 commits into from
Feb 4, 2021
Merged

Handle NativeLibrary.GetExport/Free on libs not loaded through NativeLibrary.*Load* on Mono. #47705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b139c86
Handle NativeLibrary.GetExport on libs loaded with Interop.Kernel32.L…
lateralusX Jan 27, 2021
9b53332
Handle NativeLibrary GetExport/Free using IntPtr library OS handle xp…
lateralusX Feb 1, 2021
ff81c20
Disable additional System.Drawing.Common tests due to missing COM sup…
lateralusX Feb 2, 2021
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
11 changes: 6 additions & 5 deletions src/libraries/System.Drawing.Common/tests/IconTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ public void Save_NullOutputStreamIconData_ThrowsNullReferenceException()

[ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)]
[ConditionalFact(Helpers.IsDrawingSupported)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/47759", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void Save_NullOutputStreamNoIconData_ThrowsArgumentNullException()
{
using (var source = new Icon(Helpers.GetTestBitmapPath("48x48_multiple_entries_4bit.ico")))
Expand All @@ -526,6 +526,7 @@ public void Save_ClosedOutputStreamIconData_ThrowsException()
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/47759", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[ConditionalFact(Helpers.IsDrawingSupported)]
public void Save_ClosedOutputStreamNoIconData_DoesNothing()
{
Expand Down Expand Up @@ -688,7 +689,7 @@ private static Icon GetPngIcon()
}

[ConditionalFact(Helpers.IsDrawingSupported)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/47759", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void FromHandle_IconHandleOneTime_Success()
{
using (var icon1 = new Icon(Helpers.GetTestBitmapPath("16x16_one_entry_4bit.ico")))
Expand All @@ -701,7 +702,7 @@ public void FromHandle_IconHandleOneTime_Success()
}

[ConditionalFact(Helpers.IsDrawingSupported)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/47759", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void FromHandle_IconHandleMultipleTime_Success()
{
using (var icon1 = new Icon(Helpers.GetTestBitmapPath("16x16_one_entry_4bit.ico")))
Expand All @@ -722,7 +723,7 @@ public void FromHandle_IconHandleMultipleTime_Success()
}

[ConditionalFact(Helpers.IsDrawingSupported)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/47759", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void FromHandle_BitmapHandleOneTime_Success()
{
IntPtr handle;
Expand All @@ -739,7 +740,7 @@ public void FromHandle_BitmapHandleOneTime_Success()
}

[ConditionalFact(Helpers.IsDrawingSupported)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/47759", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void FromHandle_BitmapHandleMultipleTime_Success()
{
IntPtr handle;
Expand Down
43 changes: 24 additions & 19 deletions src/mono/mono/metadata/native-library.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,16 +1578,19 @@ ves_icall_System_Runtime_InteropServices_NativeLibrary_FreeLib (gpointer lib, Mo
native_library_lock ();

module = netcore_handle_lookup (lib);
if (!module)
goto leave;

ref_count = mono_refcount_dec (module);
if (ref_count > 0)
goto leave;

g_hash_table_remove (native_library_module_map, module->handle);
g_hash_table_add (native_library_module_blocklist, module);
mono_dl_close (module);
if (module) {
ref_count = mono_refcount_dec (module);
if (ref_count > 0)
goto leave;

g_hash_table_remove (native_library_module_map, module->handle);
g_hash_table_add (native_library_module_blocklist, module);
mono_dl_close (module);
} else {
MonoDl raw_module = { 0 };
raw_module.handle = lib;
mono_dl_close (&raw_module);
}

leave:
native_library_unlock ();
Expand All @@ -1610,16 +1613,18 @@ ves_icall_System_Runtime_InteropServices_NativeLibrary_GetSymbol (gpointer lib,
native_library_lock ();

module = netcore_handle_lookup (lib);
if (!module)
mono_error_set_generic_error (error, "System", "DllNotFoundException", "%p: %s", lib, symbol_name);
goto_if_nok (error, leave);

mono_dl_symbol (module, symbol_name, &symbol);
if (!symbol)
mono_error_set_generic_error (error, "System", "EntryPointNotFoundException", "%s: %s", module->full_name, symbol_name);
goto_if_nok (error, leave);
if (module) {
mono_dl_symbol (module, symbol_name, &symbol);
if (!symbol)
mono_error_set_generic_error (error, "System", "EntryPointNotFoundException", "%s: %s", module->full_name, symbol_name);
} else {
MonoDl raw_module = { 0 };
raw_module.handle = lib;
mono_dl_symbol (&raw_module, symbol_name, &symbol);
if (!symbol)
mono_error_set_generic_error (error, "System", "EntryPointNotFoundException", "%p: %s", lib, symbol_name);
}

leave:
native_library_unlock ();

leave_nolock:
Expand Down