AssetRipper/NativeFileDialogs.NET
1
0 Fork 0
mirror of https://github.com/AssetRipper/NativeFileDialogs.NET.git synced 2026-11-13 20:05:46 -10:00
Code Issues Packages Projects Releases Wiki Activity

Fix string marshalling on Windows

Browse Source
This commit is contained in:
Jeremy Pritts committed 2023-12-09 03:10:54 -05:00
1 parent 92ddd55a44
commit 970c846e38
12 files changed
+847 -617
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

NativeFileDialogs.Net/NativeFileDialogs.Net.csproj
+1 -1
View File
@@ -22,7 +22,7 @@
</PropertyGroup>
<ItemGroup Label="Package References">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
NativeFileDialogs.Net/Nfd.cs
+12 -12
View File
@@ -15,13 +15,13 @@ public static class Nfd
public static NfdStatus OpenDialog(out string? outPath, IDictionary<string, string>? filters = null, string? defaultPath = null)
{
manager.PushDialog();
NfdnfilteritemT[] filterItems = ToFilterItems(filters);
Nfdu8filteritemT[] filterItems = ToFilterItems(filters);
NfdStatus status;
unsafe
{
sbyte* outPathPtr;
status = nfd.NFD_OpenDialogN(&outPathPtr, filterItems, (uint)filterItems.Length, defaultPath).ToNfdStatus();
status = nfd.NFD_OpenDialogU8(&outPathPtr, filterItems, (uint)filterItems.Length, defaultPath).ToNfdStatus();
outPath = status == NfdStatus.Cancelled ? null : new string(outPathPtr);
}
@@ -32,13 +32,13 @@ public static class Nfd
public static NfdStatus OpenDialogMultiple(out string[]? outPaths, IDictionary<string, string>? filters = null, string? defaultPath = null)
{
manager.PushDialog();
NfdnfilteritemT[] filterItems = ToFilterItems(filters);
Nfdu8filteritemT[] filterItems = ToFilterItems(filters);
NfdStatus status;
unsafe
{
IntPtr pathSet;
status = nfd.NFD_OpenDialogMultipleN(&pathSet, filterItems, (uint)filterItems.Length, defaultPath).ToNfdStatus();
status = nfd.NFD_OpenDialogMultipleU8(&pathSet, filterItems, (uint)filterItems.Length, defaultPath).ToNfdStatus();
if (status == NfdStatus.Ok)
{
@@ -49,7 +49,7 @@ public static class Nfd
for (uint i = 0; i < count; i++)
{
sbyte* pathPtr;
nfd.NFD_PathSetGetPathN(pathSet, i, &pathPtr);
nfd.NFD_PathSetGetPathU8(pathSet, i, &pathPtr);
outPaths[i] = new string(pathPtr);
}
@@ -73,7 +73,7 @@ public static class Nfd
unsafe
{
sbyte* outPathPtr;
status = nfd.NFD_PickFolderN(&outPathPtr, defaultPath).ToNfdStatus();
status = nfd.NFD_PickFolderU8(&outPathPtr, defaultPath).ToNfdStatus();
outPath = status == NfdStatus.Cancelled ? null : new string(outPathPtr);
}
@@ -84,13 +84,13 @@ public static class Nfd
public static NfdStatus SaveDialog(out string? savePath, IDictionary<string, string>? filters = null, string defaultName = "Untitled", string? defaultPath = null)
{
manager.PushDialog();
NfdnfilteritemT[] filterItems = ToFilterItems(filters);
Nfdu8filteritemT[] filterItems = ToFilterItems(filters);
NfdStatus status;
unsafe
{
sbyte* savePathPtr;
status = nfd.NFD_SaveDialogN(&savePathPtr, filterItems, (uint)filterItems.Length, defaultPath, defaultName).ToNfdStatus();
status = nfd.NFD_SaveDialogU8(&savePathPtr, filterItems, (uint)filterItems.Length, defaultPath, defaultName).ToNfdStatus();
savePath = status == NfdStatus.Cancelled ? null : new string(savePathPtr);
}
@@ -98,16 +98,16 @@ public static class Nfd
return status;
}
internal static NfdnfilteritemT[] ToFilterItems(IDictionary<string, string>? filters)
internal static Nfdu8filteritemT[] ToFilterItems(IDictionary<string, string>? filters)
{
if (filters == null)
return Array.Empty<NfdnfilteritemT>();
return Array.Empty<Nfdu8filteritemT>();
NfdnfilteritemT[] filterItems = new NfdnfilteritemT[filters.Count];
Nfdu8filteritemT[] filterItems = new Nfdu8filteritemT[filters.Count];
int i = 0;
foreach ((string key, string value) in filters)
{
filterItems[i++] = new NfdnfilteritemT
filterItems[i++] = new Nfdu8filteritemT
{
Name = key,
Spec = value,