Skip to content

Commit 5a55ea6

Browse files
committed
Merge branch 'feature/mac-os-framework-fixes'
2 parents 7f2c0d2 + fdb03b5 commit 5a55ea6

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Ps3DiscDumper/Utils/MacOS/CoreFoundation.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ namespace Ps3DiscDumper.Utils.MacOS;
99
[SupportedOSPlatform("osx")]
1010
public static partial class CoreFoundation
1111
{
12-
private const string AsLibraryName = "ApplicationServices.framework/ApplicationServices";
13-
private const string CfLibraryName = "CoreFoundation.framework/CoreFoundation";
14-
private const string CfLibraryPath = "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
12+
private const string AsLibraryName = "/System/Library/Frameworks/ApplicationServices.framework/Versions/Current/ApplicationServices";
13+
private const string CfLibraryName = "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
1514

1615
public const uint KernSuccess = 0;
1716
public const uint StringEncodingAscii = 0x0600;
@@ -21,7 +20,7 @@ public static partial class CoreFoundation
2120

2221
static CoreFoundation()
2322
{
24-
var library = DlOpen(CfLibraryPath, 0);
23+
var library = DlOpen(CfLibraryName, 0);
2524
TypeDictionaryKeyCallBacks = DlSym(library, "kCFTypeDictionaryKeyCallBacks");
2625
TypeDictionaryValueCallBacks = DlSym(library, "kCFTypeDictionaryValueCallBacks");
2726
}

Ps3DiscDumper/Utils/MacOS/DiskArbitration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Ps3DiscDumper.Utils.MacOS;
88
[SupportedOSPlatform("osx")]
99
public static partial class DiskArbitration
1010
{
11-
private const string LibraryName = "DiskArbitration.framework/DiskArbitration";
11+
private const string LibraryName = "/System/Library/Framework/DiskArbitration.framework/DiskArbitration";
1212

1313
public static readonly IntPtr DescriptionMediaKindKey = CoreFoundation.__CFStringMakeConstantString("DAMediaKind");
1414

Ps3DiscDumper/Utils/MacOS/IOKit.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Ps3DiscDumper.Utils.MacOS;
88
[SupportedOSPlatform("osx")]
99
public static partial class IOKit
1010
{
11-
private const string LibraryName = "IOKit.framework/IOKit";
11+
private const string LibraryName = "/System/Library/Frameworks/IOKit.framework/Versions/Current/IOKit";
1212

1313
public static readonly IntPtr MasterPortDefault = IntPtr.Zero;
1414
public const string BdMediaClass = "IOBDMedia";

0 commit comments

Comments
 (0)