fix: support ios13 on Windows

Author: DimitarTachev

IOSDeviceLib/Declarations.h

@@ -134,13 +134,27 @@ struct FileUploadData {
 
 #pragma region Dll_Type_Definitions
 
-typedef unsigned(__cdecl *device_notification_subscribe_ptr)(void(*f)(const DevicePointer*), long, long, long, HANDLE*);
 
 #ifdef _WIN32
+typedef unsigned(__cdecl *device_notification_subscribe_ptr)(void(*f)(const DevicePointer*), long, long, long, HANDLE*);
 typedef void(__cdecl *run_loop_ptr)();
+typedef void* CFArrayRef;
 typedef void* CFStringRef;
-typedef void* CFURLRef;
 typedef void* CFDictionaryRef;
+typedef void* CFURLRef;
+typedef void* CFPropertyListFormat;
+extern CFPropertyListFormat kCFPropertyListXMLFormat_v1_0;
+typedef void* CFSocketNativeHandle;
+typedef unsigned(__cdecl *device_secure_start_service_ptr)(AMDeviceRef device, CFStringRef service_name, unsigned int *unknown, ServiceConnRef * handle);
+typedef CFSocketNativeHandle(__cdecl *service_connection_get_socket_ptr)(ServiceConnRef con);
+typedef long(__cdecl *service_connection_receive_ptr)(ServiceConnRef, void *, long);
+typedef long(__cdecl *service_connection_send_message_ptr)(ServiceConnRef serviceConnection, CFDictionaryRef message, CFPropertyListFormat format);
+
+extern service_connection_send_message_ptr __AMDServiceConnectionSendMessage;
+extern service_connection_receive_ptr __AMDServiceConnectionReceive;
+
+typedef unsigned(__cdecl *device_create_house_arrest_service_ptr)(const DeviceInfo*, CFStringRef identifier, void * unknown, AFCConnectionRef * handle);
+
 typedef void*(__cdecl *device_copy_device_identifier)(const DeviceInfo*);
 typedef void*(__cdecl *device_copy_value)(const DeviceInfo*, CFStringRef, CFStringRef);
 typedef unsigned(__cdecl *device_uninstall_application)(HANDLE, CFStringRef, void*, void(*f)(), void*);
@@ -153,6 +167,7 @@ typedef unsigned long(__cdecl *cf_get_concrete_type_id)();
 typedef unsigned(__cdecl *cfdictionary_get_count)(CFDictionaryRef);
 typedef void(__cdecl *cfdictionary_get_keys_and_values)(CFDictionaryRef, const void**, const void**);
 typedef CFStringRef(__cdecl *cfstring_create_with_cstring)(void*, const char*, unsigned);
+typedef CFArrayRef(__cdecl *cfarray_create)(void*, const void**, long, void**);
 typedef unsigned(__cdecl *device_secure_operation_with_path)(int, const DeviceInfo*, CFURLRef, CFDictionaryRef, void(*f)(), int);
 typedef unsigned(__cdecl *device_secure_operation_with_bundle_id)(int, const DeviceInfo*, CFStringRef, int, void(*f)(), int);
 typedef void(__cdecl *cfrelease)(CFStringRef);
@@ -183,8 +198,14 @@ typedef int(__cdecl *usb_mux_connect_by_port)(int, int, long long*);
 #pragma region Dll_Method_Definitions
 
 #ifdef _WIN32
+extern HINSTANCE mobile_device_dll;
 #define GET_IF_EXISTS(variable, type, dll, method_name) (variable ? variable : variable = (type)GetProcAddress(dll, method_name))
 
+#define AMDeviceSecureStartService GET_IF_EXISTS(__AMDeviceSecureStartService, device_secure_start_service_ptr, mobile_device_dll, "AMDeviceSecureStartService")
+#define AMDServiceConnectionGetSocket GET_IF_EXISTS(__AMDServiceConnectionGetSocket, service_connection_get_socket_ptr, mobile_device_dll, "AMDServiceConnectionGetSocket")
+#define AMDServiceConnectionReceive GET_IF_EXISTS(__AMDServiceConnectionReceive, service_connection_receive_ptr, mobile_device_dll, "AMDServiceConnectionReceive")
+#define AMDServiceConnectionSendMessage GET_IF_EXISTS(__AMDServiceConnectionSendMessage, service_connection_send_message_ptr, mobile_device_dll, "AMDServiceConnectionSendMessage")
+#define AMDeviceCreateHouseArrestService GET_IF_EXISTS(__AMDeviceCreateHouseArrestService, device_create_house_arrest_service_ptr, mobile_device_dll, "AMDeviceCreateHouseArrestService")
 #define AMDeviceNotificationSubscribe GET_IF_EXISTS(__AMDeviceNotificationSubscribe, device_notification_subscribe_ptr, mobile_device_dll, "AMDeviceNotificationSubscribe")
 #define AMDeviceCopyDeviceIdentifier GET_IF_EXISTS(__AMDeviceCopyDeviceIdentifier, device_copy_device_identifier, mobile_device_dll, "AMDeviceCopyDeviceIdentifier")
 #define AMDeviceCopyValue GET_IF_EXISTS(__AMDeviceCopyValue, device_copy_value, mobile_device_dll, "AMDeviceCopyValue")
@@ -215,6 +236,7 @@ typedef int(__cdecl *usb_mux_connect_by_port)(int, int, long long*);
 #define CFDictionaryGetCount GET_IF_EXISTS(__CFDictionaryGetCount, cfdictionary_get_count, core_foundation_dll, "CFDictionaryGetCount")
 #define CFDictionaryGetKeysAndValues GET_IF_EXISTS(__CFDictionaryGetKeysAndValues, cfdictionary_get_keys_and_values, core_foundation_dll, "CFDictionaryGetKeysAndValues")
 #define CFStringCreateWithCString GET_IF_EXISTS(__CFStringCreateWithCString, cfstring_create_with_cstring, core_foundation_dll, "CFStringCreateWithCString")
+#define CFArrayCreate GET_IF_EXISTS(__CFArrayCreate, cfarray_create, core_foundation_dll, "CFArrayCreate")
 #define CFURLCreateWithString GET_IF_EXISTS(__CFURLCreateWithString, cfurl_create_with_string, core_foundation_dll, "CFURLCreateWithString")
 #define CFDictionaryCreate GET_IF_EXISTS(__CFDictionaryCreate, cfdictionary_create, core_foundation_dll, "CFDictionaryCreate")
 #define CFRelease GET_IF_EXISTS(__CFRelease, cfrelease, core_foundation_dll, "CFRelease")

IOSDeviceLib/IOSDeviceLib.cpp

@@ -25,6 +25,7 @@
 #ifdef _WIN32
 #pragma region Dll_Variable_Definitions
 
+CFPropertyListFormat kCFPropertyListXMLFormat_v1_0 = (CFPropertyListFormat)100;
 device_notification_subscribe_ptr __AMDeviceNotificationSubscribe;
 HINSTANCE mobile_device_dll;
 HINSTANCE core_foundation_dll;
@@ -34,6 +35,11 @@ device_copy_value __AMDeviceCopyValue;
 device_start_service __AMDeviceStartService;
 device_uninstall_application __AMDeviceUninstallApplication;
 device_secure_operation_with_bundle_id __AMDeviceSecureUninstallApplication;
+device_secure_start_service_ptr __AMDeviceSecureStartService;
+service_connection_get_socket_ptr __AMDServiceConnectionGetSocket;
+service_connection_receive_ptr __AMDServiceConnectionReceive;
+service_connection_send_message_ptr __AMDServiceConnectionSendMessage;
+device_create_house_arrest_service_ptr __AMDeviceCreateHouseArrestService;
 device_connection_operation __AMDeviceStartSession;
 device_connection_operation __AMDeviceStopSession;
 device_connection_operation __AMDeviceConnect;
@@ -57,6 +63,7 @@ cf_get_concrete_type_id __CFDictionaryGetTypeID;
 cfdictionary_get_count __CFDictionaryGetCount;
 cfdictionary_get_keys_and_values __CFDictionaryGetKeysAndValues;
 cfstring_create_with_cstring __CFStringCreateWithCString;
+cfarray_create __CFArrayCreate;
 cfurl_create_with_string __CFURLCreateWithString;
 cfdictionary_create __CFDictionaryCreate;
 cfrelease __CFRelease;
@@ -365,7 +372,7 @@ std::mutex start_service_mutex;
 ServiceInfo start_secure_service(std::string device_identifier, const char* service_name, std::string method_id, bool should_log_error, bool skip_cache)
 {
     start_service_mutex.lock();
-    ServiceInfo serviceInfoResult;
+	ServiceInfo serviceInfoResult = {};
     if (!devices.count(device_identifier))
     {
         if (should_log_error)
@@ -454,10 +461,13 @@ AFCConnectionRef start_house_arrest(std::string device_identifier, const char* a
 HANDLE start_debug_server(std::string device_identifier, std::string ddi, std::string method_id)
 {
 	ServiceInfo info = start_secure_service(device_identifier, kDebugServer, method_id, false, false);
+	// mount_image is not available on Windows
+#ifndef _WIN32
 	if (!info.socket && mount_image(device_identifier, ddi, method_id))
 	{
 		info = start_secure_service(device_identifier, kDebugServer, method_id, true, false);
 	}
+#endif
 
 	return info.socket;
 }