Bluetooth export fix

benbaker76 · Mar 19, 2022 · 569f4b5 · 569f4b5
1 parent a737c32
commit 569f4b5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 29 deletions.
diff --git a/Hackintool.xcodeproj/project.pbxproj b/Hackintool.xcodeproj/project.pbxproj
@@ -721,7 +721,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0384;
+				CURRENT_PROJECT_VERSION = 0385;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -736,7 +736,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.8.4;
+				MARKETING_VERSION = 3.8.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -757,7 +757,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0384;
+				CURRENT_PROJECT_VERSION = 0385;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -772,7 +772,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.8.4;
+				MARKETING_VERSION = 3.8.5;
 				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.h b/Hackintool/AppDelegate.h
@@ -348,7 +348,6 @@ typedef struct
 // Menus
 @property (assign) IBOutlet NSMenuItem *importIORegNativeMenuItem;
 @property (assign) IBOutlet NSMenuItem *importIORegPatchedMenuItem;
-@property (assign) IBOutlet NSMenuItem *currentVersionMenuItem;
 @property (assign) IBOutlet NSMenuItem *macOS_10_13_6_MenuItem;
 @property (assign) IBOutlet NSMenuItem *macOS_10_14_MenuItem;
 @property (assign) IBOutlet NSMenuItem *importKextsToPatchMenuItem;

diff --git a/Hackintool/AppDelegate.m b/Hackintool/AppDelegate.m
@@ -8656,7 +8656,6 @@ - (IBAction)fileImportMenuItemClicked:(id)sender
 
 	if (!state)
 	{
-		[_currentVersionMenuItem setState:false];
 		[_macOS_10_13_6_MenuItem setState:false];
 		[_macOS_10_14_MenuItem setState:false];
 	}
@@ -8850,19 +8849,12 @@ - (IBAction)framebufferMenuItemClicked:(id)sender
 		[_importIORegPatchedMenuItem setState:false];
 	}
 
-	if ([identifier isEqualToString:@"Current Version"])
+	if ([identifier isEqualToString:@"<= macOS 10.13.6"])
 	{
-		[_macOS_10_13_6_MenuItem setState:state];
-		[_macOS_10_14_MenuItem setState:state];
-	}
-	else if ([identifier isEqualToString:@"macOS 10.13.6"])
-	{
-		[_currentVersionMenuItem setState:state];
 		[_macOS_10_14_MenuItem setState:state];
 	}
-	else if ([identifier isEqualToString:@"macOS 10.14"])
+	else if ([identifier isEqualToString:@">= macOS 10.14"])
 	{
-		[_currentVersionMenuItem setState:state];
 		[_macOS_10_13_6_MenuItem setState:state];
 	}
 
@@ -10889,7 +10881,12 @@ - (BOOL)createWindowsBluetoothRegistryFile
 			bluetoothArray = [itemsDictionary objectForKey:@"devices_list"];
 
 			if (bluetoothArray == nil)
-				return NO;
+			{
+				bluetoothArray = [itemsDictionary objectForKey:@"device_not_connected"];
+
+				if (bluetoothArray == nil)
+					return NO;
+			}
 
 			for (NSDictionary *bluetoothDictionary in bluetoothArray)
 			{

diff --git a/Hackintool/Base.lproj/MainMenu.xib b/Hackintool/Base.lproj/MainMenu.xib
@@ -376,19 +376,13 @@
                 <menuItem title="Framebuffer" id="b77-4K-Zij">
                     <menu key="submenu" title="Framebuffer" id="lBS-mO-fIU">
                         <items>
-                            <menuItem title="Local Kexts" identifier="Current Version" id="cJU-Ku-vcs">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="framebufferMenuItemClicked:" target="494" id="uAb-As-YVz"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="&lt;= macOS 10.13.6" identifier="macOS 10.13.6" id="bZg-5b-nBf">
+                            <menuItem title="&lt;= macOS 10.13.6" identifier="&lt;= macOS 10.13.6" id="bZg-5b-nBf">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="framebufferMenuItemClicked:" target="494" id="QlY-3p-Xqt"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="&gt;= macOS 10.14" state="on" identifier="macOS 10.14" id="bOy-Ds-Xb8">
+                            <menuItem title="&gt;= macOS 10.14" state="on" identifier="&gt;= macOS 10.14" id="bOy-Ds-Xb8">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="framebufferMenuItemClicked:" target="494" id="Men-LC-NR7"/>
@@ -8701,7 +8695,6 @@
                 <outlet property="createNVRAMTextView" destination="Tnh-uZ-siK" id="5Of-fD-Al6"/>
                 <outlet property="createNVRAMVariableWindow" destination="ru5-xZ-vEv" id="tcy-J5-bT8"/>
                 <outlet property="currentFBInfoTableView" destination="q6S-jX-yTB" id="jWS-vq-s9D"/>
-                <outlet property="currentVersionMenuItem" destination="cJU-Ku-vcs" id="Hlv-WU-vlA"/>
                 <outlet property="devicePropertiesPatchRadioButton" destination="wMI-gx-20w" id="43h-pV-LC8"/>
                 <outlet property="disableeGPUButton" destination="48b-Oy-BRX" id="Zoy-mc-fau"/>
                 <outlet property="displayInfoTableView" destination="nht-nN-daK" id="G5c-cX-9Lf"/>
@@ -9427,11 +9420,11 @@ Gw
                         <tabViewItems>
                             <tabViewItem label="PayPal" identifier="" id="0MB-mD-nyc">
                                 <view key="view" id="c33-kv-Ina">
-                                    <rect key="frame" x="10" y="19" width="320" height="314"/>
+                                    <rect key="frame" x="10" y="28" width="320" height="305"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="C0n-8o-IkC">
-                                            <rect key="frame" x="32" y="40" width="256" height="256"/>
+                                            <rect key="frame" x="32" y="31" width="256" height="256"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="IconPayPal" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="tf3-3t-lE5">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

diff --git a/Hackintool/USB.m b/Hackintool/USB.m
@@ -872,8 +872,9 @@ void exportUSBPowerSSDT(AppDelegate *appDelegate)
 	NSBundle *mainBundle = [NSBundle mainBundle];
 	NSString *iaslPath = [mainBundle pathForResource:@"iasl" ofType:@"" inDirectory:@"Utilities"];
 	NSString *desktopPath = [NSSearchPathForDirectoriesInDomains(NSDesktopDirectory, NSUserDomainMask, YES) objectAtIndex:0];
-	NSString *tempFilePath = [NSString stringWithFormat:@"%@/SSDT-EC-USBX.dsl", desktopPath];
-	NSString *outputFilePath = [NSString stringWithFormat:@"%@/SSDT-EC-USBX.aml", desktopPath];
+	NSString *fileName = (isOSAtLeastCatalina ? @"SSDT-USBX" : @"SSDT-EC-USBX");
+	NSString *tempFilePath = [NSString stringWithFormat:@"%@/%@.dsl", desktopPath, fileName];
+	NSString *outputFilePath = [NSString stringWithFormat:@"%@/%@.aml", desktopPath, fileName];
 	NSString *stdoutString = nil;
 
 	if ([[NSFileManager defaultManager] fileExistsAtPath:tempFilePath])