Various changes.

Author: kennytm

IOKit/hid/IOHIDService.h

@@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 extern "C" {
 #endif
 
-	typedef struct __IOHIDDisplay
+	typedef struct __IOHIDService
 #if 0
 	{
 		CFRuntimeBase _base;	// 0, 4

TextInput/KBString.hpp

@@ -63,7 +63,7 @@ namespace KB {
 		~String();	///< Destructor.
 
 		/// Create a string with external/internal buffer.
-		String(StringBufferType buffer_type, const char* str, uint16_t size, uint16_t length, uint16_t sort_key_length);
+		String(StringBufferType buffer_type, const char* data_file, uint16_t size, uint16_t length, uint16_t sort_key_length);
 
 		/// Assignment operators.
 		String& operator=(const char* str);

TextInput/KBWordTrie.hpp

@@ -74,7 +74,7 @@ namespace KB {
 		static Hashmap<unsigned, String> g_cached_sort_keys_for_letter_forms;
 
 		unsigned m_single_primaries_to_letter[256];
-		bool m_is_known_lead_primary[256];
+		uint8_t m_is_known_lead_primary[256];
 		Hashmap<String, unsigned> m_sort_keys_to_letter_forms;
 	};
 
@@ -88,7 +88,7 @@ namespace KB {
 
 		void set_custom_capitalization();
 		void move_capitalization_to_bits();
-		void parse_substitution_list(ReadOnlyDataFile& dat_file, unsigned offset, const String&, unsigned sort_key_length);
+		void parse_substitution_list(ReadOnlyDataFile& dat_file, unsigned offset, const String& string, unsigned sort_key_length);
 		String capitalized_string() const;
 
 		Word();	///< Create an empty word.
@@ -99,7 +99,7 @@ namespace KB {
 		///   <byte = h> [if h & 4, <byte = a if not flag & 512, a * 255 else>] [if h & 32, <byte = c>. If c & 1, cap_mask is set to 1]
 		///      [if h & 1, <unsigned = cap_mask>] [if h & 64, <unsigned = d>] [if not flag & 2048 or h & 8 or c & 48, <unsigned short = SSSSSS.....KKKKK> ]
 		///      [if h & 16, <null-terminated-string = string>, else if not h & 8, string = lettersForSortKey(sort_key), else parse_substitution_list(dat_file, "offset", ?, sort_key_length) ]
-		Word(ReadOnlyDataFile& dat_file, unsigned x, const String& sort_key, const SortKeyByteConverter&, unsigned flag);
+		Word(ReadOnlyDataFile& dat_file, unsigned offset, const String& sort_key, const SortKeyByteConverter&, unsigned compilation_flag);
 
 		const String& string() const { return m_string; }
 		float probability() const { return word.probability; }
@@ -181,14 +181,66 @@ namespace KB {
 		} freqNword;
 		unsigned char patricia_key_bytes[4];
 
-		// void parse_trie_sibling_binary(const char* arg1, const char* arg2);
+	private:
+		const char* parse_trie_sibling_binary(const char* child, const char* data)	// returns the address of the next sibling.
+#if 0
+		{
+			int cur_child_offset = child - data;
+			
+			this->sortNchild.v2bytes.flags_byte = *child++;
+			
+			for (unsigned i = 0; i <= this->sortNchild.v2fields.patricia_key_size_1; ++ i) {
+				this->patricia_key_bytes[i] = *child++;
+			}
+			
+			switch (this->sortNchild.v2fields.has_child_offset_type) {
+				case 1:
+					this->sortNchild.v2fields.child_offset = cur_child_offset + (*child++);
+					break;
+				case 2:
+					this->sortNchild.v2fields.child_offset = cur_child_offset + unsigned_short_at(child);
+					child += 2;
+					break;
+				case 3:
+					// note: no addition.
+					this->sortNchild.v2fields.child_offset = (read 3 bytes from child);
+					child += 3;
+					break;
+			}
+			
+			if (has_freq bit is cleared) {
+				this->freqNword.v2fields.compacted_freq = 0xff;
+			} else {
+				this->freqNword.v2fields.compacted_freq = 1 + *child++;
+			}
+			
+			if (has_unigram_list_offset bit is cleared) {
+				if (has_word_termination_prob bit is set) {
+					this->freqNword.fields.word_offset = 1 + **child++
+				}
+			} else {
+				this->freqNword.fields.word_[offset,is_0freq] = (read 3 bytes from child);
+				child += 3;
+			}
+			
+			if (more_sibling bit is set) {
+				return child;
+			} else
+				return NULL;			
+		}
+#endif
+		;
 
-		bool finishesWords() const {
+		bool finishesWords() const
+#if 0
+		{
 			if (sortNchild.v2fields.child_offset != 0 || freqNword.fields.compacted_freq == 0 || freqNword.fields.word_is_0freq)
 				return sortNchild.v2fields.has_word_termination_prob || sortNchild.v2fields.has_unigram_list_offset;
 			else
 				return true;
 		}
+#endif
+		;
 	};	
 
 #pragma mark -
@@ -258,6 +310,78 @@ namespace KB {
 		char l, m;
 	};
 
+	class WordTrieNode {
+	private:
+		WordTrieNode(ReadOnlyDataFile* data_file, const char*, TrieSearchType type);
+		WordTrieNode(ReadOnlyDataFile* data_file, unsigned int root_offset);
+		WordTrieNode();
+		
+		WordTrieNode advance(unsigned char input, TrieSearchType search_type) const;
+#if 0
+		{
+			const char* child_addr = this->trie_addr(this->sibling.child_offset);
+			RefPtr<WordTrieNode> child_b = NULL;
+			RefPtr<WordTrieNode> child_refptr = NULL;
+			
+			// begin:
+			for (; child_addr != NULL && r6 != 256; ++ r6, child_addr = next_child_addr ) {
+				
+				PackedTrieSibling sibling;
+				next_child_addr = sibling.parse_trie_sibling_binary(child_addr, data_file->m_data);
+				
+				char first_pat_char = sibling.pat_key[0];
+				bool matches;
+				TrieSearchType child_search_type;
+				
+				if (search_type == Exact) {
+					matches = (first_pat_char == input);
+					child_search_type = search_type;
+				} else if (search_type == Fuzzy) {
+					child_search_type = this->trie_search_type;
+					if (this->trie_search_type != Fuzzy && first_pat_char == input)
+						matches = true;
+					else {
+						matches = keyboard_sort_key_match(first_pat_char, input);
+						child_search_type = Fuzzy;
+					}
+				} else {
+					assert(false);
+				}
+				
+				if (match) {
+					RefPtr<WordTrieNode> child_a = WordTrieNode::create(this->data_file, child_addr, child_search_type);
+					if (child_b == NULL) {
+						child_refptr = child_a;
+						child_b = child_refptr;
+					} else {
+						child_refptr->m = child_a;
+						child_refptr = child_a;
+					}
+					// deref child_a.
+				}
+			}
+			if (child_b == NULL)
+				child_b = new WordTrieNode;
+			return child_b;
+			// deref stuff.
+		}
+#endif
+		
+		static WordTrieNode* create(ReadOnlyDataFile* data_file, const char*, TrieSearchType type);	///< Just calls the constructor.
+		static WordTrieNode* create(ReadOnlyDataFile* data_file, unsigned int offset);	///< Just calls the constructor.
+		bool not_valid(void) const;
+		const char* trie_addr(unsigned int child_offset) const;	// returns : data_file->m_data + child_offset.
+		
+	private:
+		int one;
+		char b;
+		ReadOnlyDataFile* data_file;
+		const char* data_ptr;
+		int parse_result;
+		TrieSearchType trie_search_type;
+		PackedTrieSibling sibling;
+		WTF::RefPtr<WordTrieNode> m;
+	};
 
 	class WordTrie {
 	public:
@@ -305,11 +429,11 @@ namespace KB {
 
 		float probability_sum_for_V2_words_at(unsigned) const;
 
-		void recurse_matching_words_for_node(Vector<Word>&, WordTrieNode*, unsigned, int, bool) const;
+		void recurse_matching_words_for_node(Vector<Word>& res, WordTrieNode* node, unsigned offset, int the_int, bool perform_match) const;
 		void fill_vector_with_trie_children_at(unsigned, Vector<DictionaryCursors>&) const;
 		bool advance_static_cursor_to_next_patricia_node(DictionaryCursors& cursors, unsigned char tag, unsigned address) const;
 
-		Word word_at(unsigned, unsigned&, const String&) const;
+		Word word_at(unsigned offset, unsigned& res_offset, const String& sort_key) const;
 
 
 	private:
@@ -327,7 +451,7 @@ namespace KB {
 		unsigned m_trie_root_offset;	// 1ad4
 		float m_root_usage_sum;	// 1ad8
 		SortKeyByteConverter m_sort_key_converter;	// 1adc (sizeof = 524)
-	};	// sizeof = 1ff0.
+	};	// sizeof = 2000.
 }
 
 #endif

UIKit/UIBookViewController.h

@@ -12,8 +12,17 @@
 #import <UIKit/UIViewController.h>
 #import <UIKit/UIGeometry.h>
 
-@protocol UIBookViewControllerDelegate;
-@class UIView;
+@class UIView, UIBookViewController;
+
+@protocol UIBookViewControllerDelegate
+@required
+// Returns the next page given the previous page (in the same side as the previous page).
+-(UIViewController*)bookViewController:(UIBookViewController*)bookViewController nextPage:(UIViewController*)oldPage;
+-(UIViewController*)bookViewController:(UIBookViewController*)bookViewController previousPage:(UIViewController*)oldPage;
+@optional
+-(void)bookViewController:(UIBookViewController*)bookViewController willBeginTurningPages:(int)pages animated:(BOOL)animated;
+-(void)bookViewController:(UIBookViewController*)bookViewController didEndTurningPages:(int)pages animated:(BOOL)animated;
+@end
 
 @interface UIBookViewController : UIViewController {
 @private
@@ -30,8 +39,8 @@
 	double _turnDuration;
 }
 @property(assign, nonatomic) id<UIBookViewControllerDelegate> delegate;
-@property(retain, nonatomic) UIViewController* oddPage;
-@property(retain, nonatomic) UIViewController* evenPage;
+@property(retain, nonatomic) UIViewController* oddPage;	// = right page
+@property(retain, nonatomic) UIViewController* evenPage;	// = left page
 @property(assign, nonatomic) float turnMargin;
 @property(assign, nonatomic) UIEdgeInsets contentInset;
 @property(assign, nonatomic) double turnDuration;

UIKit/UIKit-Structs.h

@@ -275,7 +275,7 @@ typedef struct {
 	int startContentOrientation;
 	CGRect startContentBounds;
 	CGRect endContentBounds;
-} XXStruct_Nw9VXC;
+} XXStruct_Nw9VXC, XXStruct_t5OlHA;
 
 typedef struct {
 	UIImage* background;
@@ -284,8 +284,7 @@ typedef struct {
 	UIColor* textColor;
 	UIColor* shadowColor;
 	CGSize shadowOffset;
-} XXStruct_KYn_rD;
-typedef XXStruct_KYn_rD XXStruct_V3NSMA;
+} XXStruct_KYn_rD, XXStruct_V3NSMA;
 
 typedef struct {
 	UIFont* _field1;

UIKit/UIView2.h

@@ -167,9 +167,9 @@
 -(void)_removeAllAnimations:(BOOL)animations;
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_3_2
 +(BOOL)_isInAnimationBlock;
-+(void)_setAnimationAttributes:(id)attributes;
-+(void)_setAnimationFilter:(int)filter forView:(id)view;
-+(void)_setAnimationFilterValue:(float)value;
++(void)_setAnimationAttributes:(id<CAMediaTiming>)attributes;
++(void)_setAnimationFilter:(int)filter forView:(UIView*)view;
++(void)_setAnimationFilterValue:(CGFloat)value;
 -(void)_clearAnimationFilters;
 #else
 +(BOOL)_pendingAnimations;

UIKit/UIViewAnimationState.h

@@ -8,6 +8,7 @@
 #import <Availability2.h>
 
 @class UIView, NSString;
+@protocol CAMediaTiming;
 
 @interface UIViewAnimationState : NSObject {
 	UIViewAnimationState* _nextState;
@@ -43,7 +44,7 @@
 +(void)pushViewAnimationState:(id)state context:(void*)context;
 +(void)popAnimationState;
 -(void)dealloc;
--(void)setAnimationAttributes:(id)attributes;
+-(void)setAnimationAttributes:(id<CAMediaTiming>)attributes;	// save the attributes of the animation state *into* the argument.
 -(void)animationDidStart:(id)animation;
 -(void)sendDelegateAnimationDidStop:(id)sendDelegateAnimation finished:(BOOL)finished;
 -(void)animationDidStop:(id)animation finished:(BOOL)finished;

UIKit/UIWindow2.h

@@ -171,10 +171,15 @@
 -(void)window:(UIWindow*)window willAnimateSecondHalfOfRotationFromInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration;
 -(void)window:(UIWindow*)window didRotateFromInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;
 -(BOOL)shouldWindowUseOnePartInterfaceRotationAnimation:(UIWindow*)window;
--(void)getRotationContentSettings:(XXStruct_TF$i3B*)settings forWindow:(UIWindow*)window;
 -(UIView*)rotatingContentViewForWindow:(UIWindow*)window;
 -(UIView*)rotatingHeaderViewForWindow:(UIWindow*)window;
 -(UIView*)rotatingFooterViewForWindow:(UIWindow*)window;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_3_2
+-(id)clientsForRotationForWindow:(UIWindow*)window;
+-(void)getRotationContentSettings:(XXStruct_t5OlHA*)settings forWindow:(UIWindow*)window;
+#else
+-(void)getRotationContentSettings:(XXStruct_TF$i3B*)settings forWindow:(UIWindow*)window;
+#endif
 @end
 
 @interface UIWindow (UITextEffectsWindowAdditions)

liblockdown.h

@@ -68,7 +68,7 @@ extern "C" {
 	extern CFStringRef kLDErrorSessionInactive;
 	extern CFStringRef kLDErrorSetProhibited;
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_2_2
-	extern CFStringRef kLDErrorCheckinConnectionFailed
+	extern CFStringRef kLDErrorCheckinConnectionFailed;
 	extern CFStringRef kLDErrorCheckinOutOfMemory;
 	extern CFStringRef kLDErrorCheckinReceiveFailed;
 	extern CFStringRef kLDErrorCheckinResponseFailed;
@@ -421,7 +421,7 @@ extern "C" {
 		void* info;
 	}*/* LockdownServiceRef;
 
-	typedef void(*LockdownServiceCallback)(LcokdownServiceRef service, CFSocketCallBackType cbType, void* info);
+	typedef void(*LockdownServiceCallback)(LockdownServiceRef service, CFSocketCallBackType cbType, void* info);
 
 	CFTypeID LockdownServiceGetTypeID();