IceLake fixes

benbaker76 · May 16, 2021 · 9eec3bc · 9eec3bc
1 parent 6953f58
commit 9eec3bc
Show file tree

Hide file tree

Showing 8 changed files with 320 additions and 296 deletions.
diff --git a/Hackintool.xcodeproj/project.pbxproj b/Hackintool.xcodeproj/project.pbxproj
@@ -717,7 +717,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0355;
+				CURRENT_PROJECT_VERSION = 0356;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -732,7 +732,7 @@
 				INFOPLIST_FILE = "Hackintool/Hackintool-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 3.5.5;
+				MARKETING_VERSION = 3.5.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -753,7 +753,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0355;
+				CURRENT_PROJECT_VERSION = 0356;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -768,7 +768,7 @@
 				INFOPLIST_FILE = "Hackintool/Hackintool-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 3.5.5;
+				MARKETING_VERSION = 3.5.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/...deproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Hackintool/AppDelegate.m b/Hackintool/AppDelegate.m
@@ -4687,6 +4687,8 @@ - (void) updateInfo
 	bool isMobile = false;
 	uint32_t stolenMem = 0, fbMem = 0, unifiedMem = 0;
 	uint32_t maxStolenMem = 0, totalStolenMem = 0, totalCursorMem = 0, maxOverallMem = 0;
+	NSString *intelPlatformIDsString_10_13_6 = getHexStringFromArray([_intelPlatformIDsDictionary_10_13_6 objectForKey:intelGenString]);
+	NSString *intelPlatformIDsString_10_14 = getHexStringFromArray([_intelPlatformIDsDictionary_10_14 objectForKey:intelGenString]);
 
 	[self getMemoryIsMobile:&isMobile StolenMem:&stolenMem FBMem:&fbMem UnifiedMem:&unifiedMem MaxStolenMem:&maxStolenMem TotalStolenMem:&totalStolenMem TotalCursorMem:&totalCursorMem MaxOverallMem:&maxOverallMem];
 
@@ -4704,6 +4706,10 @@ - (void) updateInfo
 	}
 
 	[self addToList:_selectedFBInfoArray name:@"Mobile" value:isMobile ? GetLocalizedString(@"Yes") : GetLocalizedString(@"No")];
+	if (_macOS_10_13_6_MenuItem.state)
+		[self addToList:_selectedFBInfoArray name:@"Intel Platform ID(s)" value:intelPlatformIDsString_10_13_6];
+	else if (_macOS_10_14_MenuItem.state)
+		[self addToList:_selectedFBInfoArray name:@"Intel Platform ID(s)" value:intelPlatformIDsString_10_14];
 	[self addToList:_selectedFBInfoArray name:@"GPU Device ID(s)" value:deviceIDString];
 	[self addToList:_selectedFBInfoArray name:@"Model(s)" value:[self getModelString:platformID]];
 

diff --git a/Hackintool/Base.lproj/MainMenu.xib b/Hackintool/Base.lproj/MainMenu.xib
diff --git a/Hackintool/MiscTools.h b/Hackintool/MiscTools.h
@@ -66,6 +66,7 @@ uint32_t getHexInt(NSString *valueString);
 void sendNotificationTitle(id delegate, NSString *title, NSString *subtitle, NSString *text, NSString *actionButtonTitle, NSString *otherButtonTitle, bool hasActionButton);
 bool tryFormatXML(NSString *rawXML, NSString **xmlString, bool formattingAllowed);
 NSMutableArray *getHexArrayFromString(NSString *hexString);
+NSString *getHexStringFromArray(NSMutableArray *numberArray);
 NSArray *translateArray(NSArray *array);
 NSString *trimNewLine(NSString *string);
 NSString *getUUID();

diff --git a/Hackintool/MiscTools.m b/Hackintool/MiscTools.m
@@ -931,6 +931,23 @@ bool tryFormatXML(NSString *rawXML, NSString **xmlString, bool formattingAllowed
 	return hexValuesArray;
 }
 
+NSString *getHexStringFromArray(NSMutableArray *numberArray)
+{
+	NSMutableString *hexString = [NSMutableString string];
+
+	for (int i = 0; i < [numberArray count]; i++)
+	{
+		NSNumber *number = numberArray[i];
+
+		[hexString appendFormat:@"0x%08X", [number intValue]];
+
+		if (i < [numberArray count] - 1)
+			[hexString appendString:@" "];
+	}
+
+	return hexString;
+}
+
 NSArray *translateArray(NSArray *array)
 {
 	NSMutableArray *resultArray = [NSMutableArray array];

diff --git a/Resources/Framebuffer/macOS 10.13.6/PlatformIDs.plist b/Resources/Framebuffer/macOS 10.13.6/PlatformIDs.plist
@@ -19,7 +19,7 @@
 	<key>Cannon Lake</key>
 	<string>0x5A510009 0x5A400009 0x5A410009 0x5A590009 0x5A490009 0x5A500009 0x5A510000 0x5A400000 0x5A410000 0x5A590000 0x5A490000 0x5A500000 0x5A520000 0x0A010000</string>
 	<key>Ice Lake (LP)</key>
-	<string>0xFF058086 0x8A708086 0x8A518086 0x8A5C8086 0x8A5D8086 0x8A528086 0x8A5A8086 0x8A5B8086</string>
+	<string>0xFF050000 0x8A700000 0x8A510000 0x8A5C0000 0x8A5D0000 0x8A520000 0x8A5A0000 0x8A5B0000</string>
 	<key>Ice Lake (HP)</key>
 	<string>0xFF050000 0x8A510000 0x8A520000</string>
 	<key>Tiger Lake</key>

diff --git a/Resources/Framebuffer/macOS 10.14/PlatformIDs.plist b/Resources/Framebuffer/macOS 10.14/PlatformIDs.plist
@@ -19,7 +19,7 @@
 	<key>Cannon Lake</key>
 	<string></string>
 	<key>Ice Lake (LP)</key>
-	<string>0xFF058086 0x8A708086 0x8A718086 0x8A518086 0x8A5C8086 0x8A5D8086 0x8A528086 0x8A538086 0x8A5A8086 0x8A5B8086</string>
+	<string>0xFF050000 0x8A710000 0x8A700000 0x8A510000 0x8A5C0000 0x8A5D0000 0x8A520000 0x8A530000 0x8A5A0000 0x8A5B0000 0x8A710001 0x8A700001 0x8A510001 0x8A5C0001 0x8A5D0001 0x8A520001 0x8A530001 0x8A5A0001 0x8A5B0001 0x8A510002 0x8A5C0002 0x8A520002 0x8A530002</string>
 	<key>Ice Lake (HP)</key>
 	<string></string>
 	<key>Tiger Lake</key>