cocoa-coredata-webkit.patch 10 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378
  1. --- /Data/dev/cocoa/parsedheaders/newheaders3/appkit/NSWorkspace.inc 2010-09-22 20:20:31.000000000 +0200
  2. +++ cocoa-skel/src/appkit/NSWorkspace.inc 2010-09-22 23:57:57.000000000 +0200
  3. @@ -26,7 +26,7 @@
  4. NSWorkspaceLaunchNewInstance = $00080000;
  5. NSWorkspaceLaunchAndHide = $00100000;
  6. NSWorkspaceLaunchAndHideOthers = $00200000;
  7. - NSWorkspaceLaunchAllowingClassicStartup = 2097153;
  8. + NSWorkspaceLaunchDefault = NSWorkspaceLaunchAsync or NSWorkspaceLaunchAllowingClassicStartup;
  9. const
  10. NSExcludeQuickDrawElementsIconCreationOption = 1 shl 1;
  11. --- /Data/dev/cocoa/parsedheaders/newheaders3/foundation/NSGeometry.inc 2010-09-22 20:21:06.000000000 +0200
  12. +++ cocoa-skel/src/foundation/NSGeometry.inc 2010-09-22 23:57:57.000000000 +0200
  13. @@ -6,57 +6,51 @@
  14. {$ifndef NSGEOMETRY_PAS_T}
  15. {$define NSGEOMETRY_PAS_T}
  16. +{$if defined(cpu64) or defined(cpuarm) or defined(win32)}
  17. { Types }
  18. type
  19. NSPoint = CGPoint;
  20. NSPointPtr = ^NSPoint;
  21. - NSPointPointer = ^NSPoint;
  22. - NSPointPointerPtr = ^NSPointPointer;
  23. + NSPointPointer = ^NSPointPtr;
  24. NSPointArray = ^NSPoint;
  25. - NSPointArrayPtr = ^NSPointArray;
  26. NSSize = CGSize;
  27. NSSizePtr = ^NSSize;
  28. - NSSizePointer = ^NSSize;
  29. - NSSizePointerPtr = ^NSSizePointer;
  30. + NSSizePointer = NSSizePtr;
  31. NSSizeArray = ^NSSize;
  32. - NSSizeArrayPtr = ^NSSizeArray;
  33. NSRect = CGRect;
  34. NSRectPtr = ^NSRect;
  35. - NSRectPointer = ^NSRect;
  36. - NSRectPointerPtr = ^NSRectPointer;
  37. + NSRectPointer = NSRectPtr;
  38. NSRectArray = ^NSRect;
  39. - NSRectArrayPtr = ^NSRectArray;
  40. - NSRectEdge = NSUInteger;
  41. - NSRectEdgePtr = ^NSRectEdge;
  42. - NSPointPointer = ^NSPoint;
  43. - NSPointPointerPtr = ^NSPointPointer;
  44. - NSPointArray = ^NSPoint;
  45. - NSPointArrayPtr = ^NSPointArray;
  46. - NSSizePointer = ^NSSize;
  47. - NSSizePointerPtr = ^NSSizePointer;
  48. - NSSizeArray = ^NSSize;
  49. - NSSizeArrayPtr = ^NSSizeArray;
  50. - NSRectPointer = ^NSRect;
  51. - NSRectPointerPtr = ^NSRectPointer;
  52. - NSRectArray = ^NSRect;
  53. - NSRectArrayPtr = ^NSRectArray;
  54. { Defines }
  55. -const
  56. - NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES = 1;
  57. +{$define NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES}
  58. +
  59. +{$endif cpu64 or cpuarm or win32}
  60. { Types }
  61. type
  62. -
  63. +{$ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES}
  64. + NSRectEdge = NSUInteger;
  65. +{$else}
  66. NSRectEdge = culong;
  67. +{$endif}
  68. + NSRectEdgePtr = ^NSRectEdge;
  69. { Constants }
  70. +{$ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES}
  71. +const
  72. + NSMinXEdge = CGRectMinXEdge;
  73. + NSMinYEdge = CGRectMinYEdge;
  74. + NSMaxXEdge = CGRectMaxXEdge;
  75. + NSMaxYEdge = CGRectMaxYEdge;
  76. +{$else NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES}
  77. const
  78. NSMinXEdge = 0;
  79. NSMinYEdge = 1;
  80. NSMaxXEdge = 2;
  81. NSMaxYEdge = 3;
  82. +{$endif NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES}
  83. {$endif}
  84. {$endif}
  85. @@ -66,30 +60,37 @@
  86. {$define NSGEOMETRY_PAS_R}
  87. { Records }
  88. +{$ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES}
  89. type
  90. _NSPoint = record
  91. x: CGFloat;
  92. y: CGFloat;
  93. end;
  94. -NSPoint = _NSPoint;
  95. -_NSPointPtr = ^_NSPoint;
  96. + NSPoint = _NSPoint;
  97. + NSPointPtr = ^NSPoint;
  98. + NSPointPointer = NSPointPtr;
  99. + NSPointArray = ^NSPoint;
  100. type
  101. _NSSize = record
  102. width: CGFloat;
  103. height: CGFloat;
  104. end;
  105. -NSSize = _NSSize;
  106. -_NSSizePtr = ^_NSSize;
  107. + NSSize = _NSSize;
  108. + NSSizePtr = ^NSSize;
  109. + NSSizePointer = NSSizePtr;
  110. + NSSizeArray = ^NSSize;
  111. type
  112. _NSRect = record
  113. origin: NSPoint;
  114. size: NSSize;
  115. end;
  116. -NSRect = _NSRect;
  117. -_NSRectPtr = ^_NSRect;
  118. -
  119. + NSRect = _NSRect;
  120. + NSRectPtr = ^NSRect;
  121. + NSRectPointer = NSRectPtr;
  122. + NSRectArray = ^NSRect;
  123. +{$endif not NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES}
  124. {$endif}
  125. {$endif}
  126. --- /Data/dev/cocoa/parsedheaders/newheaders3/foundation/NSObjCRuntime.inc 2010-09-22 20:21:06.000000000 +0200
  127. +++ cocoa-skel/src/foundation/NSObjCRuntime.inc 2010-09-22 23:57:57.000000000 +0200
  128. @@ -8,7 +8,6 @@
  129. { Defines }
  130. const
  131. - NS_BLOCKS_AVAILABLE = 1;
  132. NS_BLOCKS_AVAILABLE = 0;
  133. NSFoundationVersionNumber10_0 = 397.40;
  134. NSFoundationVersionNumber10_1 = 425.00;
  135. @@ -62,16 +61,21 @@
  136. { Types }
  137. type
  138. +{$if defined(cpu64) or defined(cpuarm) or defined(win32)}
  139. NSInteger = clong;
  140. - NSIntegerPtr = ^NSInteger;
  141. NSUInteger = culong;
  142. - NSUIntegerPtr = ^NSUInteger;
  143. +{$else}
  144. NSInteger = cint;
  145. - NSIntegerPtr = ^NSInteger;
  146. NSUInteger = cuint;
  147. +{$endif}
  148. + NSIntegerPtr = ^NSInteger;
  149. NSUIntegerPtr = ^NSUInteger;
  150. NSComparisonResult = NSInteger;
  151. NSComparisonResultPtr = ^NSComparisonResult;
  152. + NSEnumerationOptions = NSUInteger;
  153. + NSEnumerationOptionsPtr = ^NSEnumerationOptions;
  154. + NSSortOptions = NSUInteger;
  155. + NSSortOptionsPtr = ^NSSortOptions;
  156. { Constants }
  157. @@ -81,6 +85,18 @@
  158. NSOrderedDescending = 1;
  159. const
  160. + NSEnumerationConcurrent = 1 shl 0;
  161. + NSEnumerationReverse = 1 shl 1;
  162. +
  163. +const
  164. + NSSortConcurrent = 1 shl 0;
  165. + NSSortStable = 1 shl 4;
  166. +
  167. +const
  168. + NSIntegerMax = high(NSInteger);
  169. + NSIntegerMin = low(NSInteger);
  170. + NSUIntegerMin = low(NSUinteger);
  171. + NSUIntegerMax = high(NSUinteger);
  172. NSNotFound = NSIntegerMax;
  173. {$endif}
  174. --- /Data/dev/cocoa/parsedheaders/newheaders3/foundation/NSPointerFunctions.inc 2010-09-22 20:21:06.000000000 +0200
  175. +++ cocoa-skel/src/foundation/NSPointerFunctions.inc 2010-09-22 23:57:57.000000000 +0200
  176. @@ -25,7 +25,8 @@
  177. { Types }
  178. type
  179. NSPointerFunctionsOptions = NSUInteger;
  180. - NSPointerFunctionsOptionsPtr = ^NSPointerFunctionsOptions;
  181. + NSPointerFunctionsOptionsPointer = ^NSPointerFunctionsOptions;
  182. + NSPointerFunctionsOptionsPtr = NSPointerFunctionsOptionsPointer;
  183. {$endif}
  184. {$endif}
  185. @@ -53,8 +54,7 @@
  186. {$ifdef FORWARD}
  187. NSPointerFunctions = objcclass;
  188. - NSPointerFunctionsPointer = ^NSPointerFunctions;
  189. - NSPointerFunctionsPtr = NSPointerFunctionsPointer;
  190. + NSPointerFunctionsPtr = ^NSPointerFunctions;
  191. {$endif}
  192. @@ -70,6 +70,7 @@
  193. function initWithOptions(options: NSPointerFunctionsOptions): id; message 'initWithOptions:';
  194. class function pointerFunctionsWithOptions(options: NSPointerFunctionsOptions): id; message 'pointerFunctionsWithOptions:';
  195. +(*
  196. procedure setItem (newValue: NSUInteger); message 'setItem:';
  197. function item: NSUInteger; message 'item';
  198. procedure setItem1 (newValue: Boolean); message 'setItem1:';
  199. @@ -80,6 +81,7 @@
  200. function : NSUInteger; message '';
  201. procedure setSrc (newValue: Pointer); message 'setSrc:';
  202. function src: Pointer; message 'src';
  203. +*)
  204. procedure setUsesStrongWriteBarrier (newValue: Boolean); message 'setUsesStrongWriteBarrier:';
  205. function usesStrongWriteBarrier: Boolean; message 'usesStrongWriteBarrier';
  206. procedure setUsesWeakReadAndWriteBarriers (newValue: Boolean); message 'setUsesWeakReadAndWriteBarriers:';
  207. --- /Data/dev/cocoa/parsedheaders/newheaders3/foundation/NSRange.inc 2010-09-22 20:21:06.000000000 +0200
  208. +++ cocoa-skel/src/foundation/NSRange.inc 2010-09-22 23:57:57.000000000 +0200
  209. @@ -6,11 +6,6 @@
  210. {$ifndef NSRANGE_PAS_T}
  211. {$define NSRANGE_PAS_T}
  212. -{ Types }
  213. -type
  214. - NSRangePointer = ^NSRange;
  215. - NSRangePointerPtr = ^NSRangePointer;
  216. -
  217. {$endif}
  218. {$endif}
  219. @@ -25,7 +20,8 @@
  220. length: NSUInteger;
  221. end;
  222. NSRange = _NSRange;
  223. -_NSRangePtr = ^_NSRange;
  224. +NSRangePtr = ^NSRange;
  225. +NSRangePointer = NSRangePtr;
  226. {$endif}
  227. diff -ur org/src/appkit/NSEvent.inc src/appkit/NSEvent.inc
  228. --- org/src/appkit/NSEvent.inc 2011-08-06 19:42:46.000000000 +0200
  229. +++ cocoa-skel/src/appkit/NSEvent.inc 2011-08-06 19:50:06.000000000 +0200
  230. @@ -235,6 +235,9 @@
  231. _windowNumber: NSInteger;
  232. _window: NSWindow;
  233. _context: NSGraphicsContext;
  234. + _data: record
  235. + case byte of
  236. + 1: (
  237. _mouse: record
  238. _eventNumber: cint;
  239. _clickCount: cint;
  240. @@ -248,6 +251,8 @@
  241. reserved2: array[0..(3)-1] of cint;
  242. {$endif}
  243. end;
  244. + );
  245. + 2: (
  246. _key: record
  247. keys: NSString;
  248. unmodKeys: NSString;
  249. @@ -258,6 +263,8 @@
  250. reserved: array[0..(5)-1] of cint;
  251. {$endif}
  252. end;
  253. + );
  254. + 3: (
  255. _tracking: record
  256. _eventNumber: cint;
  257. _trackingNumber: NSInteger;
  258. @@ -266,6 +273,8 @@
  259. reserved: array[0..(6)-1] of cint;
  260. {$endif}
  261. end;
  262. + );
  263. + 4: (
  264. _scrollWheel: record
  265. _deltaX: CGFloat;
  266. _deltaY: CGFloat;
  267. @@ -276,6 +285,8 @@
  268. reserved2: array[0..(6)-1] of cint;
  269. {$endif}
  270. end;
  271. + );
  272. + 5: (
  273. _axisGesture: record
  274. _deltaX: CGFloat;
  275. _deltaY: CGFloat;
  276. @@ -284,6 +295,8 @@
  277. reserved: array[0..(7)-1] of cint;
  278. {$endif}
  279. end;
  280. + );
  281. + 6: (
  282. _miscGesture: record
  283. _subtype: cshort;
  284. gestureEnded: Boolean;
  285. @@ -294,6 +307,8 @@
  286. reserved2: array[0..(7)-1] of cint;
  287. {$endif}
  288. end;
  289. + );
  290. + 7: (
  291. _misc: record
  292. _subtype: cint;
  293. _data1: NSInteger;
  294. @@ -302,12 +317,16 @@
  295. reserved: array[0..(6)-1] of cint;
  296. {$endif}
  297. end;
  298. + );
  299. {$ifdef cpu64}
  300. + 8: (
  301. tabletPointData: array[0..(14)-1] of cint;
  302. + );
  303. + 9: (
  304. tabletProximityData: array[0..(14)-1] of cint;
  305. + );
  306. {$endif}
  307. - __data: record
  308. - end;
  309. + end;
  310. _eventRef: Pointer;
  311. {$ifdef cpu64}
  312. reserved1: Pointer;
  313. diff -ur org/src/appkit/NSWorkspace.inc src/appkit/NSWorkspace.inc
  314. --- org/src/appkit/NSWorkspace.inc 2011-08-06 17:25:09.000000000 +0200
  315. +++ cocoa-skel/src/appkit/NSWorkspace.inc 2011-08-06 17:25:37.000000000 +0200
  316. @@ -120,8 +120,10 @@
  317. NSWorkspace = objcclass external (NSObject)
  318. private
  319. _notificationCenter: NSNotificationCenter;
  320. +{$ifndef cpu64}
  321. deviceStatusCount: cint;
  322. applicationStatusCount: cint;
  323. +{$endif cpu64}
  324. _reservedWorkspace1: id;
  325. public
  326. diff -ur org/src/foundation/NSIndexSet.inc src/foundation/NSIndexSet.inc
  327. --- org/src/foundation/NSIndexSet.inc 2011-08-06 15:21:22.000000000 +0200
  328. +++ cocoa-skel/src/foundation/NSIndexSet.inc 2011-08-06 15:33:51.000000000 +0200
  329. @@ -56,15 +56,20 @@
  330. end;
  331. );
  332. end;
  333. + _internal: record
  334. + case byte of
  335. + 0: (
  336. __singleRange: record
  337. _range: NSRange;
  338. end;
  339. + );
  340. + 1: (
  341. __multipleRanges: record
  342. _data: Pointer; {garbage collector: __strong }
  343. _reserved: Pointer;
  344. end;
  345. - __internal: record
  346. - end;
  347. + );
  348. + end;
  349. public
  350. class function indexSet: id; message 'indexSet';