API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 2nd, 2017
130
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 212.76 KB | None | 0 0
raw download clone embed print report
  1. CMakeLists.txt | 42 +-
  2. Dist/Datas/wget | Bin 105696 -> 0 bytes
  3. Source/JavaScriptCore/jit/JITOperations.cpp | 2 +-
  4. Source/JavaScriptCore/jsc.cpp | 1 +
  5. Source/WTF/wtf/FeatureDefines.h | 8 +-
  6. Source/WTF/wtf/Platform.h | 2 +-
  7. Source/WTF/wtf/ProcessID.h | 9 +-
  8. Source/WebCore/CMakeLists.txt | 1 +
  9. .../platform/mui/ContextMenuItemMorphOS.cpp | 12 +-
  10. .../platform/mui/MediaPlayerPrivateMorphOS.cpp | 20 +-
  11. Source/WebCore/platform/mui/PasteboardMorphOS.cpp | 4 +-
  12. .../platform/mui/PlatformKeyboardEventMorphOS.cpp | 4 +-
  13. Source/WebCore/platform/mui/acinerella.c | 80 +-
  14. .../network/curl/SocketStreamHandleCurl.cpp | 2 +-
  15. Source/WebCore/platform/posix/FileSystemPOSIX.cpp | 2 +-
  16. Source/WebCore/rendering/shapes/BoxShape.cpp | 4 +
  17. .../mui/Api/MorphOS/AutofillBackingStore.cpp | 2 +-
  18. Source/WebKit/mui/Api/MorphOS/AutofillManager.cpp | 4 +-
  19. Source/WebKit/mui/Api/MorphOS/ExtCredential.h | 12 +-
  20. .../mui/Api/MorphOS/addressbargroupclass.cpp | 2 +-
  21. Source/WebKit/mui/Api/MorphOS/appclass.cpp | 178 ++---
  22. Source/WebKit/mui/Api/MorphOS/aros_stuff.c | 5 +
  23. .../WebKit/mui/Api/MorphOS/autofillpopupclass.cpp | 8 +-
  24. .../mui/Api/MorphOS/autofillpopuplistclass.cpp | 4 +-
  25. .../mui/Api/MorphOS/blockmanagergroupclass.cpp | 4 +-
  26. .../mui/Api/MorphOS/blockmanagerlistclass.cpp | 4 +-
  27. .../mui/Api/MorphOS/blockmanagerwindowclass.cpp | 2 +-
  28. .../WebKit/mui/Api/MorphOS/bookmarkgroupclass.cpp | 16 +-
  29. .../mui/Api/MorphOS/bookmarklisttreeclass.cpp | 20 +-
  30. .../mui/Api/MorphOS/bookmarkpanelgroupclass.cpp | 6 +-
  31. .../WebKit/mui/Api/MorphOS/bookmarkwindowclass.cpp | 4 +-
  32. .../mui/Api/MorphOS/choosetitlegroupclass.cpp | 12 +-
  33. Source/WebKit/mui/Api/MorphOS/classes.h | 810 ++++++++++-----------
  34. Source/WebKit/mui/Api/MorphOS/clipboard.cpp | 8 +-
  35. .../mui/Api/MorphOS/colorchooserpopupclass.cpp | 8 +-
  36. Source/WebKit/mui/Api/MorphOS/consolelistclass.cpp | 12 +-
  37. .../WebKit/mui/Api/MorphOS/consolewindowclass.cpp | 2 +-
  38. .../mui/Api/MorphOS/contextmenugroupclass.cpp | 4 +-
  39. .../mui/Api/MorphOS/contextmenulistclass.cpp | 6 +-
  40. .../mui/Api/MorphOS/cookiemanagergroupclass.cpp | 2 +-
  41. .../mui/Api/MorphOS/cookiemanagerlistclass.cpp | 12 +-
  42. .../mui/Api/MorphOS/cookiemanagerwindowclass.cpp | 2 +-
  43. .../mui/Api/MorphOS/datetimechooserpopupclass.cpp | 6 +-
  44. .../WebKit/mui/Api/MorphOS/downloadgroupclass.cpp | 4 +-
  45. .../WebKit/mui/Api/MorphOS/downloadlistclass.cpp | 14 +-
  46. .../WebKit/mui/Api/MorphOS/downloadwindowclass.cpp | 2 +-
  47. Source/WebKit/mui/Api/MorphOS/faviconclass.cpp | 2 +-
  48. Source/WebKit/mui/Api/MorphOS/findtextclass.cpp | 6 +-
  49. .../WebKit/mui/Api/MorphOS/historybuttonclass.cpp | 12 +-
  50. Source/WebKit/mui/Api/MorphOS/historylistclass.cpp | 22 +-
  51. .../mui/Api/MorphOS/historylisttreeclass.cpp | 16 +-
  52. .../mui/Api/MorphOS/historypanelgroupclass.cpp | 2 +-
  53. .../mui/Api/MorphOS/historypopstringclass.cpp | 6 +-
  54. Source/WebKit/mui/Api/MorphOS/iconclass.cpp | 2 +-
  55. Source/WebKit/mui/Api/MorphOS/icufiles.cpp | 2 +
  56. .../WebKit/mui/Api/MorphOS/include/macros/vapor.h | 32 +-
  57. Source/WebKit/mui/Api/MorphOS/linklistclass.cpp | 16 +-
  58. Source/WebKit/mui/Api/MorphOS/loginwindowclass.cpp | 16 +-
  59. .../mui/Api/MorphOS/mediacontrolsgroupclass.cpp | 4 +-
  60. Source/WebKit/mui/Api/MorphOS/menuclass.cpp | 2 +-
  61. Source/WebKit/mui/Api/MorphOS/menuitemclass.cpp | 2 +-
  62. Source/WebKit/mui/Api/MorphOS/methodstack.c | 20 +-
  63. .../WebKit/mui/Api/MorphOS/mimetypegroupclass.cpp | 2 +-
  64. .../WebKit/mui/Api/MorphOS/mimetypelistclass.cpp | 6 +-
  65. Source/WebKit/mui/Api/MorphOS/mui.cpp | 10 +-
  66. Source/WebKit/mui/Api/MorphOS/mui.h | 2 +-
  67. .../mui/Api/MorphOS/navigationgroupclass.cpp | 4 +-
  68. .../mui/Api/MorphOS/networkledsgroupclass.cpp | 2 +-
  69. Source/WebKit/mui/Api/MorphOS/networklistclass.cpp | 12 +-
  70. .../WebKit/mui/Api/MorphOS/networkwindowclass.cpp | 2 +-
  71. Source/WebKit/mui/Api/MorphOS/owbbrowserclass.cpp | 138 ++--
  72. Source/WebKit/mui/Api/MorphOS/owbgroupclass.cpp | 8 +-
  73. Source/WebKit/mui/Api/MorphOS/owbwindowclass.cpp | 122 ++--
  74. .../mui/Api/MorphOS/passwordmanagergroupclass.cpp | 4 +-
  75. .../mui/Api/MorphOS/passwordmanagerlistclass.cpp | 12 +-
  76. .../mui/Api/MorphOS/passwordmanagerwindowclass.cpp | 2 +-
  77. Source/WebKit/mui/Api/MorphOS/popstringclass.cpp | 6 +-
  78. Source/WebKit/mui/Api/MorphOS/prefswindowclass.cpp | 158 ++--
  79. .../WebKit/mui/Api/MorphOS/printerwindowclass.cpp | 10 +-
  80. .../mui/Api/MorphOS/quicklinkbuttongroupclass.cpp | 24 +-
  81. .../WebKit/mui/Api/MorphOS/quicklinkgroupclass.cpp | 16 +-
  82. .../mui/Api/MorphOS/quicklinkparentgroupclass.cpp | 8 +-
  83. .../mui/Api/MorphOS/scriptmanagergroupclass.cpp | 2 +-
  84. .../mui/Api/MorphOS/scriptmanagerhostlistclass.cpp | 2 +-
  85. .../mui/Api/MorphOS/scriptmanagerlistclass.cpp | 2 +-
  86. .../mui/Api/MorphOS/scriptmanagerwindowclass.cpp | 2 +-
  87. .../WebKit/mui/Api/MorphOS/searchbargroupclass.cpp | 6 +-
  88. .../mui/Api/MorphOS/searchmanagergroupclass.cpp | 8 +-
  89. .../mui/Api/MorphOS/searchmanagerlistclass.cpp | 4 +-
  90. .../mui/Api/MorphOS/searchmanagerwindowclass.cpp | 4 +-
  91. Source/WebKit/mui/Api/MorphOS/seeksliderclass.cpp | 8 +-
  92. Source/WebKit/mui/Api/MorphOS/spacerclass.cpp | 2 +-
  93. .../WebKit/mui/Api/MorphOS/splashwindowclass.cpp | 5 +-
  94. Source/WebKit/mui/Api/MorphOS/suggestlistclass.cpp | 6 +-
  95. .../mui/Api/MorphOS/suggestpopstringclass.cpp | 6 +-
  96. .../mui/Api/MorphOS/tabtransferanimclass.cpp | 6 +-
  97. Source/WebKit/mui/Api/MorphOS/titleclass.cpp | 8 +-
  98. Source/WebKit/mui/Api/MorphOS/titlelabelclass.cpp | 16 +-
  99. .../Api/MorphOS/toolbutton_addbookmarkclass.cpp | 4 +-
  100. .../mui/Api/MorphOS/toolbutton_bookmarksclass.cpp | 2 +-
  101. .../mui/Api/MorphOS/toolbutton_newtabclass.cpp | 2 +-
  102. Source/WebKit/mui/Api/MorphOS/toolbuttonclass.cpp | 4 +-
  103. .../WebKit/mui/Api/MorphOS/transferanimclass.cpp | 6 +-
  104. .../WebKit/mui/Api/MorphOS/urlprefsgroupclass.cpp | 10 +-
  105. .../WebKit/mui/Api/MorphOS/urlprefslistclass.cpp | 4 +-
  106. .../WebKit/mui/Api/MorphOS/urlprefswindowclass.cpp | 2 +-
  107. Source/WebKit/mui/Api/MorphOS/urlstringclass.cpp | 3 +-
  108. .../WebKit/mui/Api/MorphOS/volumesliderclass.cpp | 4 +-
  109. Source/cmake/AROS.cmake | 26 -
  110. Source/cmake/WebKitHelpers.cmake | 12 +-
  111. Tools/OdysseyWebBrowser/CMakeLists.txt | 10 +-
  112. Tools/OdysseyWebBrowser/main.cpp | 2 +-
  113. cross-build/build_aros | 14 -
  114. 113 files changed, 1128 insertions(+), 1142 deletions(-)
  115.  
  116. diff --git a/CMakeLists.txt b/CMakeLists.txt
  117. index 70c3c643..0f52f1c6 100644
  118. --- a/CMakeLists.txt
  119. +++ b/CMakeLists.txt
  120. @@ -116,7 +116,9 @@ endif ()
  121. # -----------------------------------------------------------------------------
  122. # Determine the operating system
  123. # -----------------------------------------------------------------------------
  124. -if (UNIX)
  125. +if (AROS)
  126. + set(WTF_OS_AROS 1)
  127. +elseif (UNIX)
  128. if (APPLE)
  129. set(WTF_OS_MAC_OS_X 1)
  130. else ()
  131. @@ -125,25 +127,33 @@ if (UNIX)
  132. elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
  133. set(WTF_OS_WINDOWS 1)
  134. else ()
  135. -# message(FATAL_ERROR "Unknown OS '${CMAKE_SYSTEM_NAME}'")
  136. + message(FATAL_ERROR "Unknown OS '${CMAKE_SYSTEM_NAME}'")
  137. endif ()
  138.  
  139. -# -----------------------------------------------------------------------------
  140. -# Default library types
  141. -# -----------------------------------------------------------------------------
  142. -option(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries")
  143. -
  144. -if (SHARED_CORE)
  145. - set(JavaScriptCore_LIBRARY_TYPE SHARED)
  146. - set(WebCore_LIBRARY_TYPE SHARED)
  147. -else ()
  148. - set(JavaScriptCore_LIBRARY_TYPE SHARED)
  149. +if (AROS)
  150. + set(JavaScriptCore_LIBRARY_TYPE STATIC)
  151. set(WebCore_LIBRARY_TYPE STATIC)
  152. -endif ()
  153. + set(WebKit_LIBRARY_TYPE STATIC)
  154. + set(WebKit2_LIBRARY_TYPE STATIC)
  155. + set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
  156. +else ()
  157. + # -----------------------------------------------------------------------------
  158. + # Default library types
  159. + # -----------------------------------------------------------------------------
  160. + option(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries")
  161. +
  162. + if (SHARED_CORE)
  163. + set(JavaScriptCore_LIBRARY_TYPE SHARED)
  164. + set(WebCore_LIBRARY_TYPE SHARED)
  165. + else ()
  166. + set(JavaScriptCore_LIBRARY_TYPE SHARED)
  167. + set(WebCore_LIBRARY_TYPE STATIC)
  168. + endif ()
  169.  
  170. -set(WebKit_LIBRARY_TYPE SHARED)
  171. -set(WebKit2_LIBRARY_TYPE SHARED)
  172. -set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
  173. + set(WebKit_LIBRARY_TYPE SHARED)
  174. + set(WebKit2_LIBRARY_TYPE SHARED)
  175. + set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
  176. +endif ()
  177.  
  178. # -----------------------------------------------------------------------------
  179. # Install JavaScript shell
  180. diff --git a/Dist/Datas/wget b/Dist/Datas/wget
  181. deleted file mode 100644
  182. index 57906505..00000000
  183. Binary files a/Dist/Datas/wget and /dev/null differ
  184. diff --git a/Source/JavaScriptCore/jit/JITOperations.cpp b/Source/JavaScriptCore/jit/JITOperations.cpp
  185. index 4b58b44d..4d520ede 100644
  186. --- a/Source/JavaScriptCore/jit/JITOperations.cpp
  187. +++ b/Source/JavaScriptCore/jit/JITOperations.cpp
  188. @@ -1918,7 +1918,7 @@ void JIT_OPERATION operationVMHandleException(ExecState* exec)
  189. // testing.
  190. void JIT_OPERATION operationExceptionFuzz()
  191. {
  192. -#if COMPILER(GCC)
  193. +#if COMPILER(GCC) && 0
  194. ExecState* exec = static_cast<ExecState*>(__builtin_frame_address(1));
  195. void* returnPC = __builtin_return_address(0);
  196. doExceptionFuzzing(exec, "JITOperations", returnPC);
  197. diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp
  198. index cee8f67b..4e3d7327 100644
  199. --- a/Source/JavaScriptCore/jsc.cpp
  200. +++ b/Source/JavaScriptCore/jsc.cpp
  201. @@ -116,6 +116,7 @@ NO_RETURN_WITH_VALUE static void jscExit(int status)
  202. for (;;) {
  203. #if OS(WINDOWS)
  204. Sleep(1000);
  205. +#elif OS(AROS)
  206. #else
  207. pause();
  208. #endif
  209. diff --git a/Source/WTF/wtf/FeatureDefines.h b/Source/WTF/wtf/FeatureDefines.h
  210. index e9841c4b..4ad3918e 100644
  211. --- a/Source/WTF/wtf/FeatureDefines.h
  212. +++ b/Source/WTF/wtf/FeatureDefines.h
  213. @@ -322,7 +322,13 @@ the public iOS SDK. We will also need to update the FeatureDefines.xcconfig file
  214. #if PLATFORM(GTK)
  215. #endif /* PLATFORM(GTK) */
  216.  
  217. -/* --------- MUI port (MorphOS, AROS) --------- */
  218. +/* --------- "Amiga" port (MorphOS, AROS) --------- */
  219. +#if OS(AROS)
  220. +#if !defined(ENABLE_WEBGL)
  221. +#define ENABLE_WEBGL 1
  222. +#endif
  223. +#endif
  224. +
  225. #if PLATFORM(MUI)
  226.  
  227. #if !defined(ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH)
  228. diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
  229. index 0bce99e4..4f85e452 100644
  230. --- a/Source/WTF/wtf/Platform.h
  231. +++ b/Source/WTF/wtf/Platform.h
  232. @@ -701,7 +701,7 @@
  233. #endif
  234.  
  235. #if !defined(USE_JSVALUE64) && !defined(USE_JSVALUE32_64)
  236. -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
  237. +#if (CPU(X86_64) && (OS(AROS) || OS(UNIX) || OS(WINDOWS))) \
  238. || (CPU(IA64) && !CPU(IA64_32)) \
  239. || CPU(ALPHA) \
  240. || CPU(ARM64) \
  241. diff --git a/Source/WTF/wtf/ProcessID.h b/Source/WTF/wtf/ProcessID.h
  242. index e7476718..dcdb35ec 100644
  243. --- a/Source/WTF/wtf/ProcessID.h
  244. +++ b/Source/WTF/wtf/ProcessID.h
  245. @@ -40,12 +40,17 @@
  246.  
  247. namespace WTF {
  248.  
  249. -inline int getCurrentProcessID()
  250. +#if PLATFORM(MUI)
  251. +inline IPTR
  252. +#else
  253. +inline int
  254. +#endif
  255. + getCurrentProcessID()
  256. {
  257. #if OS(WINDOWS)
  258. return GetCurrentProcessId();
  259. #elif PLATFORM(MUI)
  260. - return (int) FindTask(NULL);
  261. + return (IPTR) FindTask(NULL);
  262. #else
  263. return getpid();
  264. #endif
  265. diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
  266. index ea0eac3f..b9c648f4 100644
  267. --- a/Source/WebCore/CMakeLists.txt
  268. +++ b/Source/WebCore/CMakeLists.txt
  269. @@ -157,6 +157,7 @@ set(WebCore_IDL_INCLUDES
  270. Modules/indexeddb
  271. Modules/indieui
  272. Modules/mediasession
  273. + Modules/mediasource
  274. Modules/mediastream
  275. Modules/notifications
  276. Modules/proximity
  277. diff --git a/Source/WebCore/platform/mui/ContextMenuItemMorphOS.cpp b/Source/WebCore/platform/mui/ContextMenuItemMorphOS.cpp
  278. index d5ca8c68..8d6b7d67 100755
  279. --- a/Source/WebCore/platform/mui/ContextMenuItemMorphOS.cpp
  280. +++ b/Source/WebCore/platform/mui/ContextMenuItemMorphOS.cpp
  281. @@ -44,7 +44,7 @@
  282. #undef String
  283.  
  284. struct IClass *getmenuitemclass(void);
  285. -ULONG getv(APTR obj, ULONG attr);
  286. +IPTR getv(APTR obj, IPTR attr);
  287.  
  288. namespace WebCore {
  289.  
  290. @@ -54,7 +54,7 @@ ContextMenuItem::ContextMenuItem(BalMenuItem* item)
  291. {
  292. PlatformMenuItemDescription *description = NULL;
  293.  
  294. - GetAttr(MUIA_UserData, (Object *)item, (ULONGPTR)&description);
  295. + GetAttr(MUIA_UserData, (Object *)item, (IPTR *)&description);
  296.  
  297. if(description)
  298. {
  299. @@ -111,7 +111,7 @@ BalMenuItem* ContextMenuItem::createNativeMenuItem(const PlatformMenuItemDescrip
  300. {
  301. SetAttrs((Object *) menu.subMenu,
  302. MUIA_Menu_Enabled, menu.enabled,
  303. - MUIA_UserData, (ULONG) description,
  304. + MUIA_UserData, (IPTR) description,
  305. MUIA_Menu_Title, (menu.type == SeparatorType || title == NULL) ? NM_BARLABEL : title,
  306. TAG_DONE);
  307.  
  308. @@ -120,11 +120,11 @@ BalMenuItem* ContextMenuItem::createNativeMenuItem(const PlatformMenuItemDescrip
  309. else
  310. {
  311. item = (Object *) NewObject(getmenuitemclass(), NULL,
  312. - MUIA_UserData, (ULONG) description,
  313. + MUIA_UserData, (IPTR) description,
  314. MUIA_Menuitem_Title, (menu.type == SeparatorType || title == NULL) ? NM_BARLABEL : title,
  315. - MUIA_Menuitem_Enabled, (ULONG) menu.enabled,
  316. + MUIA_Menuitem_Enabled, (IPTR) menu.enabled,
  317. MUIA_Menuitem_Checkit, menu.type == CheckableActionType,
  318. - menu.type == CheckableActionType ? MUIA_Menuitem_Checked : TAG_IGNORE, (ULONG) menu.checked,
  319. + menu.type == CheckableActionType ? MUIA_Menuitem_Checked : TAG_IGNORE, (IPTR) menu.checked,
  320. End;
  321. }
  322.  
  323. diff --git a/Source/WebCore/platform/mui/MediaPlayerPrivateMorphOS.cpp b/Source/WebCore/platform/mui/MediaPlayerPrivateMorphOS.cpp
  324. index ce91d154..5643e1bf 100755
  325. --- a/Source/WebCore/platform/mui/MediaPlayerPrivateMorphOS.cpp
  326. +++ b/Source/WebCore/platform/mui/MediaPlayerPrivateMorphOS.cpp
  327. @@ -1383,9 +1383,9 @@ AROS_UFH3(APTR, SoundFunc,
  328. _Stream *stream = (_Stream *) actrl->ahiac_UserData;
  329.  
  330. if((stream->dbflag = !stream->dbflag) == TRUE) // Flip and test
  331. - AHI_SetSound(0, 1, 0, 0, actrl, NULL);
  332. + AHI_SetSound(0, 1, 0, 0, actrl, 0);
  333. else
  334. - AHI_SetSound(0, 0, 0, 0, actrl, NULL);
  335. + AHI_SetSound(0, 0, 0, 0, actrl, 0);
  336.  
  337. Signal(stream->audiotask, 1L<<stream->sigsound);
  338.  
  339. @@ -1402,7 +1402,7 @@ struct Hook SoundHook =
  340. NULL
  341. };
  342. #else
  343. -static ULONG SoundFunc(void)
  344. +static IPTR SoundFunc(void)
  345. {
  346. //struct Hook *hook = (struct Hook *)REG_A0;
  347. struct AHIAudioCtrl * actrl = (struct AHIAudioCtrl *)REG_A2;
  348. @@ -1427,7 +1427,7 @@ struct EmulLibEntry GATE_SoundFunc =
  349. struct Hook SoundHook =
  350. {
  351. {NULL,NULL},
  352. - (ULONG (*)()) &GATE_SoundFunc,
  353. + (IPTR (*)()) &GATE_SoundFunc,
  354. NULL,
  355. NULL,
  356. };
  357. @@ -1482,7 +1482,7 @@ bool MediaPlayerPrivate::audioOpen()
  358. if((stream->AHIio = (struct AHIRequest *) CreateIORequest(stream->AHImp, sizeof(struct AHIRequest))))
  359. {
  360. stream->AHIio->ahir_Version = 4; // Open at least version 4 of 'ahi.device'.
  361. - if(!(stream->AHIDevice = OpenDevice(AHINAME, AHI_NO_UNIT, (struct IORequest *)stream->AHIio, NULL)))
  362. + if(!(stream->AHIDevice = OpenDevice(AHINAME, AHI_NO_UNIT, (struct IORequest *)stream->AHIio, 0)))
  363. {
  364. stream->localAHIBase = (struct Library *) stream->AHIio->ahir_Std.io_Device;
  365.  
  366. @@ -1491,15 +1491,15 @@ bool MediaPlayerPrivate::audioOpen()
  367. AHIA_Channels, 1,
  368. AHIA_Sounds, 2,
  369. AHIA_MixFreq, stream->sample_rate,
  370. - AHIA_SoundFunc, (ULONG) &SoundHook,
  371. - AHIA_UserData, (ULONG) stream,
  372. + AHIA_SoundFunc, (IPTR) &SoundHook,
  373. + AHIA_UserData, (IPTR) stream,
  374. TAG_DONE)))
  375. {
  376. - ULONG samples_count;
  377. + IPTR samples_count;
  378.  
  379. AHI_GetAudioAttrs(AHI_INVALID_ID,
  380. stream->actrl,
  381. - AHIDB_MaxPlaySamples, (ULONG) &samples_count,
  382. + AHIDB_MaxPlaySamples, (IPTR) &samples_count,
  383. TAG_DONE);
  384.  
  385. stream->sample_count = samples_count * 3;
  386. @@ -1543,7 +1543,7 @@ bool MediaPlayerPrivate::audioOpen()
  387. AHIP_Sound, 0,
  388. AHIP_Offset, 0,
  389. AHIP_Length, 0,
  390. - AHIP_EndChannel, NULL,
  391. + AHIP_EndChannel, (IPTR)NULL,
  392. TAG_DONE);
  393.  
  394.  
  395. diff --git a/Source/WebCore/platform/mui/PasteboardMorphOS.cpp b/Source/WebCore/platform/mui/PasteboardMorphOS.cpp
  396. index d3994355..377823f3 100755
  397. --- a/Source/WebCore/platform/mui/PasteboardMorphOS.cpp
  398. +++ b/Source/WebCore/platform/mui/PasteboardMorphOS.cpp
  399. @@ -86,7 +86,7 @@ static void writeUTF8(const char* data, size_t len)
  400. {
  401. if (ClipboardHandle *ch = OpenClipboard(PRIMARY_CLIP))
  402. {
  403. - ih->iff_Stream = (uint32)ch;
  404. + ih->iff_Stream = (IPTR)ch;
  405. InitIFFasClip(ih);
  406.  
  407. if (0 == OpenIFF(ih, IFFF_WRITE))
  408. @@ -545,7 +545,7 @@ static String getPlainText(Frame* )
  409.  
  410. if (IFFHandle *ih = AllocIFF()) {
  411. if (ClipboardHandle *ch = OpenClipboard(PRIMARY_CLIP)) {
  412. - ih->iff_Stream = (uint32)ch;
  413. + ih->iff_Stream = (IPTR)ch;
  414. InitIFFasClip(ih);
  415.  
  416. if (0 == OpenIFF(ih, IFFF_READ)) {
  417. diff --git a/Source/WebCore/platform/mui/PlatformKeyboardEventMorphOS.cpp b/Source/WebCore/platform/mui/PlatformKeyboardEventMorphOS.cpp
  418. index a1f26c59..702f1754 100755
  419. --- a/Source/WebCore/platform/mui/PlatformKeyboardEventMorphOS.cpp
  420. +++ b/Source/WebCore/platform/mui/PlatformKeyboardEventMorphOS.cpp
  421. @@ -138,7 +138,7 @@ static int ConvertAmigaKeyToVirtualKey(struct IntuiMessage *im)
  422. ie.ie_Code = im->Code & ~IECODE_UP_PREFIX;
  423. ie.ie_Qualifier = 0x8000; //im->Qualifier & ~(IEQUALIFIER_LCOMMAND | IEQUALIFIER_RCOMMAND);
  424. //ie.ie_Qualifier = im->Qualifier & ~(IEQUALIFIER_LCOMMAND | IEQUALIFIER_RCOMMAND);
  425. - ie.ie_EventAddress = (APTR *) *((ULONG *)im->IAddress);
  426. + ie.ie_EventAddress = (APTR *) *((IPTR *)im->IAddress);
  427.  
  428. if (MapRawKey(&ie, (STRPTR)&c, 1, NULL) == 1)
  429. {
  430. @@ -347,7 +347,7 @@ static String keyIdentifierForAmigaKeyCode(struct IntuiMessage *im)
  431. ie.ie_Code = im->Code & ~IECODE_UP_PREFIX;
  432. ie.ie_Qualifier = 0x8000; //im->Qualifier & ~(IEQUALIFIER_LCOMMAND | IEQUALIFIER_RCOMMAND);
  433. //ie.ie_Qualifier = im->Qualifier & ~(IEQUALIFIER_LCOMMAND | IEQUALIFIER_RCOMMAND);
  434. - ie.ie_EventAddress = (APTR *) *((ULONG *)im->IAddress);
  435. + ie.ie_EventAddress = (APTR *) *((IPTR *)im->IAddress);
  436.  
  437. if (MapRawKey(&ie, (STRPTR)&c, 1, NULL) == 1)
  438. {
  439. diff --git a/Source/WebCore/platform/mui/acinerella.c b/Source/WebCore/platform/mui/acinerella.c
  440. index 5807b14e..54c12116 100644
  441. --- a/Source/WebCore/platform/mui/acinerella.c
  442. +++ b/Source/WebCore/platform/mui/acinerella.c
  443. @@ -28,6 +28,7 @@
  444. #include "libavutil/samplefmt.h"
  445. #include "libavutil/avutil.h"
  446. #include "libavutil/opt.h"
  447. +#include "libavutil/imgutils.h"
  448. #include "libswscale/swscale.h"
  449. #include "libswresample/swresample.h"
  450. #include <string.h>
  451. @@ -247,26 +248,7 @@ static void av_log_callback(void* ptr, int level, const char* fmt, va_list vl)
  452. static int initialized = 0;
  453. ac_package flush_pkt;
  454.  
  455. -static struct URLProtocol OWBProtocol =
  456. -{
  457. - "owb",
  458. - &file_open,
  459. - NULL,
  460. - &file_read,
  461. - &file_write,
  462. - &file_seek,
  463. - &file_close,
  464. - NULL,
  465. - NULL,
  466. - NULL,
  467. - NULL,
  468. - NULL,
  469. - NULL,
  470. - 0,
  471. - NULL,
  472. - 0,
  473. - NULL
  474. -};
  475. +static struct URLProtocol OWBProtocol;
  476.  
  477. lp_ac_package ac_flush_packet(void)
  478. {
  479. @@ -282,7 +264,15 @@ lp_ac_instance CALL_CONVT ac_init(void)
  480. D(kprintf("Initializing ffmpeg\n"));
  481.  
  482. ObtainSemaphore(&semAcinerella);
  483. -
  484. +
  485. + memset(&OWBProtocol, 0, sizeof(struct URLProtocol));
  486. + OWBProtocol.name = "owb";
  487. + OWBProtocol.url_open = &file_open;
  488. + OWBProtocol.url_read = &file_read;
  489. + OWBProtocol.url_write = &file_write;
  490. + OWBProtocol.url_seek = &file_seek;
  491. + OWBProtocol.url_close = &file_close;
  492. +
  493. av_log_set_callback(av_log_callback/*AV_LOG_QUIET*/);
  494. avcodec_register_all();
  495. ffurl_register_protocol(&OWBProtocol);
  496. @@ -521,7 +511,7 @@ lp_ac_package CALL_CONVT ac_read_package(lp_ac_instance pacInstance)
  497. {
  498. AVPacket *clone = ac_clone_packet(&Package);
  499.  
  500. - av_free_packet(&Package);
  501. + av_packet_unref(&Package);
  502.  
  503. if(clone)
  504. {
  505. @@ -556,7 +546,7 @@ void CALL_CONVT ac_free_package(lp_ac_package pPackage)
  506. if (pPackage != NULL && pPackage != ac_flush_packet())
  507. {
  508. D(kprintf("Free packet %p (data %p size %d stream %d destruct %p priv %p)\n", pPackage, ((lp_ac_package_data)pPackage)->package.data, ((lp_ac_package_data)pPackage)->package.size, ((lp_ac_package_data)pPackage)->package.stream_index, ((lp_ac_package_data)pPackage)->ffpackage->destruct, ((lp_ac_package_data)pPackage)->ffpackage->priv));
  509. - av_free_packet(((lp_ac_package_data)pPackage)->ffpackage);
  510. + av_packet_unref(((lp_ac_package_data)pPackage)->ffpackage);
  511. mgr_free(((lp_ac_package_data)pPackage)->ffpackage);
  512. mgr_free((lp_ac_package_data)pPackage);
  513. }
  514. @@ -566,18 +556,18 @@ void CALL_CONVT ac_free_package(lp_ac_package pPackage)
  515. //--- Decoder management ---
  516. //
  517.  
  518. -enum PixelFormat convert_pix_format(ac_output_format fmt)
  519. +enum AVPixelFormat convert_pix_format(ac_output_format fmt)
  520. {
  521. switch (fmt)
  522. {
  523. - case AC_OUTPUT_RGB24: return PIX_FMT_RGB24;
  524. - case AC_OUTPUT_BGR24: return PIX_FMT_BGR24;
  525. - case AC_OUTPUT_RGBA32: return PIX_FMT_RGB32;
  526. - case AC_OUTPUT_BGRA32: return PIX_FMT_BGR32;
  527. - case AC_OUTPUT_YUV420P: return PIX_FMT_YUV420P;
  528. - case AC_OUTPUT_YUV422: return PIX_FMT_YUYV422;
  529. + case AC_OUTPUT_RGB24: return AV_PIX_FMT_RGB24;
  530. + case AC_OUTPUT_BGR24: return AV_PIX_FMT_BGR24;
  531. + case AC_OUTPUT_RGBA32: return AV_PIX_FMT_RGB32;
  532. + case AC_OUTPUT_BGRA32: return AV_PIX_FMT_BGR32;
  533. + case AC_OUTPUT_YUV420P: return AV_PIX_FMT_YUV420P;
  534. + case AC_OUTPUT_YUV422: return AV_PIX_FMT_YUYV422;
  535. }
  536. - return PIX_FMT_RGB24;
  537. + return AV_PIX_FMT_RGB24;
  538. }
  539.  
  540. AVFrame* ac_get_frame(lp_ac_decoder decoder)
  541. @@ -627,20 +617,19 @@ int ac_set_output_format(lp_ac_decoder decoder, ac_output_format fmt)
  542. return -1;
  543. }
  544.  
  545. - pDecoder->decoder.buffer_size = 2 * avpicture_get_size(convert_pix_format(pDecoder->decoder.pacInstance->output_format),
  546. - pDecoder->pCodecCtx->width, pDecoder->pCodecCtx->height);
  547. + pDecoder->decoder.buffer_size = 2 * av_image_get_buffer_size(convert_pix_format(pDecoder->decoder.pacInstance->output_format),
  548. + pDecoder->pCodecCtx->width, pDecoder->pCodecCtx->height, 1);
  549. pDecoder->decoder.pBuffer = (char *)mgr_malloc(pDecoder->decoder.buffer_size);
  550.  
  551. if(pDecoder->decoder.pBuffer)
  552. {
  553. memset(pDecoder->decoder.pBuffer, 0, pDecoder->decoder.buffer_size);
  554. - //Link decoder to buffer
  555. - avpicture_fill(
  556. - (AVPicture*)(pDecoder->pFrameRGB),
  557. - (const uint8_t *) pDecoder->decoder.pBuffer, convert_pix_format(pDecoder->decoder.pacInstance->output_format),
  558. - pDecoder->pCodecCtx->width, pDecoder->pCodecCtx->height);
  559. + //Link decoder to buffer
  560. + av_image_fill_arrays(pDecoder->pFrameRGB->data, pDecoder->pFrameRGB->linesize,
  561. + (const uint8_t *) pDecoder->decoder.pBuffer, convert_pix_format(pDecoder->decoder.pacInstance->output_format),
  562. + pDecoder->pCodecCtx->width, pDecoder->pCodecCtx->height, 1);
  563.  
  564. - pDecoder->decoder.linesize = pDecoder->pFrameRGB->linesize[0];
  565. + pDecoder->decoder.linesize = pDecoder->pFrameRGB->linesize[0];
  566. }
  567. else
  568. {
  569. @@ -750,20 +739,19 @@ void* ac_create_video_decoder(lp_ac_instance pacInstance, lp_ac_stream_info info
  570. return NULL;
  571. }
  572.  
  573. - pDecoder->decoder.buffer_size = 2 * avpicture_get_size(convert_pix_format(pacInstance->output_format),
  574. - pDecoder->pCodecCtx->width, pDecoder->pCodecCtx->height);
  575. + pDecoder->decoder.buffer_size = 2 * av_image_get_buffer_size(convert_pix_format(pacInstance->output_format),
  576. + pDecoder->pCodecCtx->width, pDecoder->pCodecCtx->height, 1);
  577. pDecoder->decoder.pBuffer = (char *)mgr_malloc(pDecoder->decoder.buffer_size);
  578.  
  579. if(pDecoder->decoder.pBuffer)
  580. {
  581. memset(pDecoder->decoder.pBuffer, 0, pDecoder->decoder.buffer_size);
  582.  
  583. - avpicture_fill(
  584. - (AVPicture*)(pDecoder->pFrameRGB),
  585. - (const uint8_t *) pDecoder->decoder.pBuffer, convert_pix_format(pacInstance->output_format),
  586. - pDecoder->pCodecCtx->width, pDecoder->pCodecCtx->height);
  587. + av_image_fill_arrays(pDecoder->pFrameRGB->data, pDecoder->pFrameRGB->linesize,
  588. + (const uint8_t *) pDecoder->decoder.pBuffer, convert_pix_format(pacInstance->output_format),
  589. + pDecoder->pCodecCtx->width, pDecoder->pCodecCtx->height, 1);
  590.  
  591. - pDecoder->decoder.linesize = pDecoder->pFrameRGB->linesize[0];
  592. + pDecoder->decoder.linesize = pDecoder->pFrameRGB->linesize[0];
  593. }
  594. else
  595. {
  596. diff --git a/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp b/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp
  597. index 94810b2e..cae179d0 100644
  598. --- a/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp
  599. +++ b/Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp
  600. @@ -99,7 +99,7 @@ bool SocketStreamHandle::readData(CURL* curlHandle)
  601.  
  602. CURLcode ret = curl_easy_recv(curlHandle, data.get(), bufferSize, &bytesRead);
  603.  
  604. - if (ret == CURLE_OK && bytesRead >= 0) {
  605. + if (ret == CURLE_OK && (ssize_t)bytesRead >= 0) {
  606. m_mutexReceive.lock();
  607. m_receiveData.append(SocketData { WTF::move(data), static_cast<int>(bytesRead) });
  608. m_mutexReceive.unlock();
  609. diff --git a/Source/WebCore/platform/posix/FileSystemPOSIX.cpp b/Source/WebCore/platform/posix/FileSystemPOSIX.cpp
  610. index e55be890..edaeba9a 100644
  611. --- a/Source/WebCore/platform/posix/FileSystemPOSIX.cpp
  612. +++ b/Source/WebCore/platform/posix/FileSystemPOSIX.cpp
  613. @@ -372,7 +372,7 @@ char *dirname (char *path)
  614. if (slash == 0)
  615. {
  616. /* File is in the current directory. */
  617. - path = ".";
  618. + path = (char *)".";
  619. length = 1;
  620. }
  621. else
  622. diff --git a/Source/WebCore/rendering/shapes/BoxShape.cpp b/Source/WebCore/rendering/shapes/BoxShape.cpp
  623. index a759aeb0..9ec11e2b 100644
  624. --- a/Source/WebCore/rendering/shapes/BoxShape.cpp
  625. +++ b/Source/WebCore/rendering/shapes/BoxShape.cpp
  626. @@ -41,7 +41,11 @@ static inline LayoutUnit adjustRadiusForMarginBoxShape(LayoutUnit radius, Layout
  627. if (!margin)
  628. return radius;
  629.  
  630. +#if !defined(__AROS__)
  631. LayoutUnit ratio = radius / margin;
  632. +#else
  633. + double ratio = radius / margin;
  634. +#endif
  635. if (ratio < 1)
  636. return radius + (margin * (1 + pow(ratio - 1, 3)));
  637.  
  638. diff --git a/Source/WebKit/mui/Api/MorphOS/AutofillBackingStore.cpp b/Source/WebKit/mui/Api/MorphOS/AutofillBackingStore.cpp
  639. index 6286b5f4..43c4c2eb 100755
  640. --- a/Source/WebKit/mui/Api/MorphOS/AutofillBackingStore.cpp
  641. +++ b/Source/WebKit/mui/Api/MorphOS/AutofillBackingStore.cpp
  642. @@ -167,7 +167,7 @@ Vector<String> AutofillBackingStore::get(const String& name, const String& value
  643. if (name.isEmpty() || valueHint.isEmpty() || !m_getStatement)
  644. return candidates;
  645.  
  646. - String value = "%" + valueHint + "%";
  647. + String value = "%" + valueHint + "%";
  648. m_getStatement->bindText(1, name);
  649. m_getStatement->bindText(2, value);
  650.  
  651. diff --git a/Source/WebKit/mui/Api/MorphOS/AutofillManager.cpp b/Source/WebKit/mui/Api/MorphOS/AutofillManager.cpp
  652. index 6120fa42..cb93061f 100644
  653. --- a/Source/WebKit/mui/Api/MorphOS/AutofillManager.cpp
  654. +++ b/Source/WebKit/mui/Api/MorphOS/AutofillManager.cpp
  655. @@ -49,9 +49,9 @@ void AutofillManager::didChangeInTextField(HTMLInputElement* element)
  656. if (m_element != element)
  657. m_element = element;
  658.  
  659. - IntRect rect = element->screenRect();
  660. + IntRect rect = element->screenRect();
  661. Vector<String> candidates = autofillBackingStore().get(element->getAttribute(HTMLNames::nameAttr).string(), element->value());
  662. - DoMethod((Object *) m_browser, MM_OWBBrowser_Autofill_ShowPopup, &candidates, &rect);
  663. + DoMethod((Object *) m_browser, MM_OWBBrowser_Autofill_ShowPopup, &candidates, &rect);
  664. }
  665.  
  666. void AutofillManager::autofillTextField(const String& value)
  667. diff --git a/Source/WebKit/mui/Api/MorphOS/ExtCredential.h b/Source/WebKit/mui/Api/MorphOS/ExtCredential.h
  668. index cce5f2e8..5c86c27d 100755
  669. --- a/Source/WebKit/mui/Api/MorphOS/ExtCredential.h
  670. +++ b/Source/WebKit/mui/Api/MorphOS/ExtCredential.h
  671. @@ -109,16 +109,16 @@ inline bool operator==(const ExtCredential& a, const ExtCredential& b)
  672. return false;
  673. if (a.persistence() != b.persistence())
  674. return false;
  675. - if (a.realm() != b.realm())
  676. + if (a.realm() != b.realm())
  677. return false;
  678. - if (a.userFieldName() != b.userFieldName())
  679. + if (a.userFieldName() != b.userFieldName())
  680. return false;
  681. - if (a.passwordFieldName() != b.passwordFieldName())
  682. + if (a.passwordFieldName() != b.passwordFieldName())
  683. return false;
  684. - if (a.type() != b.type())
  685. + if (a.type() != b.type())
  686. + return false;
  687. + if (a.flags() != b.flags())
  688. return false;
  689. - if (a.flags() != b.flags())
  690. - return false;
  691.  
  692. return true;
  693. }
  694. diff --git a/Source/WebKit/mui/Api/MorphOS/addressbargroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/addressbargroupclass.cpp
  695. index 6c0e22d4..cec1e489 100755
  696. --- a/Source/WebKit/mui/Api/MorphOS/addressbargroupclass.cpp
  697. +++ b/Source/WebKit/mui/Api/MorphOS/addressbargroupclass.cpp
  698. @@ -206,7 +206,7 @@ DEFGET
  699. return DoMethodA(data->pop_path, (_Msg_*) msg);
  700.  
  701. case MA_AddressBarGroup_PopString:
  702. - *msg->opg_Storage = (ULONG) data->pop_path;
  703. + *msg->opg_Storage = (IPTR) data->pop_path;
  704. return TRUE;
  705.  
  706. case MUIA_Popstring_String:
  707. diff --git a/Source/WebKit/mui/Api/MorphOS/appclass.cpp b/Source/WebKit/mui/Api/MorphOS/appclass.cpp
  708. index bc79749a..64c43d33 100644
  709. --- a/Source/WebKit/mui/Api/MorphOS/appclass.cpp
  710. +++ b/Source/WebKit/mui/Api/MorphOS/appclass.cpp
  711. @@ -430,7 +430,7 @@ ULONG menus_init(void)
  712. {
  713. if (nmp->nm_Label != NM_BARLABEL)
  714. {
  715. - nmp->nm_Label = (STRPTR)GSI((ULONG)nmp->nm_Label);
  716. + nmp->nm_Label = (STRPTR)GSI((IPTR)nmp->nm_Label);
  717. }
  718. nmp++;
  719. }
  720. @@ -552,13 +552,13 @@ AROS_UFH3
  721.  
  722. Object *window = (Object *) getv(obj, MA_OWBApp_ActiveWindow);
  723.  
  724. - if ((ULONG)h->h_Data == REXX_ABOUT)
  725. + if ((IPTR)h->h_Data == REXX_ABOUT)
  726. {
  727. DoMethod(obj, MM_OWBApp_About);
  728. }
  729. else if (window)
  730. {
  731. - switch ((ULONG)h->h_Data)
  732. + switch ((IPTR)h->h_Data)
  733. {
  734. case REXX_PRINT:
  735. DoMethod(window, MM_OWBWindow_Print);
  736. @@ -816,18 +816,18 @@ String BufferFile(const char* url)
  737. String path = url;
  738.  
  739. OWBFile *configFile = new OWBFile(path);
  740. - if (!configFile)
  741. - return String();
  742. + if (!configFile)
  743. + return String();
  744. if (configFile->open('r') == -1)
  745. {
  746. - delete configFile;
  747. - return String();
  748. - }
  749. + delete configFile;
  750. + return String();
  751. + }
  752. char *buffer = configFile->read(configFile->getSize());
  753. String fileBuffer = buffer;
  754. delete [] buffer;
  755. - configFile->close();
  756. - delete configFile;
  757. + configFile->close();
  758. + delete configFile;
  759.  
  760. return fileBuffer;
  761. }
  762. @@ -986,7 +986,7 @@ DEFNEW
  763. else
  764. {
  765. CoerceMethod(cl, obj, OM_DISPOSE);
  766. - return NULL;
  767. + return (IPTR)NULL;
  768. }
  769.  
  770. /* Load settings */
  771. @@ -1040,12 +1040,12 @@ DEFNEW
  772.  
  773. if(restoremode == MV_OWBApp_SessionRestore_Off || DoMethod(app, MM_OWBApp_RestoreSession, restoremode == MV_OWBApp_SessionRestore_Ask ? TRUE : FALSE, FALSE) == FALSE)
  774. {
  775. - char *starturl = (char *) GetTagData(MA_OWBBrowser_URL, NULL, msg->ops_AttrList);
  776. + char *starturl = (char *) GetTagData(MA_OWBBrowser_URL, (IPTR)NULL, msg->ops_AttrList);
  777. DoMethod(app, MM_OWBApp_AddWindow, (starturl && starturl[0]) ? starturl : data->startpage, FALSE, NULL, TRUE, NULL, FALSE);
  778. }
  779. else
  780. {
  781. - char *starturl = (char *) GetTagData(MA_OWBBrowser_URL, NULL, msg->ops_AttrList);
  782. + char *starturl = (char *) GetTagData(MA_OWBBrowser_URL, (IPTR)NULL, msg->ops_AttrList);
  783. if(starturl && starturl[0])
  784. {
  785. DoMethod(app, MM_OWBApp_AddBrowser, NULL, starturl, FALSE, NULL, FALSE, FALSE, TRUE);
  786. @@ -1056,7 +1056,7 @@ DEFNEW
  787. DoMethod(app, MUIM_Notify, MA_OWBApp_BookmarksChanged, MUIV_EveryTime, obj, 1, MM_OWBApp_BookmarksChanged);
  788. }
  789.  
  790. - return (ULONG)obj;
  791. + return (IPTR)obj;
  792. }
  793.  
  794. void FreeWebKitLeakedObjects()
  795. @@ -1153,19 +1153,19 @@ DEFGET
  796. /* Settings */
  797. case MA_OWBApp_DownloadDirectory:
  798. {
  799. - *msg->opg_Storage = (ULONG) data->download_dir;
  800. + *msg->opg_Storage = (IPTR) data->download_dir;
  801. }
  802. return TRUE;
  803.  
  804. case MA_OWBApp_DownloadAutoClose:
  805. {
  806. - *msg->opg_Storage = (ULONG) data->downloadautoclose;
  807. + *msg->opg_Storage = (IPTR) data->downloadautoclose;
  808. }
  809. return TRUE;
  810.  
  811. case MA_OWBApp_DownloadSave:
  812. {
  813. - *msg->opg_Storage = (ULONG) data->savedownloads;
  814. + *msg->opg_Storage = (IPTR) data->savedownloads;
  815. }
  816. return TRUE;
  817.  
  818. @@ -1177,91 +1177,91 @@ DEFGET
  819.  
  820. case MA_OWBApp_DefaultURL:
  821. {
  822. - *msg->opg_Storage = (ULONG) data->homepage;
  823. + *msg->opg_Storage = (IPTR) data->homepage;
  824. }
  825. return TRUE;
  826.  
  827. case MA_OWBApp_StartPage:
  828. {
  829. - *msg->opg_Storage = (ULONG) data->startpage;
  830. + *msg->opg_Storage = (IPTR) data->startpage;
  831. }
  832. return TRUE;
  833.  
  834. case MA_OWBApp_NewTabPage:
  835. {
  836. - *msg->opg_Storage = (ULONG) data->newtabpage;
  837. + *msg->opg_Storage = (IPTR) data->newtabpage;
  838. }
  839. return TRUE;
  840.  
  841. case MA_OWBApp_CLIDevice:
  842. {
  843. - *msg->opg_Storage = (ULONG) getv(data->prefswin, MA_OWBApp_CLIDevice);
  844. + *msg->opg_Storage = (IPTR) getv(data->prefswin, MA_OWBApp_CLIDevice);
  845. }
  846. return TRUE;
  847.  
  848. case MA_OWBApp_ShowValidationButtons:
  849. {
  850. - *msg->opg_Storage = (ULONG) data->showvalidationbuttons;
  851. + *msg->opg_Storage = (IPTR) data->showvalidationbuttons;
  852. }
  853. return TRUE;
  854.  
  855. case MA_OWBApp_ShowSeparators:
  856. {
  857. - *msg->opg_Storage = (ULONG) data->showseparators;
  858. + *msg->opg_Storage = (IPTR) data->showseparators;
  859. }
  860. return TRUE;
  861.  
  862. case MA_OWBApp_EnablePointers:
  863. {
  864. - *msg->opg_Storage = (ULONG) data->enablepointers;
  865. + *msg->opg_Storage = (IPTR) data->enablepointers;
  866. }
  867. return TRUE;
  868.  
  869. case MA_OWBApp_ShowButtonFrame:
  870. {
  871. - *msg->opg_Storage = (ULONG) data->showbuttonframe;
  872. + *msg->opg_Storage = (IPTR) data->showbuttonframe;
  873. }
  874. return TRUE;
  875.  
  876. case MA_OWBApp_ShowSearchBar:
  877. {
  878. - *msg->opg_Storage = (ULONG) data->showsearchbar;
  879. + *msg->opg_Storage = (IPTR) data->showsearchbar;
  880. }
  881. return TRUE;
  882.  
  883. case MA_OWBApp_EnableTabTransferAnim:
  884. {
  885. - *msg->opg_Storage = (ULONG) data->enabletabtransferanim;
  886. + *msg->opg_Storage = (IPTR) data->enabletabtransferanim;
  887. }
  888. return TRUE;
  889.  
  890. case MA_OWBApp_NewPagePolicy:
  891. {
  892. - *msg->opg_Storage = (ULONG) data->newpagepolicy;
  893. + *msg->opg_Storage = (IPTR) data->newpagepolicy;
  894. }
  895. return TRUE;
  896.  
  897. case MA_OWBApp_NewPagePosition:
  898. {
  899. - *msg->opg_Storage = (ULONG) data->newpageposition;
  900. + *msg->opg_Storage = (IPTR) data->newpageposition;
  901. }
  902. return TRUE;
  903.  
  904. case MA_OWBApp_PopupPolicy:
  905. {
  906. - *msg->opg_Storage = (ULONG) data->popuppolicy;
  907. + *msg->opg_Storage = (IPTR) data->popuppolicy;
  908. }
  909. return TRUE;
  910.  
  911. case MA_OWBApp_ToolButtonType:
  912. {
  913. - *msg->opg_Storage = (ULONG) data->toolbuttontype;
  914. + *msg->opg_Storage = (IPTR) data->toolbuttontype;
  915. }
  916. return TRUE;
  917.  
  918. case MA_OWBApp_URLCompletionType:
  919. {
  920. - *msg->opg_Storage = (ULONG) data->urlcompletiontype;
  921. + *msg->opg_Storage = (IPTR) data->urlcompletiontype;
  922. }
  923. return TRUE;
  924.  
  925. @@ -1301,7 +1301,7 @@ DEFGET
  926. }
  927. }
  928.  
  929. - *msg->opg_Storage = (ULONG) ret;
  930. + *msg->opg_Storage = (IPTR) ret;
  931. }
  932. return TRUE;
  933.  
  934. @@ -1327,196 +1327,196 @@ DEFGET
  935. }
  936. }
  937. #endif
  938. - *msg->opg_Storage = (ULONG) ret;
  939. + *msg->opg_Storage = (IPTR) ret;
  940. }
  941. return TRUE;
  942.  
  943. case MA_OWBApp_ErrorMode:
  944. {
  945. - *msg->opg_Storage = (ULONG) data->errormode;
  946. + *msg->opg_Storage = (IPTR) data->errormode;
  947. }
  948. return TRUE;
  949.  
  950. case MA_OWBApp_MiddleButtonPolicy:
  951. {
  952. - *msg->opg_Storage = (ULONG) data->middlebuttonpolicy;
  953. + *msg->opg_Storage = (IPTR) data->middlebuttonpolicy;
  954. }
  955. return TRUE;
  956.  
  957. case MA_OWBApp_ShowFavIcons:
  958. {
  959. - *msg->opg_Storage = (ULONG) data->showfavicons;
  960. + *msg->opg_Storage = (IPTR) data->showfavicons;
  961. }
  962. return TRUE;
  963.  
  964. case MA_OWBApp_DidReceiveFavIcon:
  965. {
  966. - *msg->opg_Storage = (ULONG) data->favicon_url;
  967. + *msg->opg_Storage = (IPTR) data->favicon_url;
  968. }
  969. return TRUE;
  970.  
  971.  
  972. case MA_OWBApp_FavIconImportComplete:
  973. {
  974. - *msg->opg_Storage = (ULONG) data->favicon_import_complete;
  975. + *msg->opg_Storage = (IPTR) data->favicon_import_complete;
  976. }
  977. return TRUE;
  978.  
  979. case MA_OWBApp_QuickLinkLook:
  980. {
  981. - *msg->opg_Storage = (ULONG) data->quicklinklook;
  982. + *msg->opg_Storage = (IPTR) data->quicklinklook;
  983. }
  984. return TRUE;
  985.  
  986. case MA_OWBApp_QuickLinkLayout:
  987. {
  988. - *msg->opg_Storage = (ULONG) data->quicklinklayout;
  989. + *msg->opg_Storage = (IPTR) data->quicklinklayout;
  990. }
  991. return TRUE;
  992.  
  993. case MA_OWBApp_QuickLinkRows:
  994. {
  995. - *msg->opg_Storage = (ULONG) data->quicklinkrows;
  996. + *msg->opg_Storage = (IPTR) data->quicklinkrows;
  997. }
  998. return TRUE;
  999.  
  1000. case MA_OWBApp_QuickLinkPosition:
  1001. {
  1002. - *msg->opg_Storage = (ULONG) data->quicklinkposition;
  1003. + *msg->opg_Storage = (IPTR) data->quicklinkposition;
  1004. }
  1005. return TRUE;
  1006.  
  1007. case MA_OWBApp_SaveSession:
  1008. {
  1009. - *msg->opg_Storage = (ULONG) data->savesession;
  1010. + *msg->opg_Storage = (IPTR) data->savesession;
  1011. }
  1012. return TRUE;
  1013.  
  1014. case MA_OWBApp_DeleteSessionAtExit:
  1015. {
  1016. - *msg->opg_Storage = (ULONG) data->deletesessionatexit;
  1017. + *msg->opg_Storage = (IPTR) data->deletesessionatexit;
  1018. }
  1019. return TRUE;
  1020.  
  1021. case MA_OWBApp_SessionRestoreMode:
  1022. {
  1023. - *msg->opg_Storage = (ULONG) data->sessionrestoremode;
  1024. + *msg->opg_Storage = (IPTR) data->sessionrestoremode;
  1025. }
  1026. return TRUE;
  1027.  
  1028. case MA_OWBApp_SaveCookies:
  1029. {
  1030. - *msg->opg_Storage = (ULONG) data->savecookies;
  1031. + *msg->opg_Storage = (IPTR) data->savecookies;
  1032. }
  1033. return TRUE;
  1034.  
  1035. case MA_OWBApp_CookiesPolicy:
  1036. {
  1037. - *msg->opg_Storage = (ULONG) data->cookiespolicy;
  1038. + *msg->opg_Storage = (IPTR) data->cookiespolicy;
  1039. }
  1040. return TRUE;
  1041.  
  1042. /*
  1043. case MA_OWBApp_PersistantCookiesPolicy:
  1044. {
  1045. - *msg->opg_Storage = (ULONG) data->temporarycookiespolicy;
  1046. + *msg->opg_Storage = (IPTR) data->temporarycookiespolicy;
  1047. }
  1048. return TRUE;
  1049.  
  1050. case MA_OWBApp_TemporaryCookiesPolicy:
  1051. {
  1052. - *msg->opg_Storage = (ULONG) data->persistantcookiespolicy;
  1053. + *msg->opg_Storage = (IPTR) data->persistantcookiespolicy;
  1054. }
  1055. return TRUE;
  1056. */
  1057.  
  1058. case MA_OWBApp_SaveFormCredentials:
  1059. {
  1060. - *msg->opg_Storage = (ULONG) data->savecredentials;
  1061. + *msg->opg_Storage = (IPTR) data->savecredentials;
  1062. }
  1063. return TRUE;
  1064.  
  1065. case MA_OWBApp_EnableFormAutofill:
  1066. {
  1067. - *msg->opg_Storage = (ULONG) data->formautofill;
  1068. + *msg->opg_Storage = (IPTR) data->formautofill;
  1069. }
  1070. return TRUE;
  1071.  
  1072. case MA_OWBApp_SaveHistory:
  1073. {
  1074. - *msg->opg_Storage = (ULONG) data->savehistory;
  1075. + *msg->opg_Storage = (IPTR) data->savehistory;
  1076. }
  1077. return TRUE;
  1078.  
  1079. case MA_OWBApp_HistoryItemLimit:
  1080. {
  1081. - *msg->opg_Storage = (ULONG) data->historyitems;
  1082. + *msg->opg_Storage = (IPTR) data->historyitems;
  1083. }
  1084. return TRUE;
  1085.  
  1086. case MA_OWBApp_HistoryAgeInDaysLimit:
  1087. {
  1088. - *msg->opg_Storage = (ULONG) data->historyage;
  1089. + *msg->opg_Storage = (IPTR) data->historyage;
  1090. }
  1091. return TRUE;
  1092.  
  1093. case MA_OWBApp_UserAgent:
  1094. {
  1095. - *msg->opg_Storage = (ULONG) data->useragent;
  1096. + *msg->opg_Storage = (IPTR) data->useragent;
  1097. }
  1098. return TRUE;
  1099.  
  1100. case MA_OWBApp_IgnoreSSLErrors:
  1101. {
  1102. - *msg->opg_Storage = (ULONG) data->ignoreSSLErrors;
  1103. + *msg->opg_Storage = (IPTR) data->ignoreSSLErrors;
  1104. }
  1105. return TRUE;
  1106.  
  1107. case MA_OWBApp_CertificatePath:
  1108. {
  1109. - *msg->opg_Storage = (ULONG) data->certificate_path;
  1110. + *msg->opg_Storage = (IPTR) data->certificate_path;
  1111. }
  1112. return TRUE;
  1113.  
  1114. case MA_OWBApp_EnableInspector:
  1115. {
  1116. - *msg->opg_Storage = (ULONG) data->inspector;
  1117. + *msg->opg_Storage = (IPTR) data->inspector;
  1118. }
  1119. return TRUE;
  1120.  
  1121. case MA_OWBApp_EnableVP8:
  1122. {
  1123. - *msg->opg_Storage = (ULONG) data->use_webm;
  1124. + *msg->opg_Storage = (IPTR) data->use_webm;
  1125. }
  1126. return TRUE;
  1127.  
  1128. case MA_OWBApp_EnableFLV:
  1129. {
  1130. - *msg->opg_Storage = (ULONG) data->use_flv;
  1131. + *msg->opg_Storage = (IPTR) data->use_flv;
  1132. }
  1133. return TRUE;
  1134.  
  1135. case MA_OWBApp_EnableOgg:
  1136. {
  1137. - *msg->opg_Storage = (ULONG) data->use_ogg;
  1138. + *msg->opg_Storage = (IPTR) data->use_ogg;
  1139. }
  1140. return TRUE;
  1141.  
  1142. case MA_OWBApp_EnableMP4:
  1143. {
  1144. - *msg->opg_Storage = (ULONG) data->use_mp4;
  1145. + *msg->opg_Storage = (IPTR) data->use_mp4;
  1146. }
  1147. return TRUE;
  1148.  
  1149. case MA_OWBApp_EnablePartialContent:
  1150. {
  1151. - *msg->opg_Storage = (ULONG) data->use_partial_content;
  1152. + *msg->opg_Storage = (IPTR) data->use_partial_content;
  1153. }
  1154. return TRUE;
  1155.  
  1156. case MA_OWBApp_LoopFilterMode:
  1157. {
  1158. - *msg->opg_Storage = (ULONG) data->loopfilter_mode;
  1159. + *msg->opg_Storage = (IPTR) data->loopfilter_mode;
  1160. }
  1161. return TRUE;
  1162.  
  1163. @@ -1524,37 +1524,37 @@ DEFGET
  1164.  
  1165. case MA_OWBApp_ShowBookmarkPanel:
  1166. {
  1167. - *msg->opg_Storage = (ULONG) data->appsettings.showbookmarkpanel;
  1168. + *msg->opg_Storage = (IPTR) data->appsettings.showbookmarkpanel;
  1169. }
  1170. return TRUE;
  1171.  
  1172. case MA_OWBApp_ShowHistoryPanel:
  1173. {
  1174. - *msg->opg_Storage = (ULONG) data->appsettings.showhistorypanel;
  1175. + *msg->opg_Storage = (IPTR) data->appsettings.showhistorypanel;
  1176. }
  1177. return TRUE;
  1178.  
  1179. case MA_OWBApp_PanelWeight:
  1180. {
  1181. - *msg->opg_Storage = (ULONG) data->appsettings.panelweight;
  1182. + *msg->opg_Storage = (IPTR) data->appsettings.panelweight;
  1183. }
  1184. return TRUE;
  1185.  
  1186. case MA_OWBApp_Bookmark_AddToMenu:
  1187. {
  1188. - *msg->opg_Storage = (ULONG) data->appsettings.addbookmarkstomenu;
  1189. + *msg->opg_Storage = (IPTR) data->appsettings.addbookmarkstomenu;
  1190. }
  1191. return TRUE;
  1192.  
  1193. case MA_OWBApp_ContinuousSpellChecking:
  1194. {
  1195. - *msg->opg_Storage = (ULONG) data->appsettings.continuousspellchecking;
  1196. + *msg->opg_Storage = (IPTR) data->appsettings.continuousspellchecking;
  1197. }
  1198. return TRUE;
  1199.  
  1200. case MA_OWBApp_PrivateBrowsing:
  1201. {
  1202. - *msg->opg_Storage = (ULONG) data->appsettings.privatebrowsing;
  1203. + *msg->opg_Storage = (IPTR) data->appsettings.privatebrowsing;
  1204. }
  1205. return TRUE;
  1206.  
  1207. @@ -1562,7 +1562,7 @@ DEFGET
  1208.  
  1209. case MA_OWBApp_CurrentDirectory:
  1210. {
  1211. - *msg->opg_Storage = (ULONG) data->current_dir;
  1212. + *msg->opg_Storage = (IPTR) data->current_dir;
  1213. }
  1214. return TRUE;
  1215.  
  1216. @@ -1576,7 +1576,7 @@ DEFGET
  1217. browser = (Object *) getv(window, MA_OWBWindow_ActiveBrowser);
  1218. }
  1219.  
  1220. - *msg->opg_Storage = (ULONG) browser;
  1221. + *msg->opg_Storage = (IPTR) browser;
  1222. }
  1223. return TRUE;
  1224.  
  1225. @@ -1609,61 +1609,61 @@ DEFGET
  1226. window = firstwindow;
  1227. }
  1228.  
  1229. - *msg->opg_Storage = (ULONG) window;
  1230. + *msg->opg_Storage = (IPTR) window;
  1231. }
  1232. return TRUE;
  1233.  
  1234. case MA_OWBApp_BookmarkWindow:
  1235. {
  1236. - *msg->opg_Storage = (ULONG) data->bookmarkwin;
  1237. + *msg->opg_Storage = (IPTR) data->bookmarkwin;
  1238. }
  1239. return TRUE;
  1240.  
  1241. case MA_OWBApp_DownloadWindow:
  1242. {
  1243. - *msg->opg_Storage = (ULONG) data->dlwin;
  1244. + *msg->opg_Storage = (IPTR) data->dlwin;
  1245. }
  1246. return TRUE;
  1247.  
  1248. case MA_OWBApp_SearchManagerWindow:
  1249. {
  1250. - *msg->opg_Storage = (ULONG) data->searchmanagerwin;
  1251. + *msg->opg_Storage = (IPTR) data->searchmanagerwin;
  1252. }
  1253. return TRUE;
  1254.  
  1255. case MA_OWBApp_ScriptManagerWindow:
  1256. {
  1257. - *msg->opg_Storage = (ULONG) data->scriptmanagerwin;
  1258. + *msg->opg_Storage = (IPTR) data->scriptmanagerwin;
  1259. }
  1260. return TRUE;
  1261.  
  1262. case MA_OWBApp_PrinterWindow:
  1263. {
  1264. - *msg->opg_Storage = (ULONG) data->printerwin;
  1265. + *msg->opg_Storage = (IPTR) data->printerwin;
  1266. }
  1267. return TRUE;
  1268.  
  1269. case MA_OWBApp_DownloadsInProgress:
  1270. {
  1271. - *msg->opg_Storage = (ULONG) data->downloads_in_progress;
  1272. + *msg->opg_Storage = (IPTR) data->downloads_in_progress;
  1273. }
  1274. return TRUE;
  1275.  
  1276. case MA_OWBApp_HistoryChanged:
  1277. {
  1278. - *msg->opg_Storage = (ULONG) data->history_changed;
  1279. + *msg->opg_Storage = (IPTR) data->history_changed;
  1280. }
  1281. return TRUE;
  1282.  
  1283. case MA_OWBApp_BookmarksChanged:
  1284. {
  1285. - *msg->opg_Storage = (ULONG) data->bookmarks_changed;
  1286. + *msg->opg_Storage = (IPTR) data->bookmarks_changed;
  1287. }
  1288. return TRUE;
  1289.  
  1290. case MA_OWBApp_PrivateBrowsingClients:
  1291. {
  1292. - *msg->opg_Storage = (ULONG) data->privatebrowsing_clients;
  1293. + *msg->opg_Storage = (IPTR) data->privatebrowsing_clients;
  1294. }
  1295. return TRUE;
  1296. }
  1297. @@ -1680,7 +1680,7 @@ static void doset(APTR obj, struct Data *data, struct TagItem *tags)
  1298.  
  1299. while ((tag = NextTagItem(&tstate)) != NULL)
  1300. {
  1301. - ULONG tdata = tag->ti_Data;
  1302. + IPTR tdata = tag->ti_Data;
  1303.  
  1304. switch (tag->ti_Tag)
  1305. {
  1306. @@ -1900,7 +1900,7 @@ DEFSMETHOD(OWBApp_AddPage)
  1307. widget = (BalWidget *) DoMethod(app, MM_OWBApp_AddBrowser, msg->window, msg->url, msg->isframe, NULL, msg->donotactivate, msg->privatebrowsing, msg->addtoend);
  1308. }
  1309.  
  1310. - return (ULONG) widget;
  1311. + return (IPTR) widget;
  1312. }
  1313.  
  1314. /* Add a new window */
  1315. @@ -1969,7 +1969,7 @@ DEFSMETHOD(OWBApp_AddWindow)
  1316. }
  1317. }
  1318.  
  1319. - return (ULONG) widget;
  1320. + return (IPTR) widget;
  1321. }
  1322.  
  1323. /* Remove a window */
  1324. @@ -2004,7 +2004,7 @@ DEFSMETHOD(OWBApp_AddBrowser)
  1325. widget = (BalWidget *) DoMethod(window, MM_OWBWindow_AddBrowser, msg->url, msg->isframe, msg->sourceview, msg->donotactivate, msg->privatebrowsing, msg->addtoend);
  1326. }
  1327.  
  1328. - return (ULONG) widget;
  1329. + return (IPTR) widget;
  1330. }
  1331.  
  1332. /* Remove a browser */
  1333. @@ -2179,7 +2179,7 @@ DEFSMETHOD(OWBApp_Download)
  1334. DoMethod(data->dlwin, MUIM_List_InsertSingle, dl, MUIV_List_Insert_Bottom);
  1335. }
  1336.  
  1337. - return (ULONG)dl;
  1338. + return (IPTR)dl;
  1339. }
  1340.  
  1341. DEFSMETHOD(OWBApp_DownloadUpdate)
  1342. @@ -2646,7 +2646,7 @@ DEFSMETHOD(OWBApp_SaveFormState)
  1343. {
  1344. D(kprintf("Valid formdata found for <%s>\n", webFormPasswordData.origin.string().latin1().data()));
  1345.  
  1346. - if(getv(app, MA_OWBApp_SaveFormCredentials) && DoMethod(data->passwordmanagerwin, MM_PasswordManagerGroup_Get, &(webFormPasswordData.origin.string())) == NULL)
  1347. + if(getv(app, MA_OWBApp_SaveFormCredentials) && DoMethod(data->passwordmanagerwin, MM_PasswordManagerGroup_Get, &(webFormPasswordData.origin.string())) == (IPTR)NULL)
  1348. {
  1349. ExtCredential extCredential(webFormPasswordData.userNameValue,
  1350. webFormPasswordData.passwordValue,
  1351. diff --git a/Source/WebKit/mui/Api/MorphOS/aros_stuff.c b/Source/WebKit/mui/Api/MorphOS/aros_stuff.c
  1352. index 494b178f..fa4dec8f 100644
  1353. --- a/Source/WebKit/mui/Api/MorphOS/aros_stuff.c
  1354. +++ b/Source/WebKit/mui/Api/MorphOS/aros_stuff.c
  1355. @@ -142,8 +142,13 @@ static void aros_trap_handler(ULONG trapNum, BYTE * p)
  1356. crashlocation = (APTR)*((ULONG*)(p + 48));
  1357. *((ULONG*)(p + 48)) = (ULONG)aros_crash_handler;
  1358. #else
  1359. +#if defined (__x86_64__)
  1360. + crashlocation = (APTR)*((IPTR*)(p + 48));
  1361. + *((IPTR*)(p + 48)) = (IPTR)aros_crash_handler;
  1362. +#else
  1363. #error program counter setting code missing for your architecture
  1364. #endif
  1365. +#endif
  1366. }
  1367.  
  1368. void aros_register_trap_handler()
  1369. diff --git a/Source/WebKit/mui/Api/MorphOS/autofillpopupclass.cpp b/Source/WebKit/mui/Api/MorphOS/autofillpopupclass.cpp
  1370. index e643b661..3fe5ba14 100755
  1371. --- a/Source/WebKit/mui/Api/MorphOS/autofillpopupclass.cpp
  1372. +++ b/Source/WebKit/mui/Api/MorphOS/autofillpopupclass.cpp
  1373. @@ -52,9 +52,9 @@ struct Data
  1374. DEFNEW
  1375. {
  1376. Object *lv_suggestions;
  1377. - Object *source = (Object *) GetTagData(MA_AutofillPopup_Source, NULL, msg->ops_AttrList);
  1378. - IntRect *rect = (IntRect *) GetTagData(MA_AutofillPopup_Rect, NULL, msg->ops_AttrList);
  1379. - Vector<String> *suggestions = (Vector<String> *) GetTagData(MA_AutofillPopup_Suggestions, NULL, msg->ops_AttrList);
  1380. + Object *source = (Object *) GetTagData(MA_AutofillPopup_Source, (IPTR)NULL, msg->ops_AttrList);
  1381. + IntRect *rect = (IntRect *) GetTagData(MA_AutofillPopup_Rect, (IPTR)NULL, msg->ops_AttrList);
  1382. + Vector<String> *suggestions = (Vector<String> *) GetTagData(MA_AutofillPopup_Suggestions, (IPTR)NULL, msg->ops_AttrList);
  1383. struct Rect32 r = { _mleft(source) + rect->x(), _mtop(source) + rect->y() + rect->height(), _mleft(source) + rect->maxX(), _mtop(source) + rect->y() + rect->height() + 100 };
  1384.  
  1385. obj = (Object *) DoSuperNew(cl, obj,
  1386. @@ -81,7 +81,7 @@ DEFNEW
  1387. DoMethod(data->lv_suggestions, MUIM_Notify, MUIA_List_Active, MUIV_EveryTime, obj, 3, MM_AutofillPopup_DidSelect, MUIV_TriggerValue, FALSE);
  1388. DoMethod(data->lv_suggestions, MUIM_Notify, MUIA_List_DoubleClick, MUIV_EveryTime, obj, 3, MM_AutofillPopup_DidSelect, -1, TRUE);
  1389. }
  1390. - return ((ULONG)obj);
  1391. + return ((IPTR)obj);
  1392. }
  1393.  
  1394. DEFDISP
  1395. diff --git a/Source/WebKit/mui/Api/MorphOS/autofillpopuplistclass.cpp b/Source/WebKit/mui/Api/MorphOS/autofillpopuplistclass.cpp
  1396. index f78f429f..7202694a 100644
  1397. --- a/Source/WebKit/mui/Api/MorphOS/autofillpopuplistclass.cpp
  1398. +++ b/Source/WebKit/mui/Api/MorphOS/autofillpopuplistclass.cpp
  1399. @@ -52,13 +52,13 @@ DEFNEW
  1400. TAG_MORE, INITTAGS
  1401. );
  1402.  
  1403. - return ((ULONG)obj);
  1404. + return ((IPTR)obj);
  1405. }
  1406.  
  1407. DEFMMETHOD(List_Construct)
  1408. {
  1409. String *entry = (String *) msg->entry;
  1410. - return (ULONG) (new String(*entry));
  1411. + return (IPTR) (new String(*entry));
  1412. }
  1413.  
  1414. DEFMMETHOD(List_Destruct)
  1415. diff --git a/Source/WebKit/mui/Api/MorphOS/blockmanagergroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/blockmanagergroupclass.cpp
  1416. index 0b2ae4f9..aaf369c6 100644
  1417. --- a/Source/WebKit/mui/Api/MorphOS/blockmanagergroupclass.cpp
  1418. +++ b/Source/WebKit/mui/Api/MorphOS/blockmanagergroupclass.cpp
  1419. @@ -77,7 +77,7 @@ static void cycles_init(void)
  1420. STRPTR *current = (STRPTR *)*ptr;
  1421. while(*current)
  1422. {
  1423. - *current = (STRPTR)GSI((ULONG)*current);
  1424. + *current = (STRPTR)GSI((IPTR)*current);
  1425. current++;
  1426. }
  1427. ptr++;
  1428. @@ -139,7 +139,7 @@ DEFNEW
  1429. DoMethod(cy_type, MUIM_Notify, MUIA_Cycle_Active, MUIV_EveryTime, obj, 1, MM_BlockManagerGroup_Change);
  1430. }
  1431.  
  1432. - return ((ULONG)obj);
  1433. + return ((IPTR)obj);
  1434. }
  1435.  
  1436. DEFDISP
  1437. diff --git a/Source/WebKit/mui/Api/MorphOS/blockmanagerlistclass.cpp b/Source/WebKit/mui/Api/MorphOS/blockmanagerlistclass.cpp
  1438. index 510dca39..821ff201 100644
  1439. --- a/Source/WebKit/mui/Api/MorphOS/blockmanagerlistclass.cpp
  1440. +++ b/Source/WebKit/mui/Api/MorphOS/blockmanagerlistclass.cpp
  1441. @@ -54,7 +54,7 @@ DEFNEW
  1442. TAG_MORE, INITTAGS
  1443. );
  1444.  
  1445. - return ((ULONG)obj);
  1446. + return ((IPTR)obj);
  1447. }
  1448.  
  1449. DEFDISP
  1450. @@ -65,7 +65,7 @@ DEFDISP
  1451. DEFMMETHOD(List_Construct)
  1452. {
  1453. // Built by caller
  1454. - return (ULONG)msg->entry;
  1455. + return (IPTR)msg->entry;
  1456. }
  1457.  
  1458. DEFMMETHOD(List_Destruct)
  1459. diff --git a/Source/WebKit/mui/Api/MorphOS/blockmanagerwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/blockmanagerwindowclass.cpp
  1460. index 2b2b4760..920d43f9 100644
  1461. --- a/Source/WebKit/mui/Api/MorphOS/blockmanagerwindowclass.cpp
  1462. +++ b/Source/WebKit/mui/Api/MorphOS/blockmanagerwindowclass.cpp
  1463. @@ -73,7 +73,7 @@ DEFGET
  1464. {
  1465. case MA_OWB_WindowType:
  1466. {
  1467. - *msg->opg_Storage = (ULONG) MV_OWB_Window_BlockManager;
  1468. + *msg->opg_Storage = (IPTR) MV_OWB_Window_BlockManager;
  1469. }
  1470. return TRUE;
  1471. }
  1472. diff --git a/Source/WebKit/mui/Api/MorphOS/bookmarkgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/bookmarkgroupclass.cpp
  1473. index 78bfec7f..6c7ee584 100755
  1474. --- a/Source/WebKit/mui/Api/MorphOS/bookmarkgroupclass.cpp
  1475. +++ b/Source/WebKit/mui/Api/MorphOS/bookmarkgroupclass.cpp
  1476. @@ -43,7 +43,7 @@
  1477. #include "bookmarkgroupclass.h"
  1478.  
  1479. #ifndef get
  1480. -#define get(obj,attr,store) GetAttr(attr,obj,(ULONGPTR)store)
  1481. +#define get(obj,attr,store) GetAttr(attr,obj,(IPTR *)store)
  1482. #endif
  1483.  
  1484. #define D(x)
  1485. @@ -406,7 +406,7 @@ DEFNEW
  1486.  
  1487. if (!obj)
  1488. {
  1489. - return (NULL);
  1490. + return (IPTR)NULL;
  1491. }
  1492.  
  1493. GETDATA;
  1494. @@ -502,7 +502,7 @@ DEFNEW
  1495.  
  1496. //data->notifyreq=dosnotify_start(BOOKMARK_PATH) ;
  1497.  
  1498. - return ((ULONG)obj);
  1499. + return ((IPTR)obj);
  1500. }
  1501.  
  1502. DEFDISP
  1503. @@ -799,7 +799,7 @@ DEFSMETHOD(Bookmarkgroup_AddGroup)
  1504. );
  1505. }
  1506.  
  1507. - D(kprintf("entry is %08lx.\n",(ULONG)entry));
  1508. + D(kprintf("entry is %08lx.\n",(IPTR)entry));
  1509.  
  1510. set(data->lt_bookmark, MUIA_Listtree_Quiet, FALSE);
  1511.  
  1512. @@ -843,7 +843,7 @@ DEFSMETHOD(Bookmarkgroup_AddLink)
  1513. caddress = newnode.address;
  1514. calias = newnode.alias;
  1515.  
  1516. - D(kprintf("AddLink title %s %08lx %08lx\n",msg->title, (ULONG)msg->alias, (ULONG)msg->address));
  1517. + D(kprintf("AddLink title %s %08lx %08lx\n",msg->title, (IPTR)msg->alias, (IPTR)msg->address));
  1518.  
  1519. if (!msg->external)
  1520. {
  1521. @@ -898,7 +898,7 @@ DEFSMETHOD(Bookmarkgroup_AddLink)
  1522. free(calias);
  1523. free(caddress);
  1524.  
  1525. - D(kprintf( "entry is %08lx.\n",(ULONG)entry));
  1526. + D(kprintf( "entry is %08lx.\n",(IPTR)entry));
  1527. set(data->lt_bookmark, MUIA_Listtree_Quiet, FALSE);
  1528. if (entry)
  1529. {
  1530. @@ -913,7 +913,7 @@ DEFSMETHOD(Bookmarkgroup_AddLink)
  1531. obj, 1 | MUIV_PushMethod_Delay(500) | MUIF_PUSHMETHOD_SINGLE,
  1532. MM_Bookmarkgroup_AutoSave);
  1533.  
  1534. - return ((ULONG)entry->tn_User);
  1535. + return ((IPTR)entry->tn_User);
  1536. }
  1537. return (0);
  1538. }
  1539. @@ -1739,7 +1739,7 @@ DEFSMETHOD(Bookmarkgroup_BuildMenu)
  1540.  
  1541. #ifndef MUIM_Family_GetChild
  1542. #define MUIM_Family_GetChild 0x8042c556 /* V20 */
  1543. -struct MUIP_Family_GetChild { ULONG MethodID; LONG nr; Object *ref; };
  1544. +struct MUIP_Family_GetChild { STACKED ULONG MethodID; STACKED LONG nr; STACKED Object *ref; };
  1545. #endif
  1546.  
  1547. DEFTMETHOD(Bookmarkgroup_UpdateMenu)
  1548. diff --git a/Source/WebKit/mui/Api/MorphOS/bookmarklisttreeclass.cpp b/Source/WebKit/mui/Api/MorphOS/bookmarklisttreeclass.cpp
  1549. index 7c7afe2e..17ab97d1 100644
  1550. --- a/Source/WebKit/mui/Api/MorphOS/bookmarklisttreeclass.cpp
  1551. +++ b/Source/WebKit/mui/Api/MorphOS/bookmarklisttreeclass.cpp
  1552. @@ -96,7 +96,7 @@ MUI_HOOK(bookmarklisttree_constructfunc, APTR pool, APTR t)
  1553. struct treedata * td;
  1554. struct treedata * tempnode = (struct treedata *) t;
  1555.  
  1556. - //kprintf( "Listtree construct hook title %08lx alias %08lx address %08lx.\n", (ULONG)tempnode->title, (ULONG)tempnode->alias, (ULONG)tempnode->address);
  1557. + //kprintf( "Listtree construct hook title %08lx alias %08lx address %08lx.\n", (ULONG)tempnode->title, (IPTR)tempnode->alias, (IPTR)tempnode->address);
  1558. if ((td = (struct treedata *) AllocPooled(pool, sizeof(struct treedata))))
  1559. {
  1560. td->flags = tempnode->flags;
  1561. @@ -128,7 +128,7 @@ MUI_HOOK(bookmarklisttree_constructfunc, APTR pool, APTR t)
  1562. }
  1563. }
  1564. //kprintf( "End of construct\n");
  1565. - return (ULONG) (td);
  1566. + return (IPTR) (td);
  1567. }
  1568.  
  1569. MUI_HOOK(bookmarklisttree_destructfunc, APTR pool, APTR t)
  1570. @@ -259,7 +259,7 @@ MUI_HOOK(bookmarklisttree_displayfunc, APTR a, APTR t)
  1571. array[1] = (td->address) ? td->address : (STRPTR)"";
  1572. }
  1573.  
  1574. - if( (ULONG)array[ -1 ] % 2 )
  1575. + if( (IPTR)array[ -1 ] % 2 )
  1576. {
  1577. #if !OS(AROS)
  1578. /* This code overrides internal data structures and causes a crash on AROS */
  1579. @@ -308,7 +308,7 @@ DEFNEW
  1580. data->ehnode.ehn_Flags = MUI_EHF_GUIMODE;
  1581.  
  1582. }
  1583. - return ((ULONG)obj);
  1584. + return ((IPTR)obj);
  1585. }
  1586.  
  1587. DEFDISP
  1588. @@ -380,7 +380,7 @@ DEFGET
  1589. url = current->address;
  1590. }
  1591.  
  1592. - *msg->opg_Storage = (ULONG) url;
  1593. + *msg->opg_Storage = (IPTR) url;
  1594. }
  1595. return TRUE;
  1596. }
  1597. @@ -659,7 +659,7 @@ DEFMMETHOD(ContextMenuBuild)
  1598. if (item) DoMethod(data->cMenu, MUIM_Family_AddTail, item);
  1599.  
  1600. }
  1601. - return (ULONG)data->cMenu;
  1602. + return (IPTR)data->cMenu;
  1603. }
  1604.  
  1605. /***********************************************************************/
  1606. @@ -667,7 +667,7 @@ DEFMMETHOD(ContextMenuBuild)
  1607. DEFMMETHOD(ContextMenuChoice)
  1608. {
  1609. GETDATA;
  1610. - ULONG udata = muiUserData(msg->item);
  1611. + IPTR udata = muiUserData(msg->item);
  1612. struct treedata *td;
  1613.  
  1614. //kprintf("Bookmark menu trig: %lx\n",udata);
  1615. @@ -740,7 +740,7 @@ DEFMMETHOD(ContextMenuChoice)
  1616. //kprintf("Bad Context menu return\n");
  1617. }
  1618. data->drop=NULL;
  1619. - return (ULONG)NULL;
  1620. + return (IPTR)NULL;
  1621. }
  1622.  
  1623. /*
  1624. @@ -748,7 +748,7 @@ DEFMMETHOD(ContextMenuChoice)
  1625. * from nofe different than root. sucky? oh well:)
  1626. */
  1627.  
  1628. -static APTR tree_iteratefind(Object *lt, struct MUIS_Listtree_TreeNode *list, STRPTR pattern, APTR startnode, ULONG *dosearch)
  1629. +static APTR tree_iteratefind(Object *lt, struct MUIS_Listtree_TreeNode *list, STRPTR pattern, APTR startnode, IPTR *dosearch)
  1630. {
  1631. struct MUIS_Listtree_TreeNode *tn;
  1632. UWORD pos=0;
  1633. @@ -798,7 +798,7 @@ static APTR tree_iteratefind(Object *lt, struct MUIS_Listtree_TreeNode *list, ST
  1634.  
  1635. static APTR tree_find(Object *lt, STRPTR pattern, APTR startnode)
  1636. {
  1637. - ULONG dofind = startnode != NULL ? FALSE : TRUE;
  1638. + IPTR dofind = startnode != NULL ? FALSE : TRUE;
  1639. return tree_iteratefind(lt, MUIV_Listtree_GetEntry_ListNode_Root, pattern, startnode, &dofind);
  1640. }
  1641.  
  1642. diff --git a/Source/WebKit/mui/Api/MorphOS/bookmarkpanelgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/bookmarkpanelgroupclass.cpp
  1643. index b460f171..1b6d64d3 100755
  1644. --- a/Source/WebKit/mui/Api/MorphOS/bookmarkpanelgroupclass.cpp
  1645. +++ b/Source/WebKit/mui/Api/MorphOS/bookmarkpanelgroupclass.cpp
  1646. @@ -156,7 +156,7 @@ DEFNEW
  1647.  
  1648. if (!obj)
  1649. {
  1650. - return (NULL);
  1651. + return (IPTR)NULL;
  1652. }
  1653.  
  1654. GETDATA;
  1655. @@ -173,7 +173,7 @@ DEFNEW
  1656.  
  1657. DoMethod(obj, MM_Bookmarkgroup_LoadHtml, BOOKMARK_PATH);
  1658.  
  1659. - return ((ULONG)obj);
  1660. + return ((IPTR)obj);
  1661. }
  1662.  
  1663. DEFDISP
  1664. @@ -457,7 +457,7 @@ DEFSMETHOD(Bookmarkgroup_AddLink)
  1665. newnode.iconimg = NULL;
  1666. newnode.tree = data->lt_bookmark;
  1667.  
  1668. - D(kprintf("AddLink title %s %08lx %08lx\n",msg->title, (ULONG)msg->alias, (ULONG)msg->address));
  1669. + D(kprintf("AddLink title %s %08lx %08lx\n",msg->title, (IPTR)msg->alias, (IPTR)msg->address));
  1670.  
  1671. if (!msg->external)
  1672. {
  1673. diff --git a/Source/WebKit/mui/Api/MorphOS/bookmarkwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/bookmarkwindowclass.cpp
  1674. index e328a6ec..cf260719 100755
  1675. --- a/Source/WebKit/mui/Api/MorphOS/bookmarkwindowclass.cpp
  1676. +++ b/Source/WebKit/mui/Api/MorphOS/bookmarkwindowclass.cpp
  1677. @@ -59,7 +59,7 @@ DEFNEW
  1678. DoMethod(obj, MUIM_Notify, MUIA_Window_CloseRequest, TRUE, obj, 3, MUIM_Set, MUIA_Window_Open, FALSE);
  1679. }
  1680.  
  1681. - return (ULONG)obj;
  1682. + return (IPTR)obj;
  1683. }
  1684.  
  1685. DEFGET
  1686. @@ -68,7 +68,7 @@ DEFGET
  1687. {
  1688. case MA_OWB_WindowType:
  1689. {
  1690. - *msg->opg_Storage = (ULONG) MV_OWB_Window_Bookmarks;
  1691. + *msg->opg_Storage = (IPTR) MV_OWB_Window_Bookmarks;
  1692. }
  1693. return TRUE;
  1694. }
  1695. diff --git a/Source/WebKit/mui/Api/MorphOS/choosetitlegroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/choosetitlegroupclass.cpp
  1696. index 7de9b47f..2781fa6d 100755
  1697. --- a/Source/WebKit/mui/Api/MorphOS/choosetitlegroupclass.cpp
  1698. +++ b/Source/WebKit/mui/Api/MorphOS/choosetitlegroupclass.cpp
  1699. @@ -44,14 +44,14 @@ struct Data
  1700. Object *ch_menu;
  1701. char *url;
  1702. char *title;
  1703. - ULONG quicklink;
  1704. + IPTR quicklink;
  1705. };
  1706.  
  1707. DEFNEW
  1708. {
  1709. Object *bt_ok, *bt_cancel, *str, *ch_menu;
  1710.  
  1711. - char *title = (char *) GetTagData(MA_OWB_Title, NULL, msg->ops_AttrList);
  1712. + char *title = (char *) GetTagData(MA_OWB_Title, (IPTR)NULL, msg->ops_AttrList);
  1713.  
  1714. obj = (Object *) DoSuperNew(cl, obj,
  1715. MUIA_Background, MUII_RequesterBack,
  1716. @@ -85,8 +85,8 @@ DEFNEW
  1717. data->str = str;
  1718. data->ch_menu = ch_menu;
  1719. data->title = title;
  1720. - data->url = (char *) GetTagData(MA_OWB_URL, NULL, msg->ops_AttrList),
  1721. - data->quicklink = (ULONG) GetTagData(MA_ChooseTitleGroup_QuickLink, 0, msg->ops_AttrList),
  1722. + data->url = (char *) GetTagData(MA_OWB_URL, (IPTR)NULL, msg->ops_AttrList),
  1723. + data->quicklink = (IPTR) GetTagData(MA_ChooseTitleGroup_QuickLink, 0, msg->ops_AttrList),
  1724.  
  1725. set(data->str, MUIA_CycleChain, 1);
  1726.  
  1727. @@ -100,7 +100,7 @@ DEFNEW
  1728. obj, 1, MM_ChooseTitleGroup_Add);
  1729. }
  1730.  
  1731. - return (ULONG)obj;
  1732. + return (IPTR)obj;
  1733. }
  1734.  
  1735. DEFDISP
  1736. @@ -119,7 +119,7 @@ DEFTMETHOD(ChooseTitleGroup_Add)
  1737.  
  1738. if(title)
  1739. {
  1740. - ULONG addtomenu = getv(data->ch_menu, MUIA_Selected);
  1741. + IPTR addtomenu = getv(data->ch_menu, MUIA_Selected);
  1742. set(app, MA_OWBApp_Bookmark_AddToMenu, addtomenu);
  1743.  
  1744. DoMethod(app, MM_Bookmarkgroup_AddLink, title, NULL, data->url, TRUE, addtomenu, data->quicklink);
  1745. diff --git a/Source/WebKit/mui/Api/MorphOS/classes.h b/Source/WebKit/mui/Api/MorphOS/classes.h
  1746. index c6732186..399c16de 100755
  1747. --- a/Source/WebKit/mui/Api/MorphOS/classes.h
  1748. +++ b/Source/WebKit/mui/Api/MorphOS/classes.h
  1749. @@ -18,7 +18,7 @@
  1750. #include <libraries/mui.h>
  1751. #include <proto/muimaster.h>
  1752.  
  1753. -#define DEFCLASS(s) ULONG create_##s##class(void); \
  1754. +#define DEFCLASS(s) IPTR create_##s##class(void); \
  1755. struct IClass *get##s##class(void); \
  1756. APTR get##s##classroot(void); \
  1757. void delete_##s##class(void)
  1758. @@ -822,888 +822,888 @@ enum
  1759. /* OWBApp */
  1760.  
  1761. struct MP_Search {
  1762. - ULONG MethodID;
  1763. - STRPTR string;
  1764. - ULONG flags;
  1765. + STACKED ULONG MethodID;
  1766. + STACKED STRPTR string;
  1767. + STACKED ULONG flags;
  1768. };
  1769.  
  1770. struct MP_OWBApp_DisposeObject {
  1771. - ULONG MethodID;
  1772. - APTR obj;
  1773. + STACKED ULONG MethodID;
  1774. + STACKED APTR obj;
  1775. };
  1776.  
  1777. struct MP_OWBApp_DisposeWindow {
  1778. - ULONG MethodID;
  1779. - APTR obj;
  1780. + STACKED ULONG MethodID;
  1781. + STACKED APTR obj;
  1782. };
  1783.  
  1784. struct MP_OWBApp_PrefsSave {
  1785. - ULONG MethodID;
  1786. - ULONG SaveENVARC;
  1787. + STACKED ULONG MethodID;
  1788. + STACKED ULONG SaveENVARC;
  1789. };
  1790.  
  1791. struct MP_OWBApp_OpenWindow {
  1792. - ULONG MethodID;
  1793. - ULONG window_id;
  1794. - ULONG activate;
  1795. + STACKED ULONG MethodID;
  1796. + STACKED ULONG window_id;
  1797. + STACKED ULONG activate;
  1798. };
  1799.  
  1800. struct MP_OWBApp_AddPage {
  1801. - ULONG MethodID;
  1802. - TEXT* url;
  1803. - ULONG isframe;
  1804. - ULONG donotactivate;
  1805. - APTR windowfeatures;
  1806. - Object *window;
  1807. - ULONG privatebrowsing;
  1808. - ULONG addtoend;
  1809. + STACKED ULONG MethodID;
  1810. + STACKED TEXT* url;
  1811. + STACKED ULONG isframe;
  1812. + STACKED ULONG donotactivate;
  1813. + STACKED APTR windowfeatures;
  1814. + STACKED Object *window;
  1815. + STACKED ULONG privatebrowsing;
  1816. + STACKED ULONG addtoend;
  1817. };
  1818.  
  1819. struct MP_OWBApp_AddWindow {
  1820. - ULONG MethodID;
  1821. - TEXT* url;
  1822. - ULONG isframe;
  1823. - APTR sourceview;
  1824. - ULONG urlfocus;
  1825. - APTR windowfeatures;
  1826. - ULONG privatebrowsing;
  1827. + STACKED ULONG MethodID;
  1828. + STACKED TEXT* url;
  1829. + STACKED ULONG isframe;
  1830. + STACKED APTR sourceview;
  1831. + STACKED ULONG urlfocus;
  1832. + STACKED APTR windowfeatures;
  1833. + STACKED ULONG privatebrowsing;
  1834. };
  1835.  
  1836. struct MP_OWBApp_RemoveWindow {
  1837. - ULONG MethodID;
  1838. - Object *window;
  1839. + STACKED ULONG MethodID;
  1840. + STACKED Object *window;
  1841. };
  1842.  
  1843. struct MP_OWBApp_AddBrowser {
  1844. - ULONG MethodID;
  1845. - Object* window;
  1846. - TEXT* url;
  1847. - ULONG isframe;
  1848. - APTR sourceview;
  1849. - ULONG donotactivate;
  1850. - ULONG privatebrowsing;
  1851. - ULONG addtoend;
  1852. + STACKED ULONG MethodID;
  1853. + STACKED Object* window;
  1854. + STACKED TEXT* url;
  1855. + STACKED ULONG isframe;
  1856. + STACKED APTR sourceview;
  1857. + STACKED ULONG donotactivate;
  1858. + STACKED ULONG privatebrowsing;
  1859. + STACKED ULONG addtoend;
  1860. };
  1861.  
  1862. struct MP_OWBApp_RemoveBrowser {
  1863. - ULONG MethodID;
  1864. - Object* browser;
  1865. + STACKED ULONG MethodID;
  1866. + STACKED Object* browser;
  1867. };
  1868.  
  1869. struct MP_OWBApp_Download {
  1870. - ULONG MethodID;
  1871. - STRPTR url;
  1872. - STRPTR suggestedname;
  1873. - APTR webdownload;
  1874. + STACKED ULONG MethodID;
  1875. + STACKED STRPTR url;
  1876. + STACKED STRPTR suggestedname;
  1877. + STACKED APTR webdownload;
  1878. };
  1879.  
  1880. struct MP_OWBApp_DownloadDone {
  1881. - ULONG MethodID;
  1882. - APTR entry;
  1883. + STACKED ULONG MethodID;
  1884. + STACKED APTR entry;
  1885. };
  1886.  
  1887. struct MP_OWBApp_DownloadError {
  1888. - ULONG MethodID;
  1889. - APTR entry;
  1890. - char *error;
  1891. + STACKED ULONG MethodID;
  1892. + STACKED APTR entry;
  1893. + STACKED char *error;
  1894. };
  1895.  
  1896. struct MP_OWBApp_DownloadCancelled {
  1897. - ULONG MethodID;
  1898. - APTR entry;
  1899. + STACKED ULONG MethodID;
  1900. + STACKED APTR entry;
  1901. };
  1902.  
  1903. struct MP_OWBApp_DownloadUpdate {
  1904. - ULONG MethodID;
  1905. - APTR entry;
  1906. + STACKED ULONG MethodID;
  1907. + STACKED APTR entry;
  1908. };
  1909.  
  1910. struct MP_OWBApp_Login {
  1911. - ULONG MethodID;
  1912. - TEXT *host;
  1913. - TEXT *realm;
  1914. - TEXT **username;
  1915. - TEXT **password;
  1916. - ULONG *persistence;
  1917. + STACKED ULONG MethodID;
  1918. + STACKED TEXT *host;
  1919. + STACKED TEXT *realm;
  1920. + STACKED TEXT **username;
  1921. + STACKED TEXT **password;
  1922. + STACKED ULONG *persistence;
  1923. };
  1924.  
  1925. struct MP_OWBApp_SetCredential {
  1926. - ULONG MethodID;
  1927. - APTR host;
  1928. - APTR realm;
  1929. - APTR credential;
  1930. + STACKED ULONG MethodID;
  1931. + STACKED APTR host;
  1932. + STACKED APTR realm;
  1933. + STACKED APTR credential;
  1934. };
  1935.  
  1936. struct MP_OWBApp_SetFormState {
  1937. - ULONG MethodID;
  1938. - APTR host;
  1939. - APTR doc;
  1940. + STACKED ULONG MethodID;
  1941. + STACKED APTR host;
  1942. + STACKED APTR doc;
  1943. };
  1944.  
  1945. struct MP_OWBApp_SaveFormState {
  1946. - ULONG MethodID;
  1947. - APTR webView;
  1948. - APTR request;
  1949. + STACKED ULONG MethodID;
  1950. + STACKED APTR webView;
  1951. + STACKED APTR request;
  1952. };
  1953.  
  1954. struct MP_OWBApp_MailTo {
  1955. - ULONG MethodID;
  1956. - TEXT *url;
  1957. + STACKED ULONG MethodID;
  1958. + STACKED TEXT *url;
  1959. };
  1960.  
  1961. struct MP_OWBApp_AddConsoleMessage {
  1962. - ULONG MethodID;
  1963. - STRPTR message;
  1964. + STACKED ULONG MethodID;
  1965. + STACKED STRPTR message;
  1966. };
  1967.  
  1968. struct MP_OWBApp_BuildUserMenu
  1969. {
  1970. - ULONG MethodID;
  1971. - int category;
  1972. - APTR controller;
  1973. - APTR menu;
  1974. + STACKED ULONG MethodID;
  1975. + STACKED int category;
  1976. + STACKED APTR controller;
  1977. + STACKED APTR menu;
  1978. };
  1979.  
  1980. struct MP_OWBApp_SelectUserMenu
  1981. {
  1982. - ULONG MethodID;
  1983. - APTR item;
  1984. - APTR menucontroller;
  1985. + STACKED ULONG MethodID;
  1986. + STACKED APTR item;
  1987. + STACKED APTR menucontroller;
  1988. };
  1989.  
  1990. struct MP_OWBApp_CanShowMediaMimeType
  1991. {
  1992. - ULONG MethodID;
  1993. - STRPTR mimetype;
  1994. + STACKED ULONG MethodID;
  1995. + STACKED STRPTR mimetype;
  1996. };
  1997.  
  1998. struct MP_OWBApp_RequestPolicyForMimeType
  1999. {
  2000. - ULONG MethodID;
  2001. - APTR response;
  2002. - APTR request;
  2003. - APTR webview;
  2004. - APTR webframe;
  2005. - APTR listener;
  2006. + STACKED ULONG MethodID;
  2007. + STACKED APTR response;
  2008. + STACKED APTR request;
  2009. + STACKED APTR webview;
  2010. + STACKED APTR webframe;
  2011. + STACKED APTR listener;
  2012. };
  2013.  
  2014. struct MP_OWBApp_ProcessResourceClientAction {
  2015. - ULONG MethodID;
  2016. - ULONG action;
  2017. - APTR client;
  2018. - APTR job;
  2019. - APTR response;
  2020. - APTR data;
  2021. - int totalsize;
  2022. - APTR redirectedrequest;
  2023. - APTR resourceerror;
  2024. - APTR authenticationchallenge;
  2025. + STACKED ULONG MethodID;
  2026. + STACKED IPTR action;
  2027. + STACKED APTR client;
  2028. + STACKED APTR job;
  2029. + STACKED APTR response;
  2030. + STACKED APTR data;
  2031. + STACKED int totalsize;
  2032. + STACKED APTR redirectedrequest;
  2033. + STACKED APTR resourceerror;
  2034. + STACKED APTR authenticationchallenge;
  2035. };
  2036.  
  2037. struct MP_OWBApp_RestoreSession {
  2038. - ULONG MethodID;
  2039. - ULONG ask;
  2040. - ULONG selectfile;
  2041. + STACKED ULONG MethodID;
  2042. + STACKED ULONG ask;
  2043. + STACKED ULONG selectfile;
  2044. };
  2045.  
  2046. struct MP_OWBApp_SaveSession {
  2047. - ULONG MethodID;
  2048. - ULONG selectfile;
  2049. + STACKED ULONG MethodID;
  2050. + STACKED ULONG selectfile;
  2051. };
  2052.  
  2053. /* OWBWindow */
  2054. struct MP_OWBWindow_AddBrowser {
  2055. - ULONG MethodID;
  2056. - TEXT* url;
  2057. - ULONG isframe;
  2058. - APTR sourceview;
  2059. - ULONG donotactivate;
  2060. - ULONG privatebrowsing;
  2061. - ULONG addtoend;
  2062. + STACKED ULONG MethodID;
  2063. + STACKED TEXT* url;
  2064. + STACKED ULONG isframe;
  2065. + STACKED APTR sourceview;
  2066. + STACKED ULONG donotactivate;
  2067. + STACKED ULONG privatebrowsing;
  2068. + STACKED ULONG addtoend;
  2069. };
  2070.  
  2071. struct MP_OWBWindow_RemoveBrowser {
  2072. - ULONG MethodID;
  2073. - Object* browser;
  2074. + STACKED ULONG MethodID;
  2075. + STACKED Object* browser;
  2076. };
  2077.  
  2078. struct MP_OWBWindow_DetachBrowser {
  2079. - ULONG MethodID;
  2080. - Object* browser;
  2081. - Object* window;
  2082. + STACKED ULONG MethodID;
  2083. + STACKED Object* browser;
  2084. + STACKED Object* window;
  2085. };
  2086.  
  2087. struct MP_OWBWindow_TransferBrowser {
  2088. - ULONG MethodID;
  2089. - Object* browser;
  2090. + STACKED ULONG MethodID;
  2091. + STACKED Object* browser;
  2092. };
  2093.  
  2094. struct MP_OWBWindow_ActivePage {
  2095. - ULONG MethodID;
  2096. - ULONG pagenum;
  2097. + STACKED ULONG MethodID;
  2098. + STACKED ULONG pagenum;
  2099. };
  2100.  
  2101. struct MP_OWBWindow_CreateInspector {
  2102. - ULONG MethodID;
  2103. - Object* browser;
  2104. + STACKED ULONG MethodID;
  2105. + STACKED Object* browser;
  2106. };
  2107.  
  2108. struct MP_OWBWindow_DestroyInspector {
  2109. - ULONG MethodID;
  2110. - Object* browser;
  2111. + STACKED ULONG MethodID;
  2112. + STACKED Object* browser;
  2113. };
  2114.  
  2115. struct MP_OWBWindow_LoadURL {
  2116. - ULONG MethodID;
  2117. - TEXT* url;
  2118. - APTR browser;
  2119. + STACKED ULONG MethodID;
  2120. + STACKED TEXT* url;
  2121. + STACKED APTR browser;
  2122. };
  2123.  
  2124. struct MP_OWBWindow_Reload {
  2125. - ULONG MethodID;
  2126. - Object* browser;
  2127. + STACKED ULONG MethodID;
  2128. + STACKED Object* browser;
  2129. };
  2130.  
  2131. struct MP_OWBWindow_MenuAction {
  2132. - ULONG MethodID;
  2133. - ULONG action;
  2134. + STACKED ULONG MethodID;
  2135. + STACKED IPTR action;
  2136. };
  2137.  
  2138. struct MP_OWBWindow_UpdateTitle {
  2139. - ULONG MethodID;
  2140. - APTR browser;
  2141. - TEXT* title;
  2142. + STACKED ULONG MethodID;
  2143. + STACKED APTR browser;
  2144. + STACKED TEXT* title;
  2145. };
  2146.  
  2147. struct MP_OWBWindow_UpdateStatus {
  2148. - ULONG MethodID;
  2149. - APTR browser;
  2150. - TEXT *status;
  2151. + STACKED ULONG MethodID;
  2152. + STACKED APTR browser;
  2153. + STACKED TEXT *status;
  2154. };
  2155.  
  2156. struct MP_OWBWindow_UpdateURL {
  2157. - ULONG MethodID;
  2158. - APTR browser;
  2159. - TEXT *url;
  2160. + STACKED ULONG MethodID;
  2161. + STACKED APTR browser;
  2162. + STACKED TEXT *url;
  2163. };
  2164.  
  2165. struct MP_OWBWindow_UpdateNavigation {
  2166. - ULONG MethodID;
  2167. - APTR browser;
  2168. + STACKED ULONG MethodID;
  2169. + STACKED APTR browser;
  2170. };
  2171.  
  2172. struct MP_OWBWindow_UpdateProgress {
  2173. - ULONG MethodID;
  2174. - APTR browser;
  2175. + STACKED ULONG MethodID;
  2176. + STACKED APTR browser;
  2177. };
  2178.  
  2179. struct MP_OWBWindow_UpdateState {
  2180. - ULONG MethodID;
  2181. - APTR browser;
  2182. - ULONG state;
  2183. + STACKED ULONG MethodID;
  2184. + STACKED APTR browser;
  2185. + STACKED ULONG state;
  2186. };
  2187.  
  2188. struct MP_OWBWindow_UpdateZone {
  2189. - ULONG MethodID;
  2190. - APTR browser;
  2191. - ULONG zone;
  2192. + STACKED ULONG MethodID;
  2193. + STACKED APTR browser;
  2194. + STACKED ULONG zone;
  2195. };
  2196.  
  2197. struct MP_OWBWindow_UpdateSecurity {
  2198. - ULONG MethodID;
  2199. - APTR browser;
  2200. - ULONG security;
  2201. + STACKED ULONG MethodID;
  2202. + STACKED APTR browser;
  2203. + STACKED ULONG security;
  2204. };
  2205.  
  2206. struct MP_OWBWindow_UpdatePrivateBrowsing {
  2207. - ULONG MethodID;
  2208. - APTR browser;
  2209. - ULONG enabled;
  2210. + STACKED ULONG MethodID;
  2211. + STACKED APTR browser;
  2212. + STACKED ULONG enabled;
  2213. };
  2214.  
  2215. struct MP_OWBWindow_UpdateUserScript {
  2216. - ULONG MethodID;
  2217. - APTR browser;
  2218. - STRPTR url;
  2219. + STACKED ULONG MethodID;
  2220. + STACKED APTR browser;
  2221. + STACKED STRPTR url;
  2222. };
  2223.  
  2224. struct MP_OWBWindow_UpdateMenu {
  2225. - ULONG MethodID;
  2226. - APTR browser;
  2227. + STACKED ULONG MethodID;
  2228. + STACKED APTR browser;
  2229. };
  2230.  
  2231. struct MP_OWBWindow_AddClosedView {
  2232. - ULONG MethodID;
  2233. - APTR browser;
  2234. + STACKED ULONG MethodID;
  2235. + STACKED APTR browser;
  2236. };
  2237.  
  2238. struct MP_OWBWindow_AddHistoryItem {
  2239. - ULONG MethodID;
  2240. - APTR item;
  2241. + STACKED ULONG MethodID;
  2242. + STACKED APTR item;
  2243. };
  2244.  
  2245. struct MP_OWBWindow_Find {
  2246. - ULONG MethodID;
  2247. - STRPTR string;
  2248. - ULONG flags;
  2249. + STACKED ULONG MethodID;
  2250. + STACKED STRPTR string;
  2251. + STACKED ULONG flags;
  2252. };
  2253.  
  2254. struct MP_OWBWindow_InsertBookmarkAskTitle {
  2255. - ULONG MethodID;
  2256. - STRPTR url;
  2257. - STRPTR title;
  2258. - ULONG quicklink;
  2259. + STACKED ULONG MethodID;
  2260. + STACKED STRPTR url;
  2261. + STACKED STRPTR title;
  2262. + STACKED ULONG quicklink;
  2263. };
  2264.  
  2265. struct MP_OWBWindow_JavaScriptPrompt {
  2266. - ULONG MethodID;
  2267. - STRPTR message;
  2268. - STRPTR defaultvalue;
  2269. + STACKED ULONG MethodID;
  2270. + STACKED STRPTR message;
  2271. + STACKED STRPTR defaultvalue;
  2272. };
  2273.  
  2274. struct MP_OWBWindow_AutoComplete {
  2275. - ULONG MethodID;
  2276. - LONG len;
  2277. - LONG prevlen;
  2278. + STACKED ULONG MethodID;
  2279. + STACKED LONG len;
  2280. + STACKED LONG prevlen;
  2281. };
  2282.  
  2283. struct MP_OWBWindow_FullScreen {
  2284. - ULONG MethodID;
  2285. - ULONG fullscreen;
  2286. + STACKED ULONG MethodID;
  2287. + STACKED ULONG fullscreen;
  2288. };
  2289.  
  2290. /* OWBBrowser */
  2291.  
  2292. struct MP_OWBBrowser_Expose {
  2293. - ULONG MethodID;
  2294. - ULONG updatecontrols;
  2295. + STACKED ULONG MethodID;
  2296. + STACKED ULONG updatecontrols;
  2297. };
  2298.  
  2299. struct MP_OWBBrowser_Update {
  2300. - ULONG MethodID;
  2301. - APTR rect;
  2302. - ULONG sync;
  2303. + STACKED ULONG MethodID;
  2304. + STACKED APTR rect;
  2305. + STACKED ULONG sync;
  2306. };
  2307.  
  2308. struct MP_OWBBrowser_Scroll {
  2309. - ULONG MethodID;
  2310. - int dx;
  2311. - int dy;
  2312. - APTR rect;
  2313. + STACKED ULONG MethodID;
  2314. + STACKED int dx;
  2315. + STACKED int dy;
  2316. + STACKED APTR rect;
  2317. };
  2318.  
  2319. struct MP_OWBBrowser_DidStartProvisionalLoad {
  2320. - ULONG MethodID;
  2321. - APTR webframe;
  2322. + STACKED ULONG MethodID;
  2323. + STACKED APTR webframe;
  2324. };
  2325.  
  2326. struct MP_OWBBrowser_DidCommitLoad {
  2327. - ULONG MethodID;
  2328. - APTR webframe;
  2329. + STACKED ULONG MethodID;
  2330. + STACKED APTR webframe;
  2331. };
  2332.  
  2333. struct MP_OWBBrowser_WillCloseFrame {
  2334. - ULONG MethodID;
  2335. - APTR webframe;
  2336. + STACKED ULONG MethodID;
  2337. + STACKED APTR webframe;
  2338. };
  2339.  
  2340. struct MP_OWBBrowser_PopupMenu {
  2341. - ULONG MethodID;
  2342. - APTR popupinfo;
  2343. + STACKED ULONG MethodID;
  2344. + STACKED APTR popupinfo;
  2345. };
  2346.  
  2347. struct MP_OWBBrowser_Autofill_ShowPopup {
  2348. - ULONG MethodID;
  2349. - APTR suggestions;
  2350. - APTR rect;
  2351. + STACKED ULONG MethodID;
  2352. + STACKED APTR suggestions;
  2353. + STACKED APTR rect;
  2354. };
  2355.  
  2356. struct MP_OWBBrowser_Autofill_HidePopup {
  2357. - ULONG MethodID;
  2358. + STACKED ULONG MethodID;
  2359. };
  2360.  
  2361. struct MP_OWBBrowser_Autofill_DidSelect {
  2362. - ULONG MethodID;
  2363. - APTR value;
  2364. + STACKED ULONG MethodID;
  2365. + STACKED APTR value;
  2366. };
  2367.  
  2368. struct MP_OWBBrowser_Autofill_SaveTextFields {
  2369. - ULONG MethodID;
  2370. - APTR form;
  2371. + STACKED ULONG MethodID;
  2372. + STACKED APTR form;
  2373. };
  2374.  
  2375. struct MP_OWBBrowser_Autofill_DidChangeInTextField {
  2376. - ULONG MethodID;
  2377. - APTR element;
  2378. + STACKED ULONG MethodID;
  2379. + STACKED APTR element;
  2380. };
  2381.  
  2382. struct MP_OWBBrowser_Autofill_HandleNavigationEvent {
  2383. - ULONG MethodID;
  2384. - APTR event;
  2385. + STACKED ULONG MethodID;
  2386. + STACKED APTR event;
  2387. };
  2388.  
  2389. struct MP_OWBBrowser_ColorChooser_ShowPopup {
  2390. - ULONG MethodID;
  2391. - APTR client;
  2392. - APTR color;
  2393. + STACKED ULONG MethodID;
  2394. + STACKED APTR client;
  2395. + STACKED APTR color;
  2396. };
  2397.  
  2398. struct MP_OWBBrowser_ColorChooser_HidePopup {
  2399. - ULONG MethodID;
  2400. + STACKED ULONG MethodID;
  2401. };
  2402.  
  2403. struct MP_OWBBrowser_DateTimeChooser_ShowPopup {
  2404. - ULONG MethodID;
  2405. - APTR client;
  2406. + STACKED ULONG MethodID;
  2407. + STACKED APTR client;
  2408. };
  2409.  
  2410. struct MP_OWBBrowser_DateTimeChooser_HidePopup {
  2411. - ULONG MethodID;
  2412. + STACKED ULONG MethodID;
  2413. };
  2414.  
  2415. struct MP_OWBBrowser_Print {
  2416. - ULONG MethodID;
  2417. - STRPTR file;
  2418. - ULONG headerheight;
  2419. - ULONG footerheight;
  2420. - APTR scalefactor; // ptr to double
  2421. - ULONG mode;
  2422. + STACKED ULONG MethodID;
  2423. + STACKED STRPTR file;
  2424. + STACKED ULONG headerheight;
  2425. + STACKED ULONG footerheight;
  2426. + STACKED APTR scalefactor; // ptr to double
  2427. + STACKED ULONG mode;
  2428. };
  2429.  
  2430. struct MP_OWBBrowser_SetScrollOffset {
  2431. - ULONG MethodID;
  2432. - LONG x;
  2433. - LONG y;
  2434. + STACKED ULONG MethodID;
  2435. + STACKED LONG x;
  2436. + STACKED LONG y;
  2437. };
  2438.  
  2439. struct MP_OWBBrowser_VideoEnterFullPage {
  2440. - ULONG MethodID;
  2441. - APTR element;
  2442. - ULONG fullscreen;
  2443. + STACKED ULONG MethodID;
  2444. + STACKED APTR element;
  2445. + STACKED ULONG fullscreen;
  2446. };
  2447.  
  2448. struct MP_OWBBrowser_VideoBlit {
  2449. - ULONG MethodID;
  2450. - unsigned char **src;
  2451. - int *stride;
  2452. - int width;
  2453. - int height;
  2454. + STACKED ULONG MethodID;
  2455. + STACKED unsigned char **src;
  2456. + STACKED int *stride;
  2457. + STACKED int width;
  2458. + STACKED int height;
  2459. };
  2460.  
  2461. /* AddressBarGroup */
  2462.  
  2463. struct MP_AddressBarGroup_Mark {
  2464. - ULONG MethodID;
  2465. - STRPTR url;
  2466. + STACKED ULONG MethodID;
  2467. + STACKED STRPTR url;
  2468. };
  2469.  
  2470. struct MP_AddressBarGroup_CompleteString {
  2471. - ULONG MethodID;
  2472. - STRPTR url;
  2473. - ULONG cursorpos;
  2474. - ULONG markstart;
  2475. - ULONG markend;
  2476. + STACKED ULONG MethodID;
  2477. + STACKED STRPTR url;
  2478. + STACKED ULONG cursorpos;
  2479. + STACKED ULONG markstart;
  2480. + STACKED ULONG markend;
  2481. };
  2482.  
  2483. /* SearchBarGroup */
  2484.  
  2485. struct MP_SearchBarGroup_LoadURLFromShortcut {
  2486. - ULONG MethodID;
  2487. - STRPTR shortcut;
  2488. - STRPTR string;
  2489. + STACKED ULONG MethodID;
  2490. + STACKED STRPTR shortcut;
  2491. + STACKED STRPTR string;
  2492. };
  2493.  
  2494. /* Download */
  2495. struct MP_Download_Done {
  2496. - ULONG MethodID;
  2497. - APTR entry;
  2498. + STACKED ULONG MethodID;
  2499. + STACKED APTR entry;
  2500. };
  2501.  
  2502. struct MP_Download_Error {
  2503. - ULONG MethodID;
  2504. - APTR entry;
  2505. - char *error;
  2506. + STACKED ULONG MethodID;
  2507. + STACKED APTR entry;
  2508. + STACKED char *error;
  2509. };
  2510.  
  2511. struct MP_Download_Cancelled {
  2512. - ULONG MethodID;
  2513. - APTR entry;
  2514. + STACKED ULONG MethodID;
  2515. + STACKED APTR entry;
  2516. };
  2517.  
  2518. struct MP_Download_RemoveEntry {
  2519. - ULONG MethodID;
  2520. - APTR listview;
  2521. - LONG all;
  2522. + STACKED ULONG MethodID;
  2523. + STACKED APTR listview;
  2524. + STACKED LONG all;
  2525. };
  2526.  
  2527. struct MP_Download_Cancel {
  2528. - ULONG MethodID;
  2529. - LONG all;
  2530. + STACKED ULONG MethodID;
  2531. + STACKED LONG all;
  2532. };
  2533.  
  2534. struct MP_Download_Retry {
  2535. - ULONG MethodID;
  2536. - APTR listview;
  2537. + STACKED ULONG MethodID;
  2538. + STACKED APTR listview;
  2539. };
  2540.  
  2541. struct MP_Download_HilightPage {
  2542. - ULONG MethodID;
  2543. - ULONG pagenum;
  2544. + STACKED ULONG MethodID;
  2545. + STACKED ULONG pagenum;
  2546. };
  2547.  
  2548. struct MP_Download_UnhilightPage {
  2549. - ULONG MethodID;
  2550. - ULONG pagenum;
  2551. + STACKED ULONG MethodID;
  2552. + STACKED ULONG pagenum;
  2553. };
  2554.  
  2555. /* FindText */
  2556. struct MP_FindText_DisableButtons {
  2557. - ULONG MethodID;
  2558. - LONG prev;
  2559. - LONG next;
  2560. + STACKED ULONG MethodID;
  2561. + STACKED LONG prev;
  2562. + STACKED LONG next;
  2563. };
  2564.  
  2565. struct MP_FindText_Find {
  2566. - ULONG MethodID;
  2567. - STRPTR string;
  2568. - ULONG flags;
  2569. - ULONG validate;
  2570. + STACKED ULONG MethodID;
  2571. + STACKED STRPTR string;
  2572. + STACKED ULONG flags;
  2573. + STACKED ULONG validate;
  2574. };
  2575.  
  2576. /* PopString */
  2577. struct MP_PopString_Insert {
  2578. - ULONG MethodID;
  2579. - TEXT* txt;
  2580. + STACKED ULONG MethodID;
  2581. + STACKED TEXT* txt;
  2582. };
  2583.  
  2584. struct MP_FontFamilyPopString_InsertFamily {
  2585. - ULONG MethodID;
  2586. - TEXT* txt;
  2587. + STACKED ULONG MethodID;
  2588. + STACKED TEXT* txt;
  2589. };
  2590.  
  2591. /* HistoryList */
  2592. struct MP_HistoryList_Redraw {
  2593. - ULONG MethodID;
  2594. - APTR entry;
  2595. + STACKED ULONG MethodID;
  2596. + STACKED APTR entry;
  2597. };
  2598.  
  2599. /* Bookmark */
  2600. struct MP_Bookmarkgroup_Update {
  2601. - ULONG MethodID;
  2602. - ULONG from;
  2603. + STACKED ULONG MethodID;
  2604. + STACKED ULONG from;
  2605. };
  2606.  
  2607. struct MP_Bookmarkgroup_AddLink {
  2608. - ULONG MethodID;
  2609. - TEXT* title;
  2610. - TEXT* alias;
  2611. - TEXT* address;
  2612. - ULONG external;
  2613. - ULONG menu;
  2614. - ULONG quicklink;
  2615. + STACKED ULONG MethodID;
  2616. + STACKED TEXT* title;
  2617. + STACKED TEXT* alias;
  2618. + STACKED TEXT* address;
  2619. + STACKED ULONG external;
  2620. + STACKED ULONG menu;
  2621. + STACKED ULONG quicklink;
  2622. };
  2623.  
  2624. struct MP_Bookmarkgroup_AddGroup {
  2625. - ULONG MethodID;
  2626. - TEXT* title;
  2627. + STACKED ULONG MethodID;
  2628. + STACKED TEXT* title;
  2629. };
  2630.  
  2631. struct MP_Bookmarkgroup_LoadHtml {
  2632. - LONG MethodID;
  2633. - TEXT* file;
  2634. + STACKED ULONG MethodID;
  2635. + STACKED TEXT* file;
  2636. };
  2637.  
  2638. struct MP_Bookmarkgroup_SaveHtml {
  2639. - LONG MethodID;
  2640. - TEXT* file;
  2641. - ULONG type;
  2642. + STACKED ULONG MethodID;
  2643. + STACKED TEXT* file;
  2644. + STACKED ULONG type;
  2645. };
  2646.  
  2647. struct MP_Bookmarkgroup_BuildMenu {
  2648. - LONG MethodID;
  2649. - Object *menu;
  2650. + STACKED ULONG MethodID;
  2651. + STACKED Object *menu;
  2652. };
  2653.  
  2654. struct MP_Bookmarkgroup_RegisterQLGroup {
  2655. - LONG MethodID;
  2656. - Object *group;
  2657. - Object *parent;
  2658. + STACKED ULONG MethodID;
  2659. + STACKED Object *group;
  2660. + STACKED Object *parent;
  2661. };
  2662.  
  2663. struct MP_Bookmarkgroup_UnRegisterQLGroup {
  2664. - LONG MethodID;
  2665. - Object *group;
  2666. + STACKED ULONG MethodID;
  2667. + STACKED Object *group;
  2668. };
  2669.  
  2670. struct MP_Bookmarkgroup_AddQuickLink {
  2671. - LONG MethodID;
  2672. - struct treedata *node;
  2673. - LONG pos;
  2674. + STACKED ULONG MethodID;
  2675. + STACKED struct treedata *node;
  2676. + STACKED LONG pos;
  2677. };
  2678.  
  2679. struct MP_Bookmarkgroup_RemoveQuickLink {
  2680. - LONG MethodID;
  2681. - struct treedata *node;
  2682. + STACKED ULONG MethodID;
  2683. + STACKED struct treedata *node;
  2684. };
  2685.  
  2686. struct MP_Bookmarkgroup_ContainsURL {
  2687. - LONG MethodID;
  2688. - void *url;
  2689. + STACKED ULONG MethodID;
  2690. + STACKED void *url;
  2691. };
  2692.  
  2693. /* QuickLinkButtonGroup */
  2694. struct MP_QuickLinkButtonGroup_RedrawMenuItem {
  2695. - LONG MethodID;
  2696. - APTR obj;
  2697. + STACKED ULONG MethodID;
  2698. + STACKED APTR obj;
  2699. };
  2700.  
  2701. /* QuickLinkGroup */
  2702. struct MP_QuickLinkGroup_Add {
  2703. - LONG MethodID;
  2704. - struct treedata *td;
  2705. + STACKED ULONG MethodID;
  2706. + STACKED struct treedata *td;
  2707. };
  2708.  
  2709. struct MP_QuickLinkGroup_Remove {
  2710. - LONG MethodID;
  2711. - struct treedata *td;
  2712. + STACKED ULONG MethodID;
  2713. + STACKED struct treedata *td;
  2714. };
  2715.  
  2716. struct MP_QuickLinkGroup_Update {
  2717. - LONG MethodID;
  2718. - struct treedata *td;
  2719. + STACKED ULONG MethodID;
  2720. + STACKED struct treedata *td;
  2721. };
  2722.  
  2723. struct MP_QuickLinkGroup_InitChange {
  2724. - LONG MethodID;
  2725. - ULONG mode;
  2726. + STACKED ULONG MethodID;
  2727. + STACKED ULONG mode;
  2728. };
  2729.  
  2730. struct MP_QuickLinkGroup_ExitChange {
  2731. - LONG MethodID;
  2732. - ULONG mode;
  2733. + STACKED ULONG MethodID;
  2734. + STACKED ULONG mode;
  2735. };
  2736.  
  2737. /* NetworkLedsGroup */
  2738. struct MP_Network_AddJob {
  2739. - LONG MethodID;
  2740. - APTR job;
  2741. + STACKED ULONG MethodID;
  2742. + STACKED APTR job;
  2743. };
  2744.  
  2745. struct MP_Network_UpdateJob {
  2746. - LONG MethodID;
  2747. - APTR job;
  2748. + STACKED ULONG MethodID;
  2749. + STACKED APTR job;
  2750. };
  2751.  
  2752. struct MP_Network_RemoveJob {
  2753. - LONG MethodID;
  2754. - APTR job;
  2755. + STACKED ULONG MethodID;
  2756. + STACKED APTR job;
  2757. };
  2758.  
  2759. /* NetworkWindow */
  2760. struct MP_NetworkWindow_Cancel {
  2761. - LONG MethodID;
  2762. - LONG all;
  2763. + STACKED ULONG MethodID;
  2764. + STACKED LONG all;
  2765. };
  2766.  
  2767. /* LoginWindow */
  2768. struct MP_LoginWindow_Login {
  2769. - LONG MethodID;
  2770. - ULONG validate;
  2771. + STACKED ULONG MethodID;
  2772. + STACKED ULONG validate;
  2773. };
  2774.  
  2775. /* SplashWindow */
  2776. struct MP_SplashWindow_Update {
  2777. - LONG MethodID;
  2778. - int current;
  2779. - int total;
  2780. - TEXT* file;
  2781. + STACKED ULONG MethodID;
  2782. + STACKED int current;
  2783. + STACKED int total;
  2784. + STACKED TEXT* file;
  2785. };
  2786.  
  2787. /* ConsoleWindow */
  2788. struct MP_ConsoleWindow_Add {
  2789. - ULONG MethodID;
  2790. - STRPTR message;
  2791. + STACKED ULONG MethodID;
  2792. + STACKED STRPTR message;
  2793. };
  2794.  
  2795. /* FavIcon */
  2796. struct MP_FavIcon_DidReceiveFavIcon {
  2797. - ULONG MethodID;
  2798. - STRPTR url;
  2799. + STACKED ULONG MethodID;
  2800. + STACKED STRPTR url;
  2801. };
  2802.  
  2803. /* History */
  2804. struct MP_History_Insert {
  2805. - ULONG MethodID;
  2806. - APTR item;
  2807. + STACKED ULONG MethodID;
  2808. + STACKED APTR item;
  2809. };
  2810.  
  2811. struct MP_History_Remove {
  2812. - ULONG MethodID;
  2813. - APTR item;
  2814. + STACKED ULONG MethodID;
  2815. + STACKED APTR item;
  2816. };
  2817.  
  2818. struct MP_History_ContainsURL {
  2819. - LONG MethodID;
  2820. - void *url;
  2821. + STACKED ULONG MethodID;
  2822. + STACKED void *url;
  2823. };
  2824.  
  2825. /* Password Manager */
  2826. struct MP_PasswordManagerGroup_Insert {
  2827. - ULONG MethodID;
  2828. - APTR host;
  2829. - APTR credential;
  2830. + STACKED ULONG MethodID;
  2831. + STACKED APTR host;
  2832. + STACKED APTR credential;
  2833. };
  2834.  
  2835. struct MP_PasswordManagerGroup_Remove {
  2836. - ULONG MethodID;
  2837. - APTR host;
  2838. + STACKED ULONG MethodID;
  2839. + STACKED APTR host;
  2840. };
  2841.  
  2842. struct MP_PasswordManagerGroup_Get {
  2843. - ULONG MethodID;
  2844. - APTR host;
  2845. + STACKED ULONG MethodID;
  2846. + STACKED APTR host;
  2847. };
  2848.  
  2849. /* Cookie Manager */
  2850. struct MP_CookieManagerGroup_DidInsert {
  2851. - ULONG MethodID;
  2852. - APTR cookie;
  2853. + STACKED ULONG MethodID;
  2854. + STACKED APTR cookie;
  2855. };
  2856.  
  2857. struct MP_CookieManagerGroup_DidRemove {
  2858. - ULONG MethodID;
  2859. - APTR cookie;
  2860. + STACKED ULONG MethodID;
  2861. + STACKED APTR cookie;
  2862. };
  2863.  
  2864. struct MP_CookieManagerGroup_Remove {
  2865. - ULONG MethodID;
  2866. + STACKED ULONG MethodID;
  2867. };
  2868.  
  2869. /* Block Manager */
  2870. struct MP_BlockManagerGroup_DidInsert {
  2871. - ULONG MethodID;
  2872. - STRPTR rule;
  2873. - int type;
  2874. - APTR ptr;
  2875. + STACKED ULONG MethodID;
  2876. + STACKED STRPTR rule;
  2877. + STACKED int type;
  2878. + STACKED APTR ptr;
  2879. };
  2880.  
  2881. /* Script Manager */
  2882. struct MP_ScriptManagerGroup_InjectScripts {
  2883. - ULONG MethodID;
  2884. - APTR webView;
  2885. + STACKED ULONG MethodID;
  2886. + STACKED APTR webView;
  2887. };
  2888.  
  2889. struct MP_ScriptManagerGroup_ScriptsForURL {
  2890. - ULONG MethodID;
  2891. - STRPTR url;
  2892. + STACKED ULONG MethodID;
  2893. + STACKED STRPTR url;
  2894. };
  2895.  
  2896. struct MP_ScriptManagerGroup_Update {
  2897. - ULONG MethodID;
  2898. - ULONG which;
  2899. + STACKED ULONG MethodID;
  2900. + STACKED ULONG which;
  2901. };
  2902.  
  2903. /* URLPrefsGroup */
  2904. struct MP_URLPrefsGroup_ApplySettingsForURL {
  2905. - ULONG MethodID;
  2906. - STRPTR url;
  2907. - APTR webView;
  2908. + STACKED ULONG MethodID;
  2909. + STACKED STRPTR url;
  2910. + STACKED APTR webView;
  2911. };
  2912.  
  2913. struct MP_URLPrefsGroup_MatchesURL {
  2914. - ULONG MethodID;
  2915. - STRPTR url;
  2916. + STACKED ULONG MethodID;
  2917. + STACKED STRPTR url;
  2918. };
  2919.  
  2920. struct MP_URLPrefsGroup_UserAgentForURL {
  2921. - ULONG MethodID;
  2922. - STRPTR url;
  2923. - APTR webView;
  2924. + STACKED ULONG MethodID;
  2925. + STACKED STRPTR url;
  2926. + STACKED APTR webView;
  2927. };
  2928.  
  2929. struct MP_URLPrefsGroup_CookiePolicyForURLAndName {
  2930. - ULONG MethodID;
  2931. - STRPTR url;
  2932. - STRPTR name;
  2933. + STACKED ULONG MethodID;
  2934. + STACKED STRPTR url;
  2935. + STACKED STRPTR name;
  2936. };
  2937.  
  2938. /* SuggestPopString */
  2939. struct MP_SuggestPopString_Insert {
  2940. - ULONG MethodID;
  2941. - APTR item;
  2942. + STACKED ULONG MethodID;
  2943. + STACKED APTR item;
  2944. };
  2945.  
  2946. /* PrinterWindow */
  2947. struct MP_PrinterWindow_PrintDocument {
  2948. - ULONG MethodID;
  2949. - APTR frame;
  2950. + STACKED ULONG MethodID;
  2951. + STACKED APTR frame;
  2952. };
  2953.  
  2954. /* AutofillPopup */
  2955. struct MP_AutofillPopup_Update {
  2956. - ULONG MethodID;
  2957. - void *suggestions;
  2958. + STACKED ULONG MethodID;
  2959. + STACKED void *suggestions;
  2960. };
  2961.  
  2962. struct MP_AutofillPopup_DidSelect {
  2963. - ULONG MethodID;
  2964. - LONG idx;
  2965. - ULONG close;
  2966. + STACKED ULONG MethodID;
  2967. + STACKED LONG idx;
  2968. + STACKED ULONG close;
  2969. };
  2970.  
  2971. struct MP_AutofillPopup_HandleNavigationEvent {
  2972. - ULONG MethodID;
  2973. - LONG event;
  2974. + STACKED ULONG MethodID;
  2975. + STACKED LONG event;
  2976. };
  2977.  
  2978. /* ColorChooserPopup */
  2979. struct MP_ColorChooserPopup_DidSelect {
  2980. - ULONG MethodID;
  2981. - ULONG close;
  2982. + STACKED ULONG MethodID;
  2983. + STACKED ULONG close;
  2984. };
  2985.  
  2986. /* DateTimeChooserPopup */
  2987. struct MP_DateTimeChooserPopup_DidSelect {
  2988. - ULONG MethodID;
  2989. - ULONG close;
  2990. + STACKED ULONG MethodID;
  2991. + STACKED ULONG close;
  2992. };
  2993.  
  2994. /* Plugins */
  2995.  
  2996. struct MP_Plugin_RenderRastPort {
  2997. - ULONG MethodID;
  2998. - void* rect;
  2999. - void* windowrect;
  3000. - APTR src;
  3001. - ULONG stride;
  3002. + STACKED ULONG MethodID;
  3003. + STACKED void* rect;
  3004. + STACKED void* windowrect;
  3005. + STACKED APTR src;
  3006. + STACKED ULONG stride;
  3007. };
  3008.  
  3009. struct MP_Plugin_AddTimeOut {
  3010. - ULONG MethodID;
  3011. - LONG delay;
  3012. - APTR timeoutfunc;
  3013. - APTR instance;
  3014. + STACKED ULONG MethodID;
  3015. + STACKED LONG delay;
  3016. + STACKED APTR timeoutfunc;
  3017. + STACKED APTR instance;
  3018. };
  3019.  
  3020. struct MP_Plugin_RemoveTimeOut {
  3021. - ULONG MethodID;
  3022. - APTR timer;
  3023. + STACKED ULONG MethodID;
  3024. + STACKED APTR timer;
  3025. };
  3026.  
  3027. struct MP_Plugin_AddIDCMPHandler {
  3028. - ULONG MethodID;
  3029. - APTR handlerfunc;
  3030. - APTR instance;
  3031. + STACKED ULONG MethodID;
  3032. + STACKED APTR handlerfunc;
  3033. + STACKED APTR instance;
  3034. };
  3035.  
  3036. struct MP_Plugin_RemoveIDCMPHandler {
  3037. - ULONG MethodID;
  3038. - APTR instance;
  3039. + STACKED ULONG MethodID;
  3040. + STACKED APTR instance;
  3041. };
  3042.  
  3043. struct MP_Plugin_Message {
  3044. - ULONG MethodID;
  3045. - STRPTR message;
  3046. + STACKED ULONG MethodID;
  3047. + STACKED STRPTR message;
  3048. };
  3049.  
  3050. /* Variables */
  3051. diff --git a/Source/WebKit/mui/Api/MorphOS/clipboard.cpp b/Source/WebKit/mui/Api/MorphOS/clipboard.cpp
  3052. index 8eadae7d..2a103ff4 100644
  3053. --- a/Source/WebKit/mui/Api/MorphOS/clipboard.cpp
  3054. +++ b/Source/WebKit/mui/Api/MorphOS/clipboard.cpp
  3055. @@ -62,7 +62,7 @@ bool copyTextToClipboard(char *text, bool utf8)
  3056. {
  3057. if (ClipboardHandle *ch = OpenClipboard(PRIMARY_CLIP))
  3058. {
  3059. - ih->iff_Stream = (uint32)ch;
  3060. + ih->iff_Stream = (IPTR)ch;
  3061. InitIFFasClip(ih);
  3062.  
  3063. if (0 == OpenIFF(ih, IFFF_WRITE))
  3064. @@ -147,7 +147,7 @@ WTF::String pasteFromClipboard(void)
  3065. {
  3066. if (ClipboardHandle *ch = OpenClipboard(PRIMARY_CLIP))
  3067. {
  3068. - ih->iff_Stream = (uint32)ch;
  3069. + ih->iff_Stream = (IPTR)ch;
  3070. InitIFFasClip(ih);
  3071.  
  3072. if (0 == OpenIFF(ih, IFFF_READ))
  3073. @@ -435,7 +435,7 @@ static long putbody( struct IFFHandle *iff,
  3074.  
  3075. /* Write out a BODY chunk header */
  3076.  
  3077. - if ( (error = PushChunk( iff, NULL, ID_BODY, IFFSIZE_UNKNOWN ) ) )
  3078. + if ( (error = PushChunk( iff, (IPTR)NULL, ID_BODY, IFFSIZE_UNKNOWN ) ) )
  3079. {
  3080. free( planarData );
  3081. return ( error );
  3082. @@ -575,7 +575,7 @@ bool copyImageToClipboard(ChkImage *img)
  3083.  
  3084. if((MyHandle = AllocIFF()))
  3085. {
  3086. - if((MyHandle->iff_Stream = (ULONG) OpenClipboard(0)))
  3087. + if((MyHandle->iff_Stream = (IPTR) OpenClipboard(0)))
  3088. {
  3089. InitIFFasClip(MyHandle);
  3090. result = WriteIFF(MyHandle, img, fname) != FALSE;
  3091. diff --git a/Source/WebKit/mui/Api/MorphOS/colorchooserpopupclass.cpp b/Source/WebKit/mui/Api/MorphOS/colorchooserpopupclass.cpp
  3092. index 29c10f5d..a58528c3 100755
  3093. --- a/Source/WebKit/mui/Api/MorphOS/colorchooserpopupclass.cpp
  3094. +++ b/Source/WebKit/mui/Api/MorphOS/colorchooserpopupclass.cpp
  3095. @@ -55,9 +55,9 @@ struct Data
  3096.  
  3097. DEFNEW
  3098. {
  3099. - Object *source = (Object *) GetTagData(MA_ColorChooserPopup_Source, NULL, msg->ops_AttrList);
  3100. - ColorChooserController *controller = (ColorChooserController *) GetTagData(MA_ColorChooserPopup_Controller, NULL, msg->ops_AttrList);
  3101. - Color *color = (Color *) GetTagData(MA_ColorChooserPopup_InitialColor, NULL, msg->ops_AttrList);
  3102. + Object *source = (Object *) GetTagData(MA_ColorChooserPopup_Source, (IPTR)NULL, msg->ops_AttrList);
  3103. + ColorChooserController *controller = (ColorChooserController *) GetTagData(MA_ColorChooserPopup_Controller, (IPTR)NULL, msg->ops_AttrList);
  3104. + Color *color = (Color *) GetTagData(MA_ColorChooserPopup_InitialColor, (IPTR)NULL, msg->ops_AttrList);
  3105.  
  3106. if(controller)
  3107. {
  3108. @@ -94,7 +94,7 @@ DEFNEW
  3109. }
  3110. }
  3111.  
  3112. - return ((ULONG)obj);
  3113. + return ((IPTR)obj);
  3114. }
  3115.  
  3116. DEFDISP
  3117. diff --git a/Source/WebKit/mui/Api/MorphOS/consolelistclass.cpp b/Source/WebKit/mui/Api/MorphOS/consolelistclass.cpp
  3118. index 2abf5b9a..ddc74c76 100755
  3119. --- a/Source/WebKit/mui/Api/MorphOS/consolelistclass.cpp
  3120. +++ b/Source/WebKit/mui/Api/MorphOS/consolelistclass.cpp
  3121. @@ -71,7 +71,7 @@ DEFNEW
  3122. GETDATA;
  3123. data->cmenu=NULL;
  3124. }
  3125. - return ((ULONG)obj);
  3126. + return ((IPTR)obj);
  3127. }
  3128.  
  3129. DEFDISP
  3130. @@ -86,7 +86,7 @@ DEFDISP
  3131.  
  3132. DEFMMETHOD(List_Construct)
  3133. {
  3134. - return (ULONG)msg->entry;
  3135. + return (IPTR)msg->entry;
  3136. }
  3137.  
  3138. DEFMMETHOD(List_Destruct)
  3139. @@ -132,7 +132,7 @@ DEFMMETHOD(ContextMenuBuild)
  3140.  
  3141. if (DoMethod(obj, MUIM_List_TestPos, msg->mx, msg->my, &res) && (res.entry != -1))
  3142. {
  3143. - DoMethod(obj, MUIM_List_GetEntry, res.entry, (ULONG *)&ce);
  3144. + DoMethod(obj, MUIM_List_GetEntry, res.entry, (IPTR *)&ce);
  3145.  
  3146. if(ce)
  3147. {
  3148. @@ -146,18 +146,18 @@ DEFMMETHOD(ContextMenuBuild)
  3149. End;
  3150. }
  3151. }
  3152. - return (ULONG)data->cmenu;
  3153. + return (IPTR)data->cmenu;
  3154. }
  3155.  
  3156. DEFMMETHOD(ContextMenuChoice)
  3157. {
  3158. struct console_entry *ce;
  3159.  
  3160. - DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (ULONG *)&ce);
  3161. + DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (IPTR *)&ce);
  3162.  
  3163. if(ce)
  3164. {
  3165. - ULONG udata = muiUserData(msg->item);
  3166. + IPTR udata = muiUserData(msg->item);
  3167.  
  3168. switch(udata)
  3169. {
  3170. diff --git a/Source/WebKit/mui/Api/MorphOS/consolewindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/consolewindowclass.cpp
  3171. index eb3e12de..ecc5ca26 100755
  3172. --- a/Source/WebKit/mui/Api/MorphOS/consolewindowclass.cpp
  3173. +++ b/Source/WebKit/mui/Api/MorphOS/consolewindowclass.cpp
  3174. @@ -86,7 +86,7 @@ DEFGET
  3175. {
  3176. case MA_OWB_WindowType:
  3177. {
  3178. - *msg->opg_Storage = (ULONG) MV_OWB_Window_Console;
  3179. + *msg->opg_Storage = (IPTR) MV_OWB_Window_Console;
  3180. }
  3181. return TRUE;
  3182. }
  3183. diff --git a/Source/WebKit/mui/Api/MorphOS/contextmenugroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/contextmenugroupclass.cpp
  3184. index 10998ef7..ecf5773b 100755
  3185. --- a/Source/WebKit/mui/Api/MorphOS/contextmenugroupclass.cpp
  3186. +++ b/Source/WebKit/mui/Api/MorphOS/contextmenugroupclass.cpp
  3187. @@ -40,7 +40,7 @@
  3188. #include "utils.h"
  3189.  
  3190. #ifndef get
  3191. -#define get(obj,attr,store) GetAttr(attr,obj,(ULONGPTR)store)
  3192. +#define get(obj,attr,store) GetAttr(attr,obj,(IPTR *)store)
  3193. #endif
  3194.  
  3195. using namespace WebCore;
  3196. @@ -104,7 +104,7 @@ static void cycles_init(void)
  3197. STRPTR *current = (STRPTR *)*ptr;
  3198. while(*current)
  3199. {
  3200. - *current = (STRPTR)GSI((ULONG)*current);
  3201. + *current = (STRPTR)GSI((IPTR)*current);
  3202. current++;
  3203. }
  3204. ptr++;
  3205. diff --git a/Source/WebKit/mui/Api/MorphOS/contextmenulistclass.cpp b/Source/WebKit/mui/Api/MorphOS/contextmenulistclass.cpp
  3206. index 58b7483c..49e06721 100755
  3207. --- a/Source/WebKit/mui/Api/MorphOS/contextmenulistclass.cpp
  3208. +++ b/Source/WebKit/mui/Api/MorphOS/contextmenulistclass.cpp
  3209. @@ -53,12 +53,12 @@ DEFNEW
  3210. TAG_MORE, INITTAGS
  3211. );
  3212.  
  3213. - return ((ULONG)obj);
  3214. + return ((IPTR)obj);
  3215. }
  3216.  
  3217. DEFMMETHOD(List_Construct)
  3218. {
  3219. - return (ULONG)msg->entry;
  3220. + return (IPTR)msg->entry;
  3221. }
  3222.  
  3223. DEFMMETHOD(List_Destruct)
  3224. @@ -106,7 +106,7 @@ DEFMMETHOD(List_Display)
  3225. msg->array[2] = commandType;
  3226. msg->array[3] = cn->commandString;
  3227.  
  3228. - if( (ULONG)msg->array[-1] % 2 )
  3229. + if( (IPTR)msg->array[-1] % 2 )
  3230. {
  3231. #if !OS(AROS)
  3232. /* This code overrides internal data structures and causes a crash on AROS */
  3233. diff --git a/Source/WebKit/mui/Api/MorphOS/cookiemanagergroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/cookiemanagergroupclass.cpp
  3234. index f5a8c304..47fc5d2a 100644
  3235. --- a/Source/WebKit/mui/Api/MorphOS/cookiemanagergroupclass.cpp
  3236. +++ b/Source/WebKit/mui/Api/MorphOS/cookiemanagergroupclass.cpp
  3237. @@ -141,7 +141,7 @@ DEFNEW
  3238. //DoMethod(obj, MM_CookieManagerGroup_Load);
  3239. }
  3240.  
  3241. - return ((ULONG)obj);
  3242. + return ((IPTR)obj);
  3243. }
  3244.  
  3245. DEFDISP
  3246. diff --git a/Source/WebKit/mui/Api/MorphOS/cookiemanagerlistclass.cpp b/Source/WebKit/mui/Api/MorphOS/cookiemanagerlistclass.cpp
  3247. index 8b711c7a..772cc713 100644
  3248. --- a/Source/WebKit/mui/Api/MorphOS/cookiemanagerlistclass.cpp
  3249. +++ b/Source/WebKit/mui/Api/MorphOS/cookiemanagerlistclass.cpp
  3250. @@ -83,7 +83,7 @@ MUI_HOOK(cookiemanagerlisttree_constructfunc, APTR pool, APTR t)
  3251. entry->session = tempentry->session;
  3252. }
  3253.  
  3254. - return (ULONG) (entry);
  3255. + return (IPTR) (entry);
  3256. }
  3257.  
  3258. MUI_HOOK(cookiemanagerlisttree_destructfunc, APTR pool, APTR t)
  3259. @@ -192,7 +192,7 @@ DEFNEW
  3260. TAG_MORE, INITTAGS
  3261. );
  3262.  
  3263. - return ((ULONG)obj);
  3264. + return ((IPTR)obj);
  3265. }
  3266.  
  3267. DEFDISP
  3268. @@ -263,7 +263,7 @@ DEFMMETHOD(ContextMenuBuild)
  3269. if (item) DoMethod(data->cMenu, MUIM_Family_AddTail, item);
  3270.  
  3271. }
  3272. - return (ULONG)data->cMenu;
  3273. + return (IPTR)data->cMenu;
  3274. }
  3275.  
  3276. /***********************************************************************/
  3277. @@ -271,7 +271,7 @@ DEFMMETHOD(ContextMenuBuild)
  3278. DEFMMETHOD(ContextMenuChoice)
  3279. {
  3280. GETDATA;
  3281. - ULONG udata = muiUserData(msg->item);
  3282. + IPTR udata = muiUserData(msg->item);
  3283. //struct cookie_entry *entry;
  3284.  
  3285. switch(udata)
  3286. @@ -317,7 +317,7 @@ DEFMMETHOD(ContextMenuChoice)
  3287. * from nofe different than root. sucky? oh well:)
  3288. */
  3289.  
  3290. -static APTR tree_iteratefind(Object *lt, struct MUIS_Listtree_TreeNode *list, STRPTR pattern, APTR startnode, ULONG *dosearch)
  3291. +static APTR tree_iteratefind(Object *lt, struct MUIS_Listtree_TreeNode *list, STRPTR pattern, APTR startnode, IPTR *dosearch)
  3292. {
  3293. struct MUIS_Listtree_TreeNode *tn;
  3294. UWORD pos=0;
  3295. @@ -367,7 +367,7 @@ static APTR tree_iteratefind(Object *lt, struct MUIS_Listtree_TreeNode *list, ST
  3296.  
  3297. static APTR tree_find(Object *lt, STRPTR pattern, APTR startnode)
  3298. {
  3299. - ULONG dofind = startnode != NULL ? FALSE : TRUE;
  3300. + IPTR dofind = startnode != NULL ? FALSE : TRUE;
  3301. return tree_iteratefind(lt, MUIV_Listtree_GetEntry_ListNode_Root, pattern, startnode, &dofind);
  3302. }
  3303.  
  3304. diff --git a/Source/WebKit/mui/Api/MorphOS/cookiemanagerwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/cookiemanagerwindowclass.cpp
  3305. index 0c786517..5fc51f3e 100644
  3306. --- a/Source/WebKit/mui/Api/MorphOS/cookiemanagerwindowclass.cpp
  3307. +++ b/Source/WebKit/mui/Api/MorphOS/cookiemanagerwindowclass.cpp
  3308. @@ -77,7 +77,7 @@ DEFGET
  3309. {
  3310. case MA_OWB_WindowType:
  3311. {
  3312. - *msg->opg_Storage = (ULONG) MV_OWB_Window_CookieManager;
  3313. + *msg->opg_Storage = (IPTR) MV_OWB_Window_CookieManager;
  3314. }
  3315. return TRUE;
  3316. }
  3317. diff --git a/Source/WebKit/mui/Api/MorphOS/datetimechooserpopupclass.cpp b/Source/WebKit/mui/Api/MorphOS/datetimechooserpopupclass.cpp
  3318. index 7a290130..9e79047e 100755
  3319. --- a/Source/WebKit/mui/Api/MorphOS/datetimechooserpopupclass.cpp
  3320. +++ b/Source/WebKit/mui/Api/MorphOS/datetimechooserpopupclass.cpp
  3321. @@ -57,8 +57,8 @@ struct Data
  3322.  
  3323. DEFNEW
  3324. {
  3325. - Object *source = (Object *) GetTagData(MA_DateTimeChooserPopup_Source, NULL, msg->ops_AttrList);
  3326. - DateTimeChooserController *controller = (DateTimeChooserController *) GetTagData(MA_DateTimeChooserPopup_Controller, NULL, msg->ops_AttrList);
  3327. + Object *source = (Object *) GetTagData(MA_DateTimeChooserPopup_Source, (IPTR)NULL, msg->ops_AttrList);
  3328. + DateTimeChooserController *controller = (DateTimeChooserController *) GetTagData(MA_DateTimeChooserPopup_Controller, (IPTR)NULL, msg->ops_AttrList);
  3329.  
  3330. if(controller)
  3331. {
  3332. @@ -90,7 +90,7 @@ DEFNEW
  3333. }
  3334. }
  3335.  
  3336. - return ((ULONG)obj);
  3337. + return ((IPTR)obj);
  3338. }
  3339.  
  3340. DEFDISP
  3341. diff --git a/Source/WebKit/mui/Api/MorphOS/downloadgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/downloadgroupclass.cpp
  3342. index 70374d9d..b75ccc3a 100755
  3343. --- a/Source/WebKit/mui/Api/MorphOS/downloadgroupclass.cpp
  3344. +++ b/Source/WebKit/mui/Api/MorphOS/downloadgroupclass.cpp
  3345. @@ -87,7 +87,7 @@ static void cycles_init(void)
  3346. STRPTR *current = (STRPTR *)*ptr;
  3347. while(*current)
  3348. {
  3349. - *current = (STRPTR)GSI((ULONG)*current);
  3350. + *current = (STRPTR)GSI((IPTR)*current);
  3351. current++;
  3352. }
  3353. ptr++;
  3354. @@ -507,7 +507,7 @@ DEFMMETHOD(List_Redraw)
  3355.  
  3356. if(dl->gaugeobj)
  3357. {
  3358. - nnset(dl->gaugeobj, MUIA_Gauge_Current, (ULONG)((float)dl->done / (float)dl->size * 100.f));
  3359. + nnset(dl->gaugeobj, MUIA_Gauge_Current, (IPTR)((float)dl->done / (float)dl->size * 100.f));
  3360. if(!dl->gaugeimg)
  3361. dl->gaugeimg = (Object *) DoMethod(data->lv_downloads, MUIM_List_CreateImage, (Object *) dl->gaugeobj, 0);
  3362. }
  3363. diff --git a/Source/WebKit/mui/Api/MorphOS/downloadlistclass.cpp b/Source/WebKit/mui/Api/MorphOS/downloadlistclass.cpp
  3364. index daf1314c..5091d2d3 100755
  3365. --- a/Source/WebKit/mui/Api/MorphOS/downloadlistclass.cpp
  3366. +++ b/Source/WebKit/mui/Api/MorphOS/downloadlistclass.cpp
  3367. @@ -179,7 +179,7 @@ DEFNEW
  3368. data->cmenu=NULL;
  3369. doset(obj, data, msg->ops_AttrList);
  3370. }
  3371. - return ((ULONG)obj);
  3372. + return ((IPTR)obj);
  3373. }
  3374.  
  3375. DEFDISP
  3376. @@ -262,7 +262,7 @@ DEFSET
  3377.  
  3378. DEFMMETHOD(List_Construct)
  3379. {
  3380. - return (ULONG)msg->entry;
  3381. + return (IPTR)msg->entry;
  3382. }
  3383.  
  3384. DEFMMETHOD(List_Destruct)
  3385. @@ -279,7 +279,7 @@ DEFMMETHOD(List_Display)
  3386. {
  3387. STATIC char buf0[512];
  3388.  
  3389. - if( (ULONG)msg->array[-1] % 2 )
  3390. + if( (IPTR)msg->array[-1] % 2 )
  3391. {
  3392. #if !OS(AROS)
  3393. /* This code overrides internal data structures and causes a crash on AROS */
  3394. @@ -454,7 +454,7 @@ DEFMMETHOD(ContextMenuBuild)
  3395.  
  3396. if (DoMethod(obj, MUIM_List_TestPos, msg->mx, msg->my, &res) && (res.entry != -1))
  3397. {
  3398. - DoMethod(obj, MUIM_List_GetEntry, res.entry, (ULONG *)&dl);
  3399. + DoMethod(obj, MUIM_List_GetEntry, res.entry, (IPTR *)&dl);
  3400.  
  3401. if(dl)
  3402. {
  3403. @@ -476,18 +476,18 @@ DEFMMETHOD(ContextMenuBuild)
  3404. End;
  3405. }
  3406. }
  3407. - return (ULONG)data->cmenu;
  3408. + return (IPTR)data->cmenu;
  3409. }
  3410.  
  3411. DEFMMETHOD(ContextMenuChoice)
  3412. {
  3413. struct downloadnode *dl;
  3414.  
  3415. - DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (ULONG *)&dl);
  3416. + DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (IPTR *)&dl);
  3417.  
  3418. if(dl)
  3419. {
  3420. - ULONG udata = muiUserData(msg->item);
  3421. + IPTR udata = muiUserData(msg->item);
  3422.  
  3423. switch(udata)
  3424. {
  3425. diff --git a/Source/WebKit/mui/Api/MorphOS/downloadwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/downloadwindowclass.cpp
  3426. index a1da4bb7..b7d3cb84 100755
  3427. --- a/Source/WebKit/mui/Api/MorphOS/downloadwindowclass.cpp
  3428. +++ b/Source/WebKit/mui/Api/MorphOS/downloadwindowclass.cpp
  3429. @@ -79,7 +79,7 @@ DEFGET
  3430. {
  3431. case MA_OWB_WindowType:
  3432. {
  3433. - *msg->opg_Storage = (ULONG) MV_OWB_Window_Downloads;
  3434. + *msg->opg_Storage = (IPTR) MV_OWB_Window_Downloads;
  3435. }
  3436. return TRUE;
  3437. }
  3438. diff --git a/Source/WebKit/mui/Api/MorphOS/faviconclass.cpp b/Source/WebKit/mui/Api/MorphOS/faviconclass.cpp
  3439. index 7326b2c5..1a57a2ac 100755
  3440. --- a/Source/WebKit/mui/Api/MorphOS/faviconclass.cpp
  3441. +++ b/Source/WebKit/mui/Api/MorphOS/faviconclass.cpp
  3442. @@ -78,7 +78,7 @@ STATIC VOID doset(struct Data *data, APTR obj, struct TagItem *taglist)
  3443.  
  3444. while ((tag = NextTagItem(&tstate)) != NULL)
  3445. {
  3446. - ULONG tag_data = tag->ti_Data;
  3447. + IPTR tag_data = tag->ti_Data;
  3448.  
  3449. switch (tag->ti_Tag)
  3450. {
  3451. diff --git a/Source/WebKit/mui/Api/MorphOS/findtextclass.cpp b/Source/WebKit/mui/Api/MorphOS/findtextclass.cpp
  3452. index 2acc663c..e5fed28e 100755
  3453. --- a/Source/WebKit/mui/Api/MorphOS/findtextclass.cpp
  3454. +++ b/Source/WebKit/mui/Api/MorphOS/findtextclass.cpp
  3455. @@ -152,7 +152,7 @@ DEFNEW
  3456. data->ch_showallmatches = ch_showallmatches;
  3457. data->txt_notfound = txt_notfound;
  3458.  
  3459. - data->obj_target = (Object *)GetTagData(MA_FindText_Target, NULL, INITTAGS);
  3460. + data->obj_target = (Object *)GetTagData(MA_FindText_Target, (IPTR)NULL, INITTAGS);
  3461.  
  3462. if(bt_prev) set(bt_prev, MUIA_Weight, 0);
  3463. if(bt_next) set(bt_next, MUIA_Weight, 0);
  3464. @@ -167,7 +167,7 @@ DEFNEW
  3465. if(bt_close) DoMethod(bt_close, MUIM_Notify, MUIA_Pressed, FALSE, obj, 3, MUIM_Set, MUIA_ShowMe, FALSE);
  3466. }
  3467.  
  3468. - return (ULONG)obj;
  3469. + return (IPTR)obj;
  3470. }
  3471.  
  3472. DEFSET
  3473. @@ -184,7 +184,7 @@ DEFGET
  3474. switch (msg->opg_AttrID)
  3475. {
  3476. case MUIA_String_Contents:
  3477. - return GetAttr(MUIA_String_Contents, data->pop_search, (ULONGPTR)msg->opg_Storage);
  3478. + return GetAttr(MUIA_String_Contents, data->pop_search, (IPTR *)msg->opg_Storage);
  3479. }
  3480.  
  3481. return DOSUPER;
  3482. diff --git a/Source/WebKit/mui/Api/MorphOS/historybuttonclass.cpp b/Source/WebKit/mui/Api/MorphOS/historybuttonclass.cpp
  3483. index 06aa1937..3c150384 100755
  3484. --- a/Source/WebKit/mui/Api/MorphOS/historybuttonclass.cpp
  3485. +++ b/Source/WebKit/mui/Api/MorphOS/historybuttonclass.cpp
  3486. @@ -110,7 +110,7 @@ DEFNEW
  3487.  
  3488. doset(obj, data, INITTAGS);
  3489.  
  3490. - return (ULONG)obj;
  3491. + return (IPTR)obj;
  3492. }
  3493.  
  3494. return(0);
  3495. @@ -145,7 +145,7 @@ DEFGET
  3496. {
  3497. case MA_HistoryButton_List:
  3498. {
  3499. - *msg->opg_Storage = (ULONG) data->backforwardlist;
  3500. + *msg->opg_Storage = (IPTR) data->backforwardlist;
  3501. }
  3502. return TRUE;
  3503. }
  3504. @@ -199,7 +199,7 @@ DEFMMETHOD(ContextMenuBuild)
  3505. }
  3506. else
  3507. {
  3508. - return (ULONG) data->contextmenu;
  3509. + return (IPTR) data->contextmenu;
  3510. }
  3511.  
  3512. for (int i = firstItemIndex ; (data->type == MV_HistoryButton_Type_Backward) ? i >= lastItemIndex : i <= lastItemIndex ; i+=di)
  3513. @@ -217,8 +217,8 @@ DEFMMETHOD(ContextMenuBuild)
  3514. sprintf(label, "%s%s", prefix, tmp);
  3515.  
  3516. Object *item = (Object *) NewObject(getmenuitemclass(), NULL,
  3517. - MUIA_Menuitem_Title, (ULONG) label,
  3518. - MUIA_UserData, (ULONG) data->backforwardlist->itemAtIndex(i),
  3519. + MUIA_Menuitem_Title, (IPTR) label,
  3520. + MUIA_UserData, (IPTR) data->backforwardlist->itemAtIndex(i),
  3521. MA_MenuItem_FreeUserData, FALSE, /* Don't free it, thx */
  3522. TAG_DONE);
  3523. if(item)
  3524. @@ -233,7 +233,7 @@ DEFMMETHOD(ContextMenuBuild)
  3525. }
  3526. }
  3527.  
  3528. - return (ULONG) data->contextmenu;
  3529. + return (IPTR) data->contextmenu;
  3530. }
  3531.  
  3532. DEFMMETHOD(ContextMenuChoice)
  3533. diff --git a/Source/WebKit/mui/Api/MorphOS/historylistclass.cpp b/Source/WebKit/mui/Api/MorphOS/historylistclass.cpp
  3534. index 8e2ccf65..f9d2e42a 100755
  3535. --- a/Source/WebKit/mui/Api/MorphOS/historylistclass.cpp
  3536. +++ b/Source/WebKit/mui/Api/MorphOS/historylistclass.cpp
  3537. @@ -84,7 +84,7 @@ DEFNEW
  3538. obj = (Object *) DoSuperNew(cl, obj,
  3539. InputListFrame,
  3540. MUIA_List_MinLineHeight, 36,
  3541. - MUIA_List_Format, (getv(app, MA_OWBApp_ShowFavIcons) & MV_OWBApp_ShowFavIcons_History) ? (ULONG) "," : (ULONG) "",
  3542. + MUIA_List_Format, (getv(app, MA_OWBApp_ShowFavIcons) & MV_OWBApp_ShowFavIcons_History) ? (IPTR) "," : (IPTR) "",
  3543. MUIA_List_Title, FALSE,
  3544. MUIA_ContextMenu, TRUE,
  3545. TAG_MORE, INITTAGS
  3546. @@ -105,7 +105,7 @@ DEFNEW
  3547.  
  3548. doset(obj, data, msg->ops_AttrList);
  3549. }
  3550. - return ((ULONG)obj);
  3551. + return ((IPTR)obj);
  3552. }
  3553.  
  3554. DEFDISP
  3555. @@ -125,10 +125,10 @@ DEFGET
  3556. switch (msg->opg_AttrID)
  3557. {
  3558. case MA_HistoryList_Opened:
  3559. - *msg->opg_Storage = (ULONG) data->opened;
  3560. + *msg->opg_Storage = (IPTR) data->opened;
  3561. return TRUE;
  3562. case MA_HistoryList_Complete:
  3563. - *msg->opg_Storage = (ULONG) data->complete;
  3564. + *msg->opg_Storage = (IPTR) data->complete;
  3565. return TRUE;
  3566. }
  3567.  
  3568. @@ -237,7 +237,7 @@ DEFMMETHOD(HandleEvent)
  3569.  
  3570. if (_isinobject(obj, imsg->MouseX, imsg->MouseY) && DoMethod(obj, MUIM_List_TestPos, imsg->MouseX, imsg->MouseY, &res) && (res.entry != -1))
  3571. {
  3572. - DoMethod(obj, MUIM_List_GetEntry, res.entry, (ULONG *)&item);
  3573. + DoMethod(obj, MUIM_List_GetEntry, res.entry, (IPTR *)&item);
  3574.  
  3575. if(item)
  3576. {
  3577. @@ -273,7 +273,7 @@ DEFMMETHOD(List_Construct)
  3578. hitem->faviconobj = NULL;
  3579. hitem->faviconimg = NULL;
  3580. }
  3581. - return (ULONG)hitem;
  3582. + return (IPTR)hitem;
  3583. }
  3584.  
  3585. DEFMMETHOD(List_Destruct)
  3586. @@ -387,7 +387,7 @@ DEFMMETHOD(List_Display)
  3587. msg->array[0] = (char *) slabel;
  3588. }
  3589.  
  3590. - if( (ULONG)msg->array[-1] % 2 )
  3591. + if( (IPTR)msg->array[-1] % 2 )
  3592. {
  3593. #if !OS(AROS)
  3594. /* This code overrides internal data structures and causes a crash on AROS */
  3595. @@ -451,7 +451,7 @@ DEFMMETHOD(ContextMenuBuild)
  3596.  
  3597. if (DoMethod(obj, MUIM_List_TestPos, msg->mx, msg->my, &res) && (res.entry != -1))
  3598. {
  3599. - DoMethod(obj, MUIM_List_GetEntry, res.entry, (ULONG *)&item);
  3600. + DoMethod(obj, MUIM_List_GetEntry, res.entry, (IPTR *)&item);
  3601.  
  3602. if(item)
  3603. {
  3604. @@ -473,7 +473,7 @@ DEFMMETHOD(ContextMenuBuild)
  3605. End;
  3606. }
  3607. }
  3608. - return (ULONG)data->cmenu;
  3609. + return (IPTR)data->cmenu;
  3610. }
  3611.  
  3612. DEFMMETHOD(ContextMenuChoice)
  3613. @@ -481,12 +481,12 @@ DEFMMETHOD(ContextMenuChoice)
  3614. GETDATA;
  3615. struct history_entry *item = NULL;
  3616.  
  3617. - DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (ULONG *)&item);
  3618. + DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (IPTR *)&item);
  3619.  
  3620. if(item)
  3621. {
  3622. WebHistoryItem *witem = (WebHistoryItem *) item->webhistoryitem;
  3623. - ULONG udata = muiUserData(msg->item);
  3624. + IPTR udata = muiUserData(msg->item);
  3625.  
  3626. switch(udata)
  3627. {
  3628. diff --git a/Source/WebKit/mui/Api/MorphOS/historylisttreeclass.cpp b/Source/WebKit/mui/Api/MorphOS/historylisttreeclass.cpp
  3629. index 6560cfdd..26f43a8e 100755
  3630. --- a/Source/WebKit/mui/Api/MorphOS/historylisttreeclass.cpp
  3631. +++ b/Source/WebKit/mui/Api/MorphOS/historylisttreeclass.cpp
  3632. @@ -109,7 +109,7 @@ DEFNEW
  3633. //DoMethod(app, MUIM_Notify, MA_OWBApp_HistoryChanged, MUIV_EveryTime, obj, 1, MM_History_Update);
  3634. //DoMethod(app, MUIM_Notify, MA_OWBApp_DidReceiveFavIcon, MUIV_EveryTime, obj, 1, MM_History_Update);
  3635. }
  3636. - return ((ULONG)obj);
  3637. + return ((IPTR)obj);
  3638. }
  3639.  
  3640. DEFDISP
  3641. @@ -171,7 +171,7 @@ DEFMMETHOD(List_Construct)
  3642. entry->faviconimg = (APTR) DoMethod(obj, MUIM_List_CreateImage, entry->faviconobj, 0);
  3643. }
  3644.  
  3645. - return (ULONG)msg->entry;
  3646. + return (IPTR)msg->entry;
  3647. }
  3648.  
  3649. DEFMMETHOD(List_Destruct)
  3650. @@ -266,7 +266,7 @@ DEFMMETHOD(List_Display)
  3651. msg->array[0] = (char *) stitle;
  3652. msg->array[1] = (char *) surl;
  3653.  
  3654. - if( (ULONG)msg->array[-1] % 2 )
  3655. + if( (IPTR)msg->array[-1] % 2 )
  3656. {
  3657. #if !OS(AROS)
  3658. /* This code overrides internal data structures and causes a crash on AROS */
  3659. @@ -305,7 +305,7 @@ DEFMMETHOD(HandleEvent)
  3660.  
  3661. if (_isinobject(obj, imsg->MouseX, imsg->MouseY) && DoMethod(obj, MUIM_List_TestPos, imsg->MouseX, imsg->MouseY, &res) && (res.entry != -1))
  3662. {
  3663. - DoMethod(obj, MUIM_List_GetEntry, res.entry, (ULONG *)&item);
  3664. + DoMethod(obj, MUIM_List_GetEntry, res.entry, (IPTR *)&item);
  3665.  
  3666. if(item)
  3667. {
  3668. @@ -344,7 +344,7 @@ DEFMMETHOD(ContextMenuBuild)
  3669.  
  3670. if (DoMethod(obj, MUIM_List_TestPos, msg->mx, msg->my, &res) && (res.entry != -1))
  3671. {
  3672. - DoMethod(obj, MUIM_List_GetEntry, res.entry, (ULONG *)&item);
  3673. + DoMethod(obj, MUIM_List_GetEntry, res.entry, (IPTR *)&item);
  3674.  
  3675. if(item)
  3676. {
  3677. @@ -366,19 +366,19 @@ DEFMMETHOD(ContextMenuBuild)
  3678. End;
  3679. }
  3680. }
  3681. - return (ULONG)data->cmenu;
  3682. + return (IPTR)data->cmenu;
  3683. }
  3684.  
  3685. DEFMMETHOD(ContextMenuChoice)
  3686. {
  3687. struct history_entry *item;
  3688.  
  3689. - DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (ULONG *)&item);
  3690. + DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (IPTR *)&item);
  3691.  
  3692. if(item)
  3693. {
  3694. WebHistoryItem *witem = (WebHistoryItem *) item->webhistoryitem;
  3695. - ULONG udata = muiUserData(msg->item);
  3696. + IPTR udata = muiUserData(msg->item);
  3697.  
  3698. switch(udata)
  3699. {
  3700. diff --git a/Source/WebKit/mui/Api/MorphOS/historypanelgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/historypanelgroupclass.cpp
  3701. index eb1f1698..02e40043 100755
  3702. --- a/Source/WebKit/mui/Api/MorphOS/historypanelgroupclass.cpp
  3703. +++ b/Source/WebKit/mui/Api/MorphOS/historypanelgroupclass.cpp
  3704. @@ -90,7 +90,7 @@ DEFNEW
  3705. DoMethod(closebutton, MUIM_Notify, MUIA_Pressed, FALSE, MUIV_Notify_Window, 1, MM_OWBWindow_RemoveHistoryPanel);
  3706. }
  3707.  
  3708. - return ((ULONG)obj);
  3709. + return ((IPTR)obj);
  3710. }
  3711.  
  3712. DEFDISP
  3713. diff --git a/Source/WebKit/mui/Api/MorphOS/historypopstringclass.cpp b/Source/WebKit/mui/Api/MorphOS/historypopstringclass.cpp
  3714. index 0df741f5..cd1972c7 100755
  3715. --- a/Source/WebKit/mui/Api/MorphOS/historypopstringclass.cpp
  3716. +++ b/Source/WebKit/mui/Api/MorphOS/historypopstringclass.cpp
  3717. @@ -162,16 +162,16 @@ DEFGET
  3718. return TRUE;
  3719.  
  3720. case MUIA_Popobject_Object:
  3721. - *msg->opg_Storage = (ULONG) data->lv_entries;
  3722. + *msg->opg_Storage = (IPTR) data->lv_entries;
  3723. return TRUE;
  3724.  
  3725. case MUIA_Popstring_String:
  3726. - *msg->opg_Storage = (ULONG) data->str;
  3727. + *msg->opg_Storage = (IPTR) data->str;
  3728. return TRUE;
  3729.  
  3730. case MA_OWB_URL:
  3731. case MUIA_String_Contents:
  3732. - return GetAttr(MUIA_String_Contents, data->str, (ULONGPTR)msg->opg_Storage);
  3733. + return GetAttr(MUIA_String_Contents, data->str, (IPTR *)msg->opg_Storage);
  3734. }
  3735.  
  3736. return DOSUPER;
  3737. diff --git a/Source/WebKit/mui/Api/MorphOS/iconclass.cpp b/Source/WebKit/mui/Api/MorphOS/iconclass.cpp
  3738. index ea75078b..bc6b194e 100755
  3739. --- a/Source/WebKit/mui/Api/MorphOS/iconclass.cpp
  3740. +++ b/Source/WebKit/mui/Api/MorphOS/iconclass.cpp
  3741. @@ -71,7 +71,7 @@ STATIC VOID doset(struct Data *data, APTR obj, struct TagItem *taglist)
  3742.  
  3743. while ((tag = NextTagItem(&tstate)) != NULL)
  3744. {
  3745. - ULONG tag_data = tag->ti_Data;
  3746. + IPTR tag_data = tag->ti_Data;
  3747.  
  3748. switch (tag->ti_Tag)
  3749. {
  3750. diff --git a/Source/WebKit/mui/Api/MorphOS/icufiles.cpp b/Source/WebKit/mui/Api/MorphOS/icufiles.cpp
  3751. index a7cd59c1..e208d311 100644
  3752. --- a/Source/WebKit/mui/Api/MorphOS/icufiles.cpp
  3753. +++ b/Source/WebKit/mui/Api/MorphOS/icufiles.cpp
  3754. @@ -2358,7 +2358,9 @@ ULONG icu_check(void)
  3755. else
  3756. {
  3757. MUI_RequestA(NULL, NULL, 0, "Error", "Ok", "ICU files are missing. Please update properly.", NULL);
  3758. +#if (0)
  3759. passed = FALSE;
  3760. +#endif
  3761. break;
  3762. }
  3763. }
  3764. diff --git a/Source/WebKit/mui/Api/MorphOS/include/macros/vapor.h b/Source/WebKit/mui/Api/MorphOS/include/macros/vapor.h
  3765. index 41157e32..5e251a76 100755
  3766. --- a/Source/WebKit/mui/Api/MorphOS/include/macros/vapor.h
  3767. +++ b/Source/WebKit/mui/Api/MorphOS/include/macros/vapor.h
  3768. @@ -114,53 +114,53 @@
  3769. /*
  3770. * MUI method (ie. MUIM_List_InsertSingle)
  3771. */
  3772. -#define DEFMMETHOD(methodid) METHOD_INLINE static ULONG __attribute__ ((noinline)) handleMUIM_##methodid(struct IClass *cl,Object*obj,struct MUIP_##methodid *msg)
  3773. +#define DEFMMETHOD(methodid) METHOD_INLINE static IPTR __attribute__ ((noinline)) handleMUIM_##methodid(struct IClass *cl,Object*obj,struct MUIP_##methodid *msg)
  3774.  
  3775. /*
  3776. * Custom method with ONE argument only (no msg[n] please)
  3777. */
  3778. -#define DEFMETHOD(methodid,type) METHOD_INLINE static ULONG __attribute__ ((noinline)) handleMM_##methodid(struct IClass *cl, Object *obj, type *msg)
  3779. +#define DEFMETHOD(methodid,type) METHOD_INLINE static IPTR __attribute__ ((noinline)) handleMM_##methodid(struct IClass *cl, Object *obj, type *msg)
  3780.  
  3781. /*
  3782. * Custom method with NO real arguments (Msg still passed for DSM etc.)
  3783. */
  3784. -#define DEFTMETHOD(methodid) METHOD_INLINE static ULONG __attribute__ ((noinline)) handleMM_##methodid(struct IClass *cl, Object *obj, Msg msg)
  3785. +#define DEFTMETHOD(methodid) METHOD_INLINE static IPTR __attribute__ ((noinline)) handleMM_##methodid(struct IClass *cl, Object *obj, Msg msg)
  3786.  
  3787. /*
  3788. * Custom structured method
  3789. */
  3790. -#define DEFSMETHOD(name) METHOD_INLINE static ULONG __attribute__ ((noinline)) handleMM_##name(struct IClass *cl,Object*obj,struct MP_##name *msg)
  3791. +#define DEFSMETHOD(name) METHOD_INLINE static IPTR __attribute__ ((noinline)) handleMM_##name(struct IClass *cl,Object*obj,struct MP_##name *msg)
  3792.  
  3793. /*
  3794. * OM_NEW method (construct)
  3795. */
  3796. -#define DEFNEW METHOD_INLINE static ULONG __attribute__ ((noinline)) handleOM_NEW(struct IClass *cl,Object*obj,struct opSet *msg)
  3797. +#define DEFNEW METHOD_INLINE static IPTR __attribute__ ((noinline)) handleOM_NEW(struct IClass *cl,Object*obj,struct opSet *msg)
  3798. #define DEFCONST DEFNEW
  3799.  
  3800. /*
  3801. * OM_SET method
  3802. */
  3803. -#define DEFSET METHOD_INLINE static ULONG __attribute__ ((noinline)) handleOM_SET(struct IClass *cl,Object*obj,struct opSet *msg)
  3804. +#define DEFSET METHOD_INLINE static IPTR __attribute__ ((noinline)) handleOM_SET(struct IClass *cl,Object*obj,struct opSet *msg)
  3805.  
  3806. /*
  3807. * OM_GET method
  3808. */
  3809. -#define DEFGET METHOD_INLINE static ULONG handleOM_GET(struct IClass *cl,Object*obj,struct opGet *msg)
  3810. +#define DEFGET METHOD_INLINE static IPTR handleOM_GET(struct IClass *cl,Object*obj,struct opGet *msg)
  3811.  
  3812. /*
  3813. * OM_ADDMEMBER method
  3814. */
  3815. -#define DEFADDMEMBER METHOD_INLINE static ULONG __attribute__ ((noinline)) handleOM_ADDMEMBER(struct IClass *cl,Object*obj,struct opMember *msg)
  3816. +#define DEFADDMEMBER METHOD_INLINE static IPTR __attribute__ ((noinline)) handleOM_ADDMEMBER(struct IClass *cl,Object*obj,struct opMember *msg)
  3817.  
  3818. /*
  3819. * OM_REMMEMBER method
  3820. */
  3821. -#define DEFREMMEMBER METHOD_INLINE static ULONG __attribute__ ((noinline)) handleOM_REMMEMBER(struct IClass *cl,Object*obj,struct opMember *msg)
  3822. +#define DEFREMMEMBER METHOD_INLINE static IPTR __attribute__ ((noinline)) handleOM_REMMEMBER(struct IClass *cl,Object*obj,struct opMember *msg)
  3823.  
  3824. /*
  3825. * OM_DISPOSE method (destruct)
  3826. */
  3827. -#define DEFDISPOSE METHOD_INLINE static ULONG __attribute__ ((noinline)) handleOM_DISPOSE( struct IClass *cl,Object*obj,struct opSet *msg)
  3828. +#define DEFDISPOSE METHOD_INLINE static IPTR __attribute__ ((noinline)) handleOM_DISPOSE( struct IClass *cl,Object*obj,struct opSet *msg)
  3829. #define DEFDEST DEFDISPOSE
  3830. #define DEFDISP DEFDISPOSE
  3831.  
  3832. @@ -203,7 +203,7 @@
  3833. * Creates a subclass (no constructor)
  3834. */
  3835. #define DECSUBCLASS_NC(super,name) static struct MUI_CustomClass *mcc##name; \
  3836. - ULONG create_##name(void) \
  3837. + IPTR create_##name(void) \
  3838. { \
  3839. if (!(mcc##name = (struct MUI_CustomClass *)MUI_CreateCustomClass(NULL, super, NULL, sizeof(struct Data), (APTR)DISPATCHERREF))) \
  3840. return (FALSE); \
  3841. @@ -229,7 +229,7 @@
  3842. * Creates a subclass of one of your own subclass (no constructor)
  3843. */
  3844. #define DECSUBCLASSPTR_NC(super,name) static struct MUI_CustomClass *mcc##name; \
  3845. - ULONG create_##name(void) \
  3846. + IPTR create_##name(void) \
  3847. { \
  3848. if (!(mcc##name = (struct MUI_CustomClass *)MUI_CreateCustomClass(NULL, NULL, (struct MUI_CustomClass *) get##super##root(), sizeof(struct Data), (APTR)DISPATCHERREF))) \
  3849. return (FALSE); \
  3850. @@ -259,17 +259,17 @@
  3851. #define ENDASTORE }
  3852. #define ASTORE(t,x) case t: data->x = tag->ti_Data;break;
  3853. #define ASTOREP(t,x) case t: data->x = (APTR)tag->ti_Data;break;
  3854. -#define STOREP(x) *msg->opg_Storage=(ULONG)(x)
  3855. -#define STOREATTR(i,x) case i:*msg->opg_Storage=(ULONG)(x);return(TRUE);
  3856. +#define STOREP(x) *msg->opg_Storage=(IPTR)(x)
  3857. +#define STOREATTR(i,x) case i:*msg->opg_Storage=(IPTR)(x);return(TRUE);
  3858.  
  3859. /* Hooks */
  3860.  
  3861. #ifdef __AROS__
  3862.  
  3863. #define MUI_HOOK(n, y, z) \
  3864. - static LONG n##_func(struct Hook * n, y, z); \
  3865. + static IPTR n##_func(struct Hook * n, y, z); \
  3866. static struct Hook n##_hook = {{0, 0}, (APTR)n##_func, NULL, NULL}; \
  3867. - static LONG n##_func(struct Hook * n, y, z)
  3868. + static IPTR n##_func(struct Hook * n, y, z)
  3869.  
  3870. #else
  3871. #ifdef __MORPHOS__
  3872. diff --git a/Source/WebKit/mui/Api/MorphOS/linklistclass.cpp b/Source/WebKit/mui/Api/MorphOS/linklistclass.cpp
  3873. index 06eff5cd..0e9010e0 100755
  3874. --- a/Source/WebKit/mui/Api/MorphOS/linklistclass.cpp
  3875. +++ b/Source/WebKit/mui/Api/MorphOS/linklistclass.cpp
  3876. @@ -97,9 +97,9 @@ DEFNEW
  3877. {
  3878. GETDATA;
  3879. data->cMenu=NULL;
  3880. - data->Drop=NULL;
  3881. + data->Drop=(IPTR)NULL;
  3882. }
  3883. - return ((ULONG)obj);
  3884. + return ((IPTR)obj);
  3885. }
  3886.  
  3887. DEFDISP
  3888. @@ -121,7 +121,7 @@ DEFSET
  3889.  
  3890. DEFMMETHOD(List_Construct)
  3891. {
  3892. - return (ULONG)msg->entry;
  3893. + return (IPTR)msg->entry;
  3894. }
  3895.  
  3896. DEFMMETHOD(List_Destruct)
  3897. @@ -188,7 +188,7 @@ DEFMMETHOD(List_Display)
  3898. msg->array[0] = td->buffer2;
  3899. msg->array[1] = td->address;
  3900.  
  3901. - if( (ULONG)msg->array[-1] % 2 )
  3902. + if( (IPTR)msg->array[-1] % 2 )
  3903. {
  3904. #if !OS(AROS)
  3905. /* This code overrides internal data structures and causes a crash on AROS */
  3906. @@ -212,13 +212,13 @@ DEFMMETHOD(List_Compare)
  3907. struct treedata *td1=(struct treedata *)msg->entry1;
  3908. struct treedata *td2=(struct treedata *)msg->entry2;
  3909.  
  3910. - if (td2->ql_order==0 && td1->ql_order!=0) return (ULONG)-1;
  3911. + if (td2->ql_order==0 && td1->ql_order!=0) return (IPTR)-1;
  3912. if (td1->ql_order==0 && td2->ql_order!=0) return 1;
  3913.  
  3914. if (td1->ql_order>td2->ql_order) return 1;
  3915. - if (td1->ql_order<td2->ql_order) return (ULONG)-1;
  3916. + if (td1->ql_order<td2->ql_order) return (IPTR)-1;
  3917.  
  3918. - if (!td1->alias) return (ULONG)-1;
  3919. + if (!td1->alias) return (IPTR)-1;
  3920. if (!td2->alias) return 1;
  3921.  
  3922. return stricmp(td1->alias,td2->alias);
  3923. @@ -315,7 +315,7 @@ DEFMMETHOD(CreateShortHelp)
  3924. if (help)
  3925. {
  3926. sprintf(help, "%s\n%s", td->title, td->address);
  3927. - return ((ULONG)help);
  3928. + return ((IPTR)help);
  3929. }
  3930. }
  3931. }
  3932. diff --git a/Source/WebKit/mui/Api/MorphOS/loginwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/loginwindowclass.cpp
  3933. index cecfc6de..88fb4c03 100755
  3934. --- a/Source/WebKit/mui/Api/MorphOS/loginwindowclass.cpp
  3935. +++ b/Source/WebKit/mui/Api/MorphOS/loginwindowclass.cpp
  3936. @@ -59,10 +59,10 @@ DEFNEW
  3937. STRPTR realm, host, suggested_login, suggested_password;
  3938. char message[1024];
  3939.  
  3940. - host = (STRPTR) GetTagData(MA_LoginWindow_Host, NULL, msg->ops_AttrList);
  3941. - realm = (STRPTR) GetTagData(MA_LoginWindow_Realm, NULL, msg->ops_AttrList);
  3942. - suggested_login = (STRPTR) GetTagData(MA_LoginWindow_Username, NULL, msg->ops_AttrList);
  3943. - suggested_password = (STRPTR) GetTagData(MA_LoginWindow_Password, NULL, msg->ops_AttrList);
  3944. + host = (STRPTR) GetTagData(MA_LoginWindow_Host, (IPTR)NULL, msg->ops_AttrList);
  3945. + realm = (STRPTR) GetTagData(MA_LoginWindow_Realm, (IPTR)NULL, msg->ops_AttrList);
  3946. + suggested_login = (STRPTR) GetTagData(MA_LoginWindow_Username, (IPTR)NULL, msg->ops_AttrList);
  3947. + suggested_password = (STRPTR) GetTagData(MA_LoginWindow_Password, (IPTR)NULL, msg->ops_AttrList);
  3948.  
  3949. snprintf(message, sizeof(message), GSI(MSG_LOGINWINDOW_MESSAGE), realm, host);
  3950.  
  3951. @@ -146,25 +146,25 @@ DEFGET
  3952. {
  3953. case MA_OWB_WindowType:
  3954. {
  3955. - *msg->opg_Storage = (ULONG) MV_OWB_Window_Auth;
  3956. + *msg->opg_Storage = (IPTR) MV_OWB_Window_Auth;
  3957. }
  3958. return TRUE;
  3959.  
  3960. case MA_LoginWindow_Username:
  3961. {
  3962. - *msg->opg_Storage = (ULONG) getv(data->st_user, MUIA_String_Contents);
  3963. + *msg->opg_Storage = (IPTR) getv(data->st_user, MUIA_String_Contents);
  3964. }
  3965. return TRUE;
  3966.  
  3967. case MA_LoginWindow_Password:
  3968. {
  3969. - *msg->opg_Storage = (ULONG) getv(data->st_password, MUIA_String_Contents);
  3970. + *msg->opg_Storage = (IPTR) getv(data->st_password, MUIA_String_Contents);
  3971. }
  3972. return TRUE;
  3973.  
  3974. case MA_LoginWindow_SaveAuthentication:
  3975. {
  3976. - *msg->opg_Storage = (ULONG) getv(data->ch_save, MUIA_Selected);
  3977. + *msg->opg_Storage = (IPTR) getv(data->ch_save, MUIA_Selected);
  3978. }
  3979. return TRUE;
  3980. }
  3981. diff --git a/Source/WebKit/mui/Api/MorphOS/mediacontrolsgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/mediacontrolsgroupclass.cpp
  3982. index d0175a0d..a6bccf87 100755
  3983. --- a/Source/WebKit/mui/Api/MorphOS/mediacontrolsgroupclass.cpp
  3984. +++ b/Source/WebKit/mui/Api/MorphOS/mediacontrolsgroupclass.cpp
  3985. @@ -71,7 +71,7 @@ static void doset(APTR obj, struct Data *data, struct TagItem *tags)
  3986.  
  3987. while ((tag = NextTagItem(&tstate)) != NULL)
  3988. {
  3989. - ULONG tdata = tag->ti_Data;
  3990. + IPTR tdata = tag->ti_Data;
  3991.  
  3992. switch (tag->ti_Tag)
  3993. {
  3994. @@ -163,7 +163,7 @@ DEFNEW
  3995. DoMethod(data->sl_volume, MUIM_Notify, MUIA_Slider_Level, MUIV_EveryTime, obj, 1, MM_MediaControlsGroup_Volume);
  3996. }
  3997.  
  3998. - return (ULONG)obj;
  3999. + return (IPTR)obj;
  4000. }
  4001.  
  4002. DEFSET
  4003. diff --git a/Source/WebKit/mui/Api/MorphOS/menuclass.cpp b/Source/WebKit/mui/Api/MorphOS/menuclass.cpp
  4004. index 6fd74c81..b04e3868 100755
  4005. --- a/Source/WebKit/mui/Api/MorphOS/menuclass.cpp
  4006. +++ b/Source/WebKit/mui/Api/MorphOS/menuclass.cpp
  4007. @@ -43,7 +43,7 @@ DEFNEW
  4008. TAG_MORE, INITTAGS
  4009. );
  4010.  
  4011. - return ((ULONG)obj);
  4012. + return ((IPTR)obj);
  4013. }
  4014.  
  4015.  
  4016. diff --git a/Source/WebKit/mui/Api/MorphOS/menuitemclass.cpp b/Source/WebKit/mui/Api/MorphOS/menuitemclass.cpp
  4017. index 3316f269..16c6997a 100644
  4018. --- a/Source/WebKit/mui/Api/MorphOS/menuitemclass.cpp
  4019. +++ b/Source/WebKit/mui/Api/MorphOS/menuitemclass.cpp
  4020. @@ -50,7 +50,7 @@ DEFNEW
  4021. data->freeuserdata = GetTagData(MA_MenuItem_FreeUserData, TRUE, msg->ops_AttrList);
  4022. }
  4023.  
  4024. - return ((ULONG)obj);
  4025. + return ((IPTR)obj);
  4026. }
  4027.  
  4028.  
  4029. diff --git a/Source/WebKit/mui/Api/MorphOS/methodstack.c b/Source/WebKit/mui/Api/MorphOS/methodstack.c
  4030. index 91aa683e..8b4f881f 100755
  4031. --- a/Source/WebKit/mui/Api/MorphOS/methodstack.c
  4032. +++ b/Source/WebKit/mui/Api/MorphOS/methodstack.c
  4033. @@ -43,8 +43,8 @@ struct pushedmethod
  4034. ULONG size;
  4035. APTR obj;
  4036. ULONG sync;
  4037. - ULONG result;
  4038. - ULONG m[0];
  4039. + IPTR result;
  4040. + IPTR m[0];
  4041. };
  4042.  
  4043. struct pushedmessage
  4044. @@ -53,8 +53,8 @@ struct pushedmessage
  4045. ULONG size;
  4046. APTR obj;
  4047. ULONG sync;
  4048. - ULONG result;
  4049. - ULONG m[0];
  4050. + IPTR result;
  4051. + IPTR m[0];
  4052. };
  4053.  
  4054. void WakeTimer(void)
  4055. @@ -180,7 +180,7 @@ void methodstack_push(APTR obj, ULONG cnt, ...)
  4056. va_list va;
  4057.  
  4058. va_start(va, cnt);
  4059. - size = sizeof(*pm) + cnt * sizeof(ULONG);
  4060. + size = sizeof(*pm) + cnt * sizeof(IPTR);
  4061.  
  4062. if ((pm = AllocMem(size, MEMF_ANY)))
  4063. {
  4064. @@ -191,11 +191,11 @@ void methodstack_push(APTR obj, ULONG cnt, ...)
  4065.  
  4066. while (cnt--)
  4067. {
  4068. - pm->m[i] = va_arg(va, ULONG);
  4069. + pm->m[i] = va_arg(va, IPTR);
  4070. i++;
  4071. }
  4072.  
  4073. - if (SysBase->ThisTask == (APTR)mstask)
  4074. + if (FindTask(NULL) == (APTR)mstask)
  4075. {
  4076. methodstack_check();
  4077. DoMethodA(obj, (Msg)&pm->m[0]);
  4078. @@ -227,18 +227,18 @@ ULONG methodstack_push_sync(APTR obj, ULONG cnt, ...)
  4079. va_list va;
  4080.  
  4081. va_start(va, cnt);
  4082. - size = sizeof(*pm) + cnt * sizeof(ULONG);
  4083. + size = sizeof(*pm) + cnt * sizeof(IPTR);
  4084. res = 0;
  4085.  
  4086. if ((pm = AllocMem(size, MEMF_ANY)))
  4087. {
  4088. - struct Process *thisproc = (APTR)SysBase->ThisTask;
  4089. + struct Process *thisproc = (struct Process *)FindTask(NULL);
  4090. struct MsgPort *replyport = NULL;
  4091. ULONG i = 0;
  4092.  
  4093. while (cnt--)
  4094. {
  4095. - pm->m[i] = va_arg(va, ULONG);
  4096. + pm->m[i] = va_arg(va, IPTR);
  4097. i++;
  4098. }
  4099.  
  4100. diff --git a/Source/WebKit/mui/Api/MorphOS/mimetypegroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/mimetypegroupclass.cpp
  4101. index e8cabc4d..b3259d46 100755
  4102. --- a/Source/WebKit/mui/Api/MorphOS/mimetypegroupclass.cpp
  4103. +++ b/Source/WebKit/mui/Api/MorphOS/mimetypegroupclass.cpp
  4104. @@ -133,7 +133,7 @@ static void cycles_init(void)
  4105. STRPTR *current = (STRPTR *)*ptr;
  4106. while(*current)
  4107. {
  4108. - *current = (STRPTR)GSI((ULONG)*current);
  4109. + *current = (STRPTR)GSI((IPTR)*current);
  4110. current++;
  4111. }
  4112. ptr++;
  4113. diff --git a/Source/WebKit/mui/Api/MorphOS/mimetypelistclass.cpp b/Source/WebKit/mui/Api/MorphOS/mimetypelistclass.cpp
  4114. index 93359220..82e70fef 100755
  4115. --- a/Source/WebKit/mui/Api/MorphOS/mimetypelistclass.cpp
  4116. +++ b/Source/WebKit/mui/Api/MorphOS/mimetypelistclass.cpp
  4117. @@ -57,12 +57,12 @@ DEFNEW
  4118. if (obj)
  4119. {
  4120. }
  4121. - return ((ULONG)obj);
  4122. + return ((IPTR)obj);
  4123. }
  4124.  
  4125. DEFMMETHOD(List_Construct)
  4126. {
  4127. - return (ULONG)msg->entry;
  4128. + return (IPTR)msg->entry;
  4129. }
  4130.  
  4131. DEFMMETHOD(List_Destruct)
  4132. @@ -114,7 +114,7 @@ DEFMMETHOD(List_Display)
  4133. msg->array[2] = action;
  4134. msg->array[3] = buf;
  4135.  
  4136. - if( (ULONG)msg->array[-1] % 2 )
  4137. + if( (IPTR)msg->array[-1] % 2 )
  4138. {
  4139. #if !OS(AROS)
  4140. /* This code overrides internal data structures and causes a crash on AROS */
  4141. diff --git a/Source/WebKit/mui/Api/MorphOS/mui.cpp b/Source/WebKit/mui/Api/MorphOS/mui.cpp
  4142. index 4a87a97f..5dffb50e 100755
  4143. --- a/Source/WebKit/mui/Api/MorphOS/mui.cpp
  4144. +++ b/Source/WebKit/mui/Api/MorphOS/mui.cpp
  4145. @@ -123,8 +123,8 @@ APTR MakeDirString(CONST_STRPTR str, CONST_STRPTR def, ULONG id)
  4146. obj = PopaslObject,
  4147. ASLFR_DrawersOnly, TRUE,
  4148. ASLFR_InitialShowVolumes, TRUE,
  4149. - MUIA_Popstring_Button, (ULONG)pop,
  4150. - MUIA_Popstring_String, (ULONG)MakePrefsString(str, def, 1024, id),
  4151. + MUIA_Popstring_Button, (IPTR)pop,
  4152. + MUIA_Popstring_String, (IPTR)MakePrefsString(str, def, 1024, id),
  4153. MUIA_Popasl_Type, ASL_FileRequest,
  4154. TAG_DONE);
  4155.  
  4156. @@ -142,8 +142,8 @@ APTR MakeFileString(CONST_STRPTR str, CONST_STRPTR def, ULONG id)
  4157.  
  4158. obj = PopaslObject,
  4159. ASLFR_InitialFile, def,
  4160. - MUIA_Popstring_Button, (ULONG)pop,
  4161. - MUIA_Popstring_String, (ULONG)MakePrefsString(str, def, 1024, id),
  4162. + MUIA_Popstring_Button, (IPTR)pop,
  4163. + MUIA_Popstring_String, (IPTR)MakePrefsString(str, def, 1024, id),
  4164. MUIA_Popasl_Type, ASL_FileRequest,
  4165. TAG_DONE);
  4166.  
  4167. @@ -236,7 +236,7 @@ ULONG getv(APTR obj, ULONG attr)
  4168. }
  4169. #endif
  4170. #if OS(AROS)
  4171. -IPTR getv(APTR obj, ULONG attr)
  4172. +IPTR getv(APTR obj, IPTR attr)
  4173. {
  4174. IPTR val;
  4175. GetAttr(attr, (Object *)obj, &val);
  4176. diff --git a/Source/WebKit/mui/Api/MorphOS/mui.h b/Source/WebKit/mui/Api/MorphOS/mui.h
  4177. index 3c7a1a18..58a654b7 100755
  4178. --- a/Source/WebKit/mui/Api/MorphOS/mui.h
  4179. +++ b/Source/WebKit/mui/Api/MorphOS/mui.h
  4180. @@ -272,7 +272,7 @@ APTR MakeCycleLocalized(CONST_STRPTR text, APTR cyclelabels, ULONG first, ULONG
  4181. ULONG getv(APTR obj, ULONG attr);
  4182. #endif
  4183. #if defined(__AROS__)
  4184. -IPTR getv(APTR obj, ULONG attr);
  4185. +IPTR getv(APTR obj, IPTR attr);
  4186. #include <aros-overrides.h>
  4187. #endif
  4188.  
  4189. diff --git a/Source/WebKit/mui/Api/MorphOS/navigationgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/navigationgroupclass.cpp
  4190. index 999b780b..6d10f003 100755
  4191. --- a/Source/WebKit/mui/Api/MorphOS/navigationgroupclass.cpp
  4192. +++ b/Source/WebKit/mui/Api/MorphOS/navigationgroupclass.cpp
  4193. @@ -52,7 +52,7 @@ static void doset(APTR obj, struct Data *data, struct TagItem *tags)
  4194.  
  4195. while ((tag = NextTagItem(&tstate)) != NULL)
  4196. {
  4197. - ULONG tdata = tag->ti_Data;
  4198. + IPTR tdata = tag->ti_Data;
  4199.  
  4200. switch (tag->ti_Tag)
  4201. {
  4202. @@ -157,7 +157,7 @@ DEFNEW
  4203. set(obj, MA_OWBApp_ToolButtonType, type);
  4204. }
  4205.  
  4206. - return (ULONG)obj;
  4207. + return (IPTR)obj;
  4208. }
  4209.  
  4210. DEFSET
  4211. diff --git a/Source/WebKit/mui/Api/MorphOS/networkledsgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/networkledsgroupclass.cpp
  4212. index 5528f8a4..33aa2939 100755
  4213. --- a/Source/WebKit/mui/Api/MorphOS/networkledsgroupclass.cpp
  4214. +++ b/Source/WebKit/mui/Api/MorphOS/networkledsgroupclass.cpp
  4215. @@ -132,7 +132,7 @@ DEFNEW
  4216.  
  4217. DoMethod(obj, MUIM_Notify, MUIA_Pressed, FALSE, MUIV_Notify_Application, 2, MM_OWBApp_OpenWindow, MV_OWB_Window_Network);
  4218.  
  4219. - return (ULONG)obj;
  4220. + return (IPTR)obj;
  4221. }
  4222.  
  4223. return(0);
  4224. diff --git a/Source/WebKit/mui/Api/MorphOS/networklistclass.cpp b/Source/WebKit/mui/Api/MorphOS/networklistclass.cpp
  4225. index 14f922c8..b85c7f66 100644
  4226. --- a/Source/WebKit/mui/Api/MorphOS/networklistclass.cpp
  4227. +++ b/Source/WebKit/mui/Api/MorphOS/networklistclass.cpp
  4228. @@ -70,7 +70,7 @@ DEFNEW
  4229. GETDATA;
  4230. data->cmenu=NULL;
  4231. }
  4232. - return ((ULONG)obj);
  4233. + return ((IPTR)obj);
  4234. }
  4235.  
  4236. DEFDISP
  4237. @@ -85,7 +85,7 @@ DEFDISP
  4238.  
  4239. DEFMMETHOD(List_Construct)
  4240. {
  4241. - return (ULONG)msg->entry;
  4242. + return (IPTR)msg->entry;
  4243. }
  4244.  
  4245. DEFMMETHOD(List_Destruct)
  4246. @@ -165,7 +165,7 @@ DEFMMETHOD(ContextMenuBuild)
  4247.  
  4248. if (DoMethod(obj, MUIM_List_TestPos, msg->mx, msg->my, &res) && (res.entry != -1))
  4249. {
  4250. - DoMethod(obj, MUIM_List_GetEntry, res.entry, (ULONG *)&e);
  4251. + DoMethod(obj, MUIM_List_GetEntry, res.entry, (IPTR *)&e);
  4252.  
  4253. if(e)
  4254. {
  4255. @@ -179,18 +179,18 @@ DEFMMETHOD(ContextMenuBuild)
  4256. End;
  4257. }
  4258. }
  4259. - return (ULONG)data->cmenu;
  4260. + return (IPTR)data->cmenu;
  4261. }
  4262.  
  4263. DEFMMETHOD(ContextMenuChoice)
  4264. {
  4265. ResourceHandle *e;
  4266.  
  4267. - DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (ULONG *)&e);
  4268. + DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (IPTR *)&e);
  4269.  
  4270. if(e)
  4271. {
  4272. - ULONG udata = muiUserData(msg->item);
  4273. + IPTR udata = muiUserData(msg->item);
  4274.  
  4275. switch(udata)
  4276. {
  4277. diff --git a/Source/WebKit/mui/Api/MorphOS/networkwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/networkwindowclass.cpp
  4278. index ab42c81a..9efbebf2 100755
  4279. --- a/Source/WebKit/mui/Api/MorphOS/networkwindowclass.cpp
  4280. +++ b/Source/WebKit/mui/Api/MorphOS/networkwindowclass.cpp
  4281. @@ -89,7 +89,7 @@ DEFGET
  4282. {
  4283. case MA_OWB_WindowType:
  4284. {
  4285. - *msg->opg_Storage = (ULONG) MV_OWB_Window_Network;
  4286. + *msg->opg_Storage = (IPTR) MV_OWB_Window_Network;
  4287. }
  4288. return TRUE;
  4289. }
  4290. diff --git a/Source/WebKit/mui/Api/MorphOS/owbbrowserclass.cpp b/Source/WebKit/mui/Api/MorphOS/owbbrowserclass.cpp
  4291. index a89906c2..df94be2d 100755
  4292. --- a/Source/WebKit/mui/Api/MorphOS/owbbrowserclass.cpp
  4293. +++ b/Source/WebKit/mui/Api/MorphOS/owbbrowserclass.cpp
  4294. @@ -194,12 +194,12 @@ static __inline IPTR _CALLFUNC2(void (*func)(void), IPTR arg1, IPTR arg2)
  4295. Object *create_browser(char * url, ULONG is_frame, Object *title, APTR sourceview, Object *window, ULONG privatebrowsing)
  4296. {
  4297. return (Object *) NewObject(getowbbrowserclass(), NULL,
  4298. - MA_OWBBrowser_URL, (ULONG) url,
  4299. - MA_OWBBrowser_IsFrame, (ULONG) is_frame,
  4300. - MA_OWBBrowser_TitleObj, (ULONG) title,
  4301. - MA_OWBBrowser_SourceView, (ULONG) sourceview,
  4302. - MA_OWBBrowser_Window, (ULONG) window,
  4303. - MA_OWBBrowser_PrivateBrowsing, (ULONG) privatebrowsing,
  4304. + MA_OWBBrowser_URL, (IPTR) url,
  4305. + MA_OWBBrowser_IsFrame, (IPTR) is_frame,
  4306. + MA_OWBBrowser_TitleObj, (IPTR) title,
  4307. + MA_OWBBrowser_SourceView, (IPTR) sourceview,
  4308. + MA_OWBBrowser_Window, (IPTR) window,
  4309. + MA_OWBBrowser_PrivateBrowsing, (IPTR) privatebrowsing,
  4310. TAG_DONE);
  4311. }
  4312.  
  4313. @@ -396,7 +396,7 @@ DEFNEW
  4314.  
  4315. if(obj)
  4316. {
  4317. - char *url = (char *) GetTagData(MA_OWBBrowser_URL, NULL, msg->ops_AttrList);
  4318. + char *url = (char *) GetTagData(MA_OWBBrowser_URL, (IPTR)NULL, msg->ops_AttrList);
  4319. GETDATA;
  4320.  
  4321. data->added = FALSE;
  4322. @@ -411,9 +411,9 @@ DEFNEW
  4323. data->reload_available = TRUE;
  4324. data->stop_available = FALSE;
  4325.  
  4326. - data->source_view = (APTR) GetTagData(MA_OWBBrowser_SourceView, NULL, msg->ops_AttrList);
  4327. - data->is_frame = (ULONG) GetTagData(MA_OWBBrowser_IsFrame, NULL, msg->ops_AttrList);
  4328. - data->titleobj = (Object *) GetTagData(MA_OWBBrowser_TitleObj, NULL, msg->ops_AttrList);
  4329. + data->source_view = (APTR) GetTagData(MA_OWBBrowser_SourceView, (IPTR)NULL, msg->ops_AttrList);
  4330. + data->is_frame = (ULONG) GetTagData(MA_OWBBrowser_IsFrame, (IPTR)NULL, msg->ops_AttrList);
  4331. + data->titleobj = (Object *) GetTagData(MA_OWBBrowser_TitleObj, (IPTR)NULL, msg->ops_AttrList);
  4332. set(data->titleobj, MUIA_UserData, obj);
  4333. DoMethod(obj, MUIM_Notify, MA_OWBBrowser_Title, MUIV_EveryTime, data->titleobj, 3, MUIM_Set, MUIA_Text_Contents, MUIV_TriggerValue);
  4334.  
  4335. @@ -425,7 +425,7 @@ DEFNEW
  4336. data->view->app = _app(obj);
  4337. #endif
  4338.  
  4339. - data->view->window = (Object *) GetTagData(MA_OWBBrowser_Window, NULL, msg->ops_AttrList);
  4340. + data->view->window = (Object *) GetTagData(MA_OWBBrowser_Window, (IPTR)NULL, msg->ops_AttrList);
  4341.  
  4342. /* Browser default settings (could be set at init from opener) */
  4343. data->settings.javascript = JAVASCRIPT_DEFAULT;
  4344. @@ -485,7 +485,7 @@ DEFNEW
  4345. data->view->webView->onResize(re);
  4346.  
  4347. /* Passed attributes */
  4348. - set(obj, MA_OWBBrowser_PrivateBrowsing, (ULONG) GetTagData(MA_OWBBrowser_PrivateBrowsing, FALSE, msg->ops_AttrList));
  4349. + set(obj, MA_OWBBrowser_PrivateBrowsing, (IPTR) GetTagData(MA_OWBBrowser_PrivateBrowsing, FALSE, msg->ops_AttrList));
  4350.  
  4351. //kprintf("OWBBrowser: loading url <%s> is_frame: %d sourceview %p\n", data->url, data->is_frame, data->source_view);
  4352.  
  4353. @@ -587,7 +587,7 @@ DEFNEW
  4354. if(view) free(view);
  4355. }
  4356.  
  4357. - return (ULONG) obj;
  4358. + return (IPTR) obj;
  4359. }
  4360.  
  4361. DEFDISPOSE
  4362. @@ -960,7 +960,7 @@ static void doset(APTR obj, struct Data *data, struct TagItem *tags)
  4363.  
  4364. case MA_OWBBrowser_UserAgent:
  4365. {
  4366. - data->settings.useragent = (ULONG) tag->ti_Data;
  4367. + data->settings.useragent = (IPTR) tag->ti_Data;
  4368. char *useragent = (char *) (data->settings.useragent != USERAGENT_DEFAULT ? get_user_agent_strings()[data->settings.useragent] : "");
  4369. data->view->webView->setCustomUserAgent(useragent);
  4370. }
  4371. @@ -1099,178 +1099,178 @@ DEFGET
  4372.  
  4373. case MA_OWBBrowser_BackAvailable:
  4374. {
  4375. - *msg->opg_Storage = (ULONG) data->back_available;
  4376. + *msg->opg_Storage = (IPTR) data->back_available;
  4377. }
  4378. return TRUE;
  4379.  
  4380. case MA_OWBBrowser_ForwardAvailable:
  4381. {
  4382. - *msg->opg_Storage = (ULONG) data->forward_available;
  4383. + *msg->opg_Storage = (IPTR) data->forward_available;
  4384. }
  4385. return TRUE;
  4386.  
  4387. case MA_OWBBrowser_ReloadAvailable:
  4388. {
  4389. - *msg->opg_Storage = (ULONG) data->reload_available;
  4390. + *msg->opg_Storage = (IPTR) data->reload_available;
  4391. }
  4392. return TRUE;
  4393.  
  4394. case MA_OWBBrowser_StopAvailable:
  4395. {
  4396. - *msg->opg_Storage = (ULONG) data->stop_available;
  4397. + *msg->opg_Storage = (IPTR) data->stop_available;
  4398. }
  4399. return TRUE;
  4400.  
  4401. case MA_OWBBrowser_Widget:
  4402. {
  4403. - *msg->opg_Storage = (ULONG) data->view;
  4404. + *msg->opg_Storage = (IPTR) data->view;
  4405. }
  4406. return TRUE;
  4407.  
  4408. case MA_OWBBrowser_URL:
  4409. {
  4410. - *msg->opg_Storage = (ULONG) data->url;
  4411. + *msg->opg_Storage = (IPTR) data->url;
  4412. }
  4413. return TRUE;
  4414.  
  4415. case MA_OWBBrowser_EditedURL:
  4416. {
  4417. - *msg->opg_Storage = (ULONG) data->editedurl;
  4418. + *msg->opg_Storage = (IPTR) data->editedurl;
  4419. }
  4420. return TRUE;
  4421.  
  4422. case MA_OWBBrowser_IsFrame:
  4423. {
  4424. - *msg->opg_Storage = (ULONG) data->is_frame;
  4425. + *msg->opg_Storage = (IPTR) data->is_frame;
  4426. }
  4427. return TRUE;
  4428.  
  4429. case MA_OWBBrowser_SourceView:
  4430. {
  4431. - *msg->opg_Storage = (ULONG) data->source_view;
  4432. + *msg->opg_Storage = (IPTR) data->source_view;
  4433. }
  4434. return TRUE;
  4435.  
  4436. case MA_OWBBrowser_Title:
  4437. {
  4438. - *msg->opg_Storage = (ULONG) data->title;
  4439. + *msg->opg_Storage = (IPTR) data->title;
  4440. }
  4441. return TRUE;
  4442.  
  4443. case MA_OWBBrowser_Loading:
  4444. {
  4445. - *msg->opg_Storage = (ULONG) data->loading;
  4446. + *msg->opg_Storage = (IPTR) data->loading;
  4447. }
  4448. return TRUE;
  4449.  
  4450. case MA_OWBBrowser_State:
  4451. {
  4452. - *msg->opg_Storage = (ULONG) data->state;
  4453. + *msg->opg_Storage = (IPTR) data->state;
  4454. }
  4455. return TRUE;
  4456.  
  4457. case MA_OWBBrowser_Zone:
  4458. {
  4459. - *msg->opg_Storage = (ULONG) data->zone;
  4460. + *msg->opg_Storage = (IPTR) data->zone;
  4461. }
  4462. return TRUE;
  4463.  
  4464. case MA_OWBBrowser_Security:
  4465. {
  4466. - *msg->opg_Storage = (ULONG) data->security;
  4467. + *msg->opg_Storage = (IPTR) data->security;
  4468. }
  4469. return TRUE;
  4470.  
  4471. case MA_OWBBrowser_LoadingProgress:
  4472. {
  4473. - *msg->opg_Storage = (ULONG) data->loadprogress;
  4474. + *msg->opg_Storage = (IPTR) data->loadprogress;
  4475. }
  4476. return TRUE;
  4477.  
  4478. case MA_OWBBrowser_StatusText:
  4479. {
  4480. - *msg->opg_Storage = (ULONG) data->status;
  4481. + *msg->opg_Storage = (IPTR) data->status;
  4482. }
  4483. return TRUE;
  4484.  
  4485. case MA_OWBBrowser_ToolTipText:
  4486. {
  4487. - *msg->opg_Storage = (ULONG) data->tooltip;
  4488. + *msg->opg_Storage = (IPTR) data->tooltip;
  4489. }
  4490. return TRUE;
  4491.  
  4492. case MA_OWBBrowser_TitleObj:
  4493. {
  4494. - *msg->opg_Storage = (ULONG) data->titleobj;
  4495. + *msg->opg_Storage = (IPTR) data->titleobj;
  4496. }
  4497. return TRUE;
  4498.  
  4499. case MA_OWBBrowser_Active:
  4500. {
  4501. - *msg->opg_Storage = (ULONG) data->is_active;
  4502. + *msg->opg_Storage = (IPTR) data->is_active;
  4503. }
  4504. return TRUE;
  4505.  
  4506. case MA_OWBBrowser_ForbidEvents:
  4507. {
  4508. - *msg->opg_Storage = (ULONG) data->forbid_events;
  4509. + *msg->opg_Storage = (IPTR) data->forbid_events;
  4510. }
  4511. return TRUE;
  4512.  
  4513. case MA_OWBBrowser_ParentBrowser:
  4514. {
  4515. - *msg->opg_Storage = (ULONG) data->parent_browser;
  4516. + *msg->opg_Storage = (IPTR) data->parent_browser;
  4517. }
  4518. break;
  4519.  
  4520. case MA_OWBBrowser_PluginsEnabled:
  4521. {
  4522. - *msg->opg_Storage = (ULONG) data->settings.plugins;
  4523. + *msg->opg_Storage = (IPTR) data->settings.plugins;
  4524. }
  4525. return TRUE;
  4526.  
  4527. case MA_OWBBrowser_PrivateBrowsing:
  4528. {
  4529. - *msg->opg_Storage = (ULONG) data->settings.privatebrowsing;
  4530. + *msg->opg_Storage = (IPTR) data->settings.privatebrowsing;
  4531. }
  4532. return TRUE;
  4533.  
  4534. case MA_OWBBrowser_ContentBlocking:
  4535. {
  4536. - *msg->opg_Storage = (ULONG) data->settings.blocking;
  4537. + *msg->opg_Storage = (IPTR) data->settings.blocking;
  4538. }
  4539. return TRUE;
  4540.  
  4541. case MA_OWBBrowser_LoadImagesAutomatically:
  4542. {
  4543. - *msg->opg_Storage = (ULONG) data->settings.images;
  4544. + *msg->opg_Storage = (IPTR) data->settings.images;
  4545. }
  4546. return TRUE;
  4547.  
  4548. case MA_OWBBrowser_PlayAnimations:
  4549. {
  4550. - *msg->opg_Storage = (ULONG) data->settings.animations;
  4551. + *msg->opg_Storage = (IPTR) data->settings.animations;
  4552. }
  4553. return TRUE;
  4554.  
  4555. case MA_OWBBrowser_JavaScriptEnabled:
  4556. {
  4557. - *msg->opg_Storage = (ULONG) data->settings.javascript;
  4558. + *msg->opg_Storage = (IPTR) data->settings.javascript;
  4559. }
  4560. return TRUE;
  4561.  
  4562. case MA_OWBBrowser_UserAgent:
  4563. {
  4564. - *msg->opg_Storage = (ULONG) data->settings.useragent;
  4565. + *msg->opg_Storage = (IPTR) data->settings.useragent;
  4566. }
  4567. return TRUE;
  4568.  
  4569. case MA_OWBBrowser_VideoElement:
  4570. {
  4571. #if ENABLE(VIDEO)
  4572. - *msg->opg_Storage = (ULONG) data->video_element;
  4573. + *msg->opg_Storage = (IPTR) data->video_element;
  4574. #else
  4575. - *msg->opg_Storage = (ULONG) 0;
  4576. + *msg->opg_Storage = (IPTR) 0;
  4577. #endif
  4578. }
  4579. return TRUE;
  4580. @@ -1279,86 +1279,86 @@ DEFGET
  4581. case MA_OWBBrowser_DragURL:
  4582. case MA_OWB_URL:
  4583. {
  4584. - *msg->opg_Storage = (ULONG) data->dragurl;
  4585. + *msg->opg_Storage = (IPTR) data->dragurl;
  4586. }
  4587. return TRUE;
  4588.  
  4589. case MA_OWBBrowser_DragData:
  4590. {
  4591. - *msg->opg_Storage = (ULONG) dataObject;
  4592. + *msg->opg_Storage = (IPTR) dataObject;
  4593. }
  4594. return TRUE;
  4595.  
  4596. case MA_OWBBrowser_DragOperation:
  4597. {
  4598. - *msg->opg_Storage = (ULONG) data->dragoperation;
  4599. + *msg->opg_Storage = (IPTR) data->dragoperation;
  4600. }
  4601. return TRUE;
  4602.  
  4603. case MA_OWBBrowser_DragImage:
  4604. {
  4605. - *msg->opg_Storage = (ULONG) data->dragimage;
  4606. + *msg->opg_Storage = (IPTR) data->dragimage;
  4607. }
  4608. return TRUE;
  4609.  
  4610. /* Scrollers */
  4611. case MA_OWBBrowser_VBar:
  4612. {
  4613. - *msg->opg_Storage = (ULONG) data->vbar;
  4614. + *msg->opg_Storage = (IPTR) data->vbar;
  4615. }
  4616. return TRUE;
  4617.  
  4618. case MA_OWBBrowser_VBarGroup:
  4619. {
  4620. - *msg->opg_Storage = (ULONG) data->vbargroup;
  4621. + *msg->opg_Storage = (IPTR) data->vbargroup;
  4622. }
  4623. return TRUE;
  4624.  
  4625. case MA_OWBBrowser_HBar:
  4626. {
  4627. - *msg->opg_Storage = (ULONG) data->hbar;
  4628. + *msg->opg_Storage = (IPTR) data->hbar;
  4629. }
  4630. return TRUE;
  4631.  
  4632. case MA_OWBBrowser_HBarGroup:
  4633. {
  4634. - *msg->opg_Storage = (ULONG) data->hbargroup;
  4635. + *msg->opg_Storage = (IPTR) data->hbargroup;
  4636. }
  4637. return TRUE;
  4638.  
  4639. case MA_OWBBrowser_VTopPixel:
  4640. {
  4641. - *msg->opg_Storage = (ULONG) core(data->view->webView->mainFrame())->view()->visibleContentRect().y();
  4642. + *msg->opg_Storage = (IPTR) core(data->view->webView->mainFrame())->view()->visibleContentRect().y();
  4643. }
  4644. return TRUE;
  4645.  
  4646. case MA_OWBBrowser_VTotalPixel:
  4647. {
  4648. - *msg->opg_Storage = (ULONG) core(data->view->webView->mainFrame())->view()->contentsHeight();
  4649. + *msg->opg_Storage = (IPTR) core(data->view->webView->mainFrame())->view()->contentsHeight();
  4650. }
  4651. return TRUE;
  4652.  
  4653. case MA_OWBBrowser_VVisiblePixel:
  4654. {
  4655. - *msg->opg_Storage = (ULONG) core(data->view->webView->mainFrame())->view()->visibleHeight();
  4656. + *msg->opg_Storage = (IPTR) core(data->view->webView->mainFrame())->view()->visibleHeight();
  4657. }
  4658. return TRUE;
  4659.  
  4660. case MA_OWBBrowser_HTopPixel:
  4661. {
  4662. - *msg->opg_Storage = (ULONG) core(data->view->webView->mainFrame())->view()->visibleContentRect().x();
  4663. + *msg->opg_Storage = (IPTR) core(data->view->webView->mainFrame())->view()->visibleContentRect().x();
  4664. }
  4665. return TRUE;
  4666.  
  4667. case MA_OWBBrowser_HTotalPixel:
  4668. {
  4669. - *msg->opg_Storage = (ULONG) core(data->view->webView->mainFrame())->view()->contentsWidth();
  4670. + *msg->opg_Storage = (IPTR) core(data->view->webView->mainFrame())->view()->contentsWidth();
  4671. }
  4672. return TRUE;
  4673.  
  4674. case MA_OWBBrowser_HVisiblePixel:
  4675. {
  4676. - *msg->opg_Storage = (ULONG) core(data->view->webView->mainFrame())->view()->visibleWidth();
  4677. + *msg->opg_Storage = (IPTR) core(data->view->webView->mainFrame())->view()->visibleWidth();
  4678. }
  4679. return TRUE;
  4680. }
  4681. @@ -1793,7 +1793,7 @@ DEFMMETHOD(Setup)
  4682. data->ehnode.ehn_Events = IDCMP_MOUSEBUTTONS | IDCMP_RAWKEY | IDCMP_MOUSEMOVE | IDCMP_CHANGEWINDOW;
  4683. data->ehnode.ehn_Priority = 1;
  4684. data->ehnode.ehn_Flags = MUI_EHF_GUIMODE;
  4685. - DoMethod(_win(obj), MUIM_Window_AddEventHandler, (ULONG)&data->ehnode);
  4686. + DoMethod(_win(obj), MUIM_Window_AddEventHandler, (IPTR)&data->ehnode);
  4687.  
  4688. data->added = TRUE;
  4689. }
  4690. @@ -1817,7 +1817,7 @@ DEFMMETHOD(Cleanup)
  4691.  
  4692. if(data->added)
  4693. {
  4694. - DoMethod(_win(obj), MUIM_Window_RemEventHandler, (ULONG)&data->ehnode);
  4695. + DoMethod(_win(obj), MUIM_Window_RemEventHandler, (IPTR)&data->ehnode);
  4696. data->added = FALSE;
  4697. }
  4698.  
  4699. @@ -2465,12 +2465,12 @@ DEFSMETHOD(OWBBrowser_WillCloseFrame)
  4700. }
  4701.  
  4702. #if OS(AROS)
  4703. -static void cancelled(struct Hook *hook, Object *popupwin, APTR *dummy)
  4704. +static void cancelled(struct Hook *hook, Object *popupwin, IPTR *dummy)
  4705. {
  4706. set(popupwin, MUIA_Window_Open, FALSE);
  4707. }
  4708.  
  4709. -static void closed(struct Hook *hook, Object *popupwin, APTR *params)
  4710. +static void closed(struct Hook *hook, Object *popupwin, IPTR *params)
  4711. {
  4712. PopupMenuMorphOS *that = (PopupMenuMorphOS *)params[0];
  4713. int itemCount = (int)params[1];
  4714. @@ -2798,7 +2798,7 @@ DEFMMETHOD(ContextMenuBuild)
  4715.  
  4716. data->menucontroller = &page->contextMenuController();
  4717.  
  4718. - return (ULONG) data->contextmenu;
  4719. + return (IPTR) data->contextmenu;
  4720. }
  4721.  
  4722. DEFMMETHOD(ContextMenuChoice)
  4723. @@ -3208,7 +3208,7 @@ DEFMMETHOD(CreateDragImage)
  4724. STRPTR url;
  4725.  
  4726. if (parent == NULL)
  4727. - return NULL;
  4728. + return (IPTR)NULL;
  4729.  
  4730. url = (STRPTR) getv(obj, MA_OWBBrowser_DragURL);
  4731.  
  4732. @@ -3415,7 +3415,7 @@ DEFMMETHOD(CreateDragImage)
  4733. #endif
  4734. }
  4735.  
  4736. - return (ULONG)di;
  4737. + return (IPTR)di;
  4738. }
  4739.  
  4740. DEFMMETHOD(DeleteDragImage)
  4741. @@ -3598,7 +3598,7 @@ DEFMMETHOD(CreateShortHelp)
  4742. result = frame->eventHandler().hitTestResultAtPoint(point, false);
  4743.  
  4744. if(!result.altDisplayString().isEmpty())
  4745. - return (ULONG) utf8_to_local(result.altDisplayString().utf8().data());
  4746. + return (IPTR) utf8_to_local(result.altDisplayString().utf8().data());
  4747. }
  4748.  
  4749. return 0;
  4750. @@ -4039,7 +4039,7 @@ typedef struct
  4751. // It has some sideeffects for pages that want to paint over plugin area
  4752. DEFSMETHOD(Plugin_RenderRastPort)
  4753. {
  4754. - if(msg->src == NULL && msg->stride == NULL)
  4755. + if((msg->src == NULL) && (msg->stride == 0))
  4756. {
  4757. PluginRect *npwindowrect = (PluginRect *) msg->windowrect;
  4758. IntRect windowrect(npwindowrect->x, npwindowrect->y, npwindowrect->width, npwindowrect->height);
  4759. @@ -4159,7 +4159,7 @@ DEFTMETHOD(Plugin_GetHeight)
  4760. DEFSMETHOD(Plugin_GetSurface)
  4761. {
  4762. GETDATA;
  4763. - return (ULONG) data->view->cr;
  4764. + return (IPTR) data->view->cr;
  4765. }
  4766.  
  4767. DEFTMETHOD(Plugin_IsBrowserActive)
  4768. @@ -4266,7 +4266,7 @@ DEFSMETHOD(Plugin_AddTimeOut)
  4769. timer->start(msg->delay);
  4770. }
  4771.  
  4772. - return (ULONG) timer;
  4773. + return (IPTR) timer;
  4774. }
  4775.  
  4776. DEFSMETHOD(Plugin_RemoveTimeOut)
  4777. diff --git a/Source/WebKit/mui/Api/MorphOS/owbgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/owbgroupclass.cpp
  4778. index f043ef93..d5f02d73 100755
  4779. --- a/Source/WebKit/mui/Api/MorphOS/owbgroupclass.cpp
  4780. +++ b/Source/WebKit/mui/Api/MorphOS/owbgroupclass.cpp
  4781. @@ -48,7 +48,7 @@ DEFNEW
  4782. TAG_DONE
  4783. );
  4784.  
  4785. - return (ULONG)obj;
  4786. + return (IPTR)obj;
  4787. }
  4788.  
  4789. static void doset(APTR obj, struct Data *data, struct TagItem *tags)
  4790. @@ -93,19 +93,19 @@ DEFGET
  4791. {
  4792. case MA_OWBGroup_Browser:
  4793. {
  4794. - *msg->opg_Storage = (ULONG) data->browser;
  4795. + *msg->opg_Storage = (IPTR) data->browser;
  4796. }
  4797. return TRUE;
  4798.  
  4799. case MA_OWBGroup_MediaControlsGroup:
  4800. {
  4801. - *msg->opg_Storage = (ULONG) data->mediacontrolsgroup;
  4802. + *msg->opg_Storage = (IPTR) data->mediacontrolsgroup;
  4803. }
  4804. return TRUE;
  4805.  
  4806. case MA_OWBGroup_InspectorGroup:
  4807. {
  4808. - *msg->opg_Storage = (ULONG) data->inspectorgroup;
  4809. + *msg->opg_Storage = (IPTR) data->inspectorgroup;
  4810. }
  4811. return TRUE;
  4812. }
  4813. diff --git a/Source/WebKit/mui/Api/MorphOS/owbwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/owbwindowclass.cpp
  4814. index 00078a4f..77d43572 100755
  4815. --- a/Source/WebKit/mui/Api/MorphOS/owbwindowclass.cpp
  4816. +++ b/Source/WebKit/mui/Api/MorphOS/owbwindowclass.cpp
  4817. @@ -172,10 +172,10 @@ struct Data
  4818. Object *create_window(char * url, ULONG isframe, APTR sourceview, APTR features, ULONG privatebrowsing)
  4819. {
  4820. return (Object *) NewObject(getowbwindowclass(), NULL,
  4821. - MA_OWBBrowser_URL, (ULONG) url,
  4822. - MA_OWBBrowser_IsFrame, (ULONG) isframe,
  4823. - MA_OWBBrowser_SourceView, (ULONG) sourceview,
  4824. - MA_OWBWindow_Features, (ULONG) features,
  4825. + MA_OWBBrowser_URL, (IPTR) url,
  4826. + MA_OWBBrowser_IsFrame, (IPTR) isframe,
  4827. + MA_OWBBrowser_SourceView, (IPTR) sourceview,
  4828. + MA_OWBWindow_Features, (IPTR) features,
  4829. MA_OWBBrowser_PrivateBrowsing, privatebrowsing,
  4830. TAG_DONE);
  4831. }
  4832. @@ -334,7 +334,7 @@ DEFNEW
  4833. Object *menustrip;
  4834. //APTR n, m;
  4835. char id = 'W'; // Sigh, let's stay compatible with previous release, now the mistake is made :)
  4836. - Object *initialbrowser = (Object *) GetTagData(MA_OWBWindow_InitialBrowser, NULL, msg->ops_AttrList);
  4837. + Object *initialbrowser = (Object *) GetTagData(MA_OWBWindow_InitialBrowser, (IPTR)NULL, msg->ops_AttrList);
  4838. struct windownode *node = (struct windownode *) malloc(sizeof(struct windownode));
  4839.  
  4840. ULONG showseparators = getv(app, MA_OWBApp_ShowSeparators);
  4841. @@ -497,11 +497,11 @@ DEFNEW
  4842. else
  4843. {
  4844. DoMethod(obj, MM_OWBWindow_AddBrowser,
  4845. - (char *) GetTagData(MA_OWBBrowser_URL, NULL, msg->ops_AttrList),
  4846. - (ULONG) GetTagData(MA_OWBBrowser_IsFrame, NULL, msg->ops_AttrList),
  4847. - (APTR) GetTagData(MA_OWBBrowser_SourceView, NULL, msg->ops_AttrList),
  4848. + (char *) GetTagData(MA_OWBBrowser_URL, (IPTR)NULL, msg->ops_AttrList),
  4849. + (IPTR) GetTagData(MA_OWBBrowser_IsFrame, (IPTR)NULL, msg->ops_AttrList),
  4850. + (APTR) GetTagData(MA_OWBBrowser_SourceView, (IPTR)NULL, msg->ops_AttrList),
  4851. FALSE,
  4852. - (ULONG) GetTagData(MA_OWBBrowser_PrivateBrowsing, FALSE, msg->ops_AttrList),
  4853. + (IPTR) GetTagData(MA_OWBBrowser_PrivateBrowsing, FALSE, msg->ops_AttrList),
  4854. TRUE);
  4855. }
  4856.  
  4857. @@ -528,7 +528,7 @@ DEFNEW
  4858.  
  4859. ADDTAIL(&window_list, data->node);
  4860.  
  4861. - return (ULONG)obj;
  4862. + return (IPTR)obj;
  4863. }
  4864. else
  4865. {
  4866. @@ -549,7 +549,7 @@ DEFDISP
  4867. {
  4868. data->abort_completion = TRUE;
  4869. waitForThreadCompletion(data->completion_thread);
  4870. - data->completion_thread = NULL;
  4871. + data->completion_thread = (IPTR)NULL;
  4872. }
  4873.  
  4874. DoMethod((Object *) getv(app, MA_OWBApp_BookmarkWindow), MM_Bookmarkgroup_UnRegisterQLGroup, data->fastlinkgroup);
  4875. @@ -708,7 +708,7 @@ static void doset(APTR obj, struct Data *data, struct TagItem *tags)
  4876. /* Rather sucky handling, do something smarter */
  4877. case MA_OWBWindow_ShowBookmarkPanel:
  4878. {
  4879. - ULONG show = tag->ti_Data;
  4880. + IPTR show = tag->ti_Data;
  4881.  
  4882. data->historypanelgroup = NULL;
  4883.  
  4884. @@ -749,7 +749,7 @@ static void doset(APTR obj, struct Data *data, struct TagItem *tags)
  4885.  
  4886. case MA_OWBWindow_ShowHistoryPanel:
  4887. {
  4888. - ULONG show = tag->ti_Data;
  4889. + IPTR show = tag->ti_Data;
  4890.  
  4891. data->bookmarkpanelgroup = NULL;
  4892.  
  4893. @@ -832,79 +832,79 @@ DEFGET
  4894. {
  4895. case MA_OWBWindow_ActiveBrowser:
  4896. {
  4897. - *msg->opg_Storage = (ULONG) data->active_browser;
  4898. + *msg->opg_Storage = (IPTR) data->active_browser;
  4899. }
  4900. return TRUE;
  4901.  
  4902. case MA_OWBWindow_ActiveWebInspector:
  4903. {
  4904. - *msg->opg_Storage = (ULONG) data->active_webinspector;
  4905. + *msg->opg_Storage = (IPTR) data->active_webinspector;
  4906. }
  4907. return TRUE;
  4908.  
  4909. case MA_OWBWindow_FastLinkGroup:
  4910. {
  4911. - *msg->opg_Storage = (ULONG) data->fastlinkgroup;
  4912. + *msg->opg_Storage = (IPTR) data->fastlinkgroup;
  4913. }
  4914. return TRUE;
  4915.  
  4916. case MA_OWBWindow_FastLinkParentGroup:
  4917. {
  4918. - *msg->opg_Storage = (ULONG) data->fastlinkparentgroup;
  4919. + *msg->opg_Storage = (IPTR) data->fastlinkparentgroup;
  4920. }
  4921. return TRUE;
  4922.  
  4923. case MA_OWBWindow_NavigationGroup:
  4924. {
  4925. - *msg->opg_Storage = (ULONG) data->navigationgroup;
  4926. + *msg->opg_Storage = (IPTR) data->navigationgroup;
  4927. }
  4928. return TRUE;
  4929.  
  4930. case MA_OWBWindow_AddressBarGroup:
  4931. {
  4932. - *msg->opg_Storage = (ULONG) data->addressbargroup;
  4933. + *msg->opg_Storage = (IPTR) data->addressbargroup;
  4934. }
  4935. return TRUE;
  4936.  
  4937. case MA_OWBWindow_NetworkLedsGroup:
  4938. {
  4939. - *msg->opg_Storage = (ULONG) data->networkledsgroup;
  4940. + *msg->opg_Storage = (IPTR) data->networkledsgroup;
  4941. }
  4942. return TRUE;
  4943.  
  4944. case MA_OWBWindow_SearchGroup:
  4945. {
  4946. - *msg->opg_Storage = (ULONG) data->searchgroup;
  4947. + *msg->opg_Storage = (IPTR) data->searchgroup;
  4948. }
  4949. return TRUE;
  4950.  
  4951. case MA_OWB_WindowType:
  4952. {
  4953. - *msg->opg_Storage = (ULONG) MV_OWB_Window_Browser;
  4954. + *msg->opg_Storage = (IPTR) MV_OWB_Window_Browser;
  4955. }
  4956. return TRUE;
  4957.  
  4958. case MA_OWBWindow_ShowBookmarkPanel:
  4959. {
  4960. - *msg->opg_Storage = (ULONG) (data->bookmarkpanelgroup != NULL);
  4961. + *msg->opg_Storage = (IPTR) (data->bookmarkpanelgroup != NULL);
  4962. }
  4963. return TRUE;
  4964.  
  4965. case MA_OWBWindow_ShowHistoryPanel:
  4966. {
  4967. - *msg->opg_Storage = (ULONG) (data->historypanelgroup != NULL);
  4968. + *msg->opg_Storage = (IPTR) (data->historypanelgroup != NULL);
  4969. }
  4970. return TRUE;
  4971.  
  4972. case MA_OWBWindow_BookmarkPanelGroup:
  4973. {
  4974. - *msg->opg_Storage = (ULONG) data->bookmarkpanelgroup;
  4975. + *msg->opg_Storage = (IPTR) data->bookmarkpanelgroup;
  4976. }
  4977. return TRUE;
  4978.  
  4979. case MA_OWBWindow_HistoryPanelGroup:
  4980. {
  4981. - *msg->opg_Storage = (ULONG) data->historypanelgroup;
  4982. + *msg->opg_Storage = (IPTR) data->historypanelgroup;
  4983. }
  4984. return TRUE;
  4985. }
  4986. @@ -1129,7 +1129,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  4987.  
  4988. case MNA_NAVIGATION:
  4989. {
  4990. - ULONG show;
  4991. + IPTR show;
  4992. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, MNA_NAVIGATION, MUIA_Menuitem_Checked, &show);
  4993. set(obj, MA_OWBWindow_ShowNavigationGroup, show);
  4994. break;
  4995. @@ -1137,7 +1137,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  4996.  
  4997. case MNA_QUICKLINKS:
  4998. {
  4999. - ULONG show;
  5000. + IPTR show;
  5001. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, MNA_QUICKLINKS, MUIA_Menuitem_Checked, &show);
  5002. set(obj, MA_OWBWindow_ShowQuickLinkGroup, show);
  5003. break;
  5004. @@ -1145,7 +1145,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5005.  
  5006. case MNA_LOCATION:
  5007. {
  5008. - ULONG show;
  5009. + IPTR show;
  5010. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, MNA_LOCATION, MUIA_Menuitem_Checked, &show);
  5011. set(obj, MA_OWBWindow_ShowAddressBarGroup, show);
  5012. break;
  5013. @@ -1153,7 +1153,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5014.  
  5015. case MNA_STATUS:
  5016. {
  5017. - ULONG show;
  5018. + IPTR show;
  5019. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, MNA_STATUS, MUIA_Menuitem_Checked, &show);
  5020. set(obj, MA_OWBWindow_ShowStatusGroup, show);
  5021. break;
  5022. @@ -1161,7 +1161,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5023.  
  5024. case MNA_FULLSCREEN:
  5025. {
  5026. - ULONG fullscreen;
  5027. + IPTR fullscreen;
  5028. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, MNA_STATUS, MUIA_Menuitem_Checked, &fullscreen);
  5029. DoMethod(obj, MM_OWBWindow_FullScreen, fullscreen ? MV_OWBWindow_FullScreen_On : MV_OWBWindow_FullScreen_Off);
  5030. break;
  5031. @@ -1169,7 +1169,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5032.  
  5033. case MNA_NO_PANEL:
  5034. {
  5035. - ULONG show;
  5036. + IPTR show;
  5037. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, MNA_NO_PANEL, MUIA_Menuitem_Checked, &show);
  5038. set(obj, MA_OWBWindow_ShowBookmarkPanel, FALSE);
  5039. set(obj, MA_OWBWindow_ShowHistoryPanel, FALSE);
  5040. @@ -1180,7 +1180,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5041.  
  5042. case MNA_BOOKMARK_PANEL:
  5043. {
  5044. - ULONG show;
  5045. + IPTR show;
  5046. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, MNA_BOOKMARK_PANEL, MUIA_Menuitem_Checked, &show);
  5047. set(obj, MA_OWBWindow_ShowBookmarkPanel, show);
  5048. DoMethod(obj, MM_OWBWindow_UpdatePanelGroup);
  5049. @@ -1190,7 +1190,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5050.  
  5051. case MNA_HISTORY_PANEL:
  5052. {
  5053. - ULONG show;
  5054. + IPTR show;
  5055. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, MNA_HISTORY_PANEL, MUIA_Menuitem_Checked, &show);
  5056. set(obj, MA_OWBWindow_ShowHistoryPanel, show);
  5057. DoMethod(obj, MM_OWBWindow_UpdatePanelGroup);
  5058. @@ -1266,7 +1266,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5059.  
  5060. case MNA_PRIVATE_BROWSING:
  5061. {
  5062. - ULONG enabled;
  5063. + IPTR enabled;
  5064. BalWidget *widget = (BalWidget *) getv(data->active_browser, MA_OWBBrowser_Widget);
  5065.  
  5066. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, msg->action, MUIA_Menuitem_Checked, &enabled);
  5067. @@ -1280,12 +1280,12 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5068. case MNA_SETTINGS_JAVASCRIPT_DISABLED:
  5069. case MNA_SETTINGS_JAVASCRIPT_DEFAULT:
  5070. {
  5071. - ULONG enabled;
  5072. + IPTR enabled;
  5073. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, msg->action, MUIA_Menuitem_Checked, &enabled);
  5074.  
  5075. if(enabled)
  5076. {
  5077. - ULONG value;
  5078. + IPTR value;
  5079. BalWidget *widget = (BalWidget *) getv(data->active_browser, MA_OWBBrowser_Widget);
  5080.  
  5081. switch(msg->action)
  5082. @@ -1311,12 +1311,12 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5083. case MNA_SETTINGS_IMAGES_DISABLED:
  5084. case MNA_SETTINGS_IMAGES_DEFAULT:
  5085. {
  5086. - ULONG enabled;
  5087. + IPTR enabled;
  5088. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, msg->action, MUIA_Menuitem_Checked, &enabled);
  5089.  
  5090. if(enabled)
  5091. {
  5092. - ULONG value;
  5093. + IPTR value;
  5094. BalWidget *widget = (BalWidget *) getv(data->active_browser, MA_OWBBrowser_Widget);
  5095.  
  5096. switch(msg->action)
  5097. @@ -1342,12 +1342,12 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5098. case MNA_SETTINGS_ANIMATIONS_DISABLED:
  5099. case MNA_SETTINGS_ANIMATIONS_DEFAULT:
  5100. {
  5101. - ULONG enabled;
  5102. + IPTR enabled;
  5103. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, msg->action, MUIA_Menuitem_Checked, &enabled);
  5104.  
  5105. if(enabled)
  5106. {
  5107. - ULONG value;
  5108. + IPTR value;
  5109. BalWidget *widget = (BalWidget *) getv(data->active_browser, MA_OWBBrowser_Widget);
  5110.  
  5111. switch(msg->action)
  5112. @@ -1373,12 +1373,12 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5113. case MNA_SETTINGS_PLUGINS_DISABLED:
  5114. case MNA_SETTINGS_PLUGINS_DEFAULT:
  5115. {
  5116. - ULONG enabled;
  5117. + IPTR enabled;
  5118. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, msg->action, MUIA_Menuitem_Checked, &enabled);
  5119.  
  5120. if(enabled)
  5121. {
  5122. - ULONG value;
  5123. + IPTR value;
  5124. BalWidget *widget = (BalWidget *) getv(data->active_browser, MA_OWBBrowser_Widget);
  5125.  
  5126. switch(msg->action)
  5127. @@ -1402,7 +1402,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5128.  
  5129. case MNA_SETTINGS_SPOOF_AS_DEFAULT:
  5130. {
  5131. - ULONG enabled;
  5132. + IPTR enabled;
  5133. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, MNA_SETTINGS_SPOOF_AS_DEFAULT, MUIA_Menuitem_Checked, &enabled);
  5134.  
  5135. if(enabled)
  5136. @@ -1438,7 +1438,7 @@ DEFSMETHOD(OWBWindow_MenuAction)
  5137. // Set the new user agent for the webview
  5138. case MENUTYPE_SPOOF:
  5139. {
  5140. - ULONG enabled;
  5141. + IPTR enabled;
  5142. DoMethod((Object *)getv(obj, MUIA_Window_Menustrip), MUIM_GetUData, entry, MUIA_Menuitem_Checked, &enabled);
  5143.  
  5144. if(enabled)
  5145. @@ -1485,7 +1485,7 @@ DEFSMETHOD(OWBWindow_LoadURL)
  5146. // Handle possible shortcuts
  5147. if(spacepos != notFound)
  5148. {
  5149. - ULONG res = FALSE;
  5150. + IPTR res = FALSE;
  5151. String shortcut = url.left(spacepos);
  5152. String text = url.right(url.length() - (spacepos + 1));
  5153. char *converted_shortcut = utf8_to_local(shortcut.utf8().data());
  5154. @@ -2025,7 +2025,7 @@ DEFSMETHOD(OWBWindow_AddBrowser)
  5155. }
  5156. }
  5157.  
  5158. - return (ULONG) widget;
  5159. + return (IPTR) widget;
  5160. }
  5161.  
  5162. DEFSMETHOD(OWBWindow_RemoveBrowser)
  5163. @@ -2158,7 +2158,7 @@ DEFSMETHOD(OWBWindow_DetachBrowser)
  5164. if(!msg->window)
  5165. {
  5166. Object *window = (Object *) NewObject(getowbwindowclass(), NULL,
  5167. - MA_OWBWindow_InitialBrowser, (ULONG) msg->browser,
  5168. + MA_OWBWindow_InitialBrowser, (IPTR) msg->browser,
  5169. TAG_DONE);
  5170.  
  5171. if(window)
  5172. @@ -2287,7 +2287,7 @@ DEFSMETHOD(OWBWindow_CreateInspector)
  5173. }
  5174. }
  5175.  
  5176. - return (ULONG) widget;
  5177. + return (IPTR) widget;
  5178.  
  5179. //return 0;
  5180. }
  5181. @@ -2341,7 +2341,7 @@ DEFSMETHOD(OWBWindow_ActivePage)
  5182.  
  5183. SetAttrs(data->navigationgroup,
  5184. MA_TransferAnim_Animate, getv(data->active_browser, MA_OWBBrowser_Loading),
  5185. - MA_Navigation_BackForwardList, (ULONG) ((WebView *) ((BalWidget *)getv(data->active_browser, MA_OWBBrowser_Widget))->webView)->backForwardList(),
  5186. + MA_Navigation_BackForwardList, (IPTR) ((WebView *) ((BalWidget *)getv(data->active_browser, MA_OWBBrowser_Widget))->webView)->backForwardList(),
  5187. TAG_DONE);
  5188.  
  5189. SetAttrs(data->progressgroup, MUIA_Group_ActivePage, getv(data->active_browser, MA_OWBBrowser_Loading) ? 1 : 0, TAG_DONE);
  5190. @@ -2674,7 +2674,7 @@ DEFSMETHOD(OWBWindow_UpdateMenu)
  5191. {
  5192. Object *strip = (Object *) getv(obj, MUIA_Window_Menustrip);
  5193. Object *menu = NULL;
  5194. - ULONG userdata = 0;
  5195. + IPTR userdata = 0;
  5196.  
  5197. DoMethod(strip, MUIM_Menustrip_InitChange);
  5198.  
  5199. @@ -2767,7 +2767,7 @@ DEFSMETHOD(OWBWindow_UpdateMenu)
  5200. {
  5201. struct menu_entry *menu_entry = (struct menu_entry *) muiUserData(child);
  5202.  
  5203. - if(menu_entry && ((LONG) menu_entry > MNA_DUMMY) && menu_entry->type == MENUTYPE_SPOOF)
  5204. + if(menu_entry && ((SIPTR) menu_entry > MNA_DUMMY) && menu_entry->type == MENUTYPE_SPOOF)
  5205. {
  5206. if(useragent == String((char *) menu_entry->data))
  5207. {
  5208. @@ -2925,9 +2925,9 @@ DEFSMETHOD(OWBWindow_JavaScriptPrompt)
  5209. End;
  5210.  
  5211. if (!req_wnd)
  5212. - return NULL;
  5213. + return (IPTR)NULL;
  5214.  
  5215. - DoMethod(_app(obj), OM_ADDMEMBER, req_wnd);
  5216. + DoMethod(_app(obj), OM_ADDMEMBER, req_wnd);
  5217.  
  5218. DoMethod(bt_cancel, MUIM_Notify, MUIA_Pressed, FALSE,
  5219. _app(obj), 2, MUIM_Application_ReturnID, 1);
  5220. @@ -2935,18 +2935,18 @@ DEFSMETHOD(OWBWindow_JavaScriptPrompt)
  5221. DoMethod(bt_ok, MUIM_Notify, MUIA_Pressed, FALSE,
  5222. _app(obj), 2, MUIM_Application_ReturnID, 2);
  5223.  
  5224. - set(req_wnd, MUIA_Window_ActiveObject, /*bt_ok*/str);
  5225. + set(req_wnd, MUIA_Window_ActiveObject, /*bt_ok*/str);
  5226. set(req_wnd, MUIA_Window_Open, TRUE);
  5227.  
  5228. LONG result = -1;
  5229.  
  5230. - if (getv(req_wnd, MUIA_Window_Open))
  5231. + if (getv(req_wnd, MUIA_Window_Open))
  5232. {
  5233. ULONG sigs = 0;
  5234.  
  5235. while (result == -1)
  5236. {
  5237. - ULONG ret = DoMethod(_app(obj), MUIM_Application_NewInput, &sigs);
  5238. + IPTR ret = DoMethod(_app(obj), MUIM_Application_NewInput, &sigs);
  5239. if(ret == 1 || ret == 2)
  5240. {
  5241. result = ret;
  5242. @@ -2960,16 +2960,16 @@ DEFSMETHOD(OWBWindow_JavaScriptPrompt)
  5243.  
  5244. if (result == 2)
  5245. {
  5246. - STRPTR value = (STRPTR) getv(str, MUIA_String_Contents);
  5247. + STRPTR value = (STRPTR) getv(str, MUIA_String_Contents);
  5248. if(value)
  5249. - answer = strdup(value);
  5250. + answer = strdup(value);
  5251. }
  5252.  
  5253. set(req_wnd, MUIA_Window_Open, FALSE);
  5254. - DoMethod(_app(obj), OM_REMMEMBER, req_wnd);
  5255. + DoMethod(_app(obj), OM_REMMEMBER, req_wnd);
  5256. MUI_DisposeObject(req_wnd);
  5257.  
  5258. - return (ULONG) answer;
  5259. + return (IPTR) answer;
  5260. }
  5261.  
  5262. /* AutoCompletion */
  5263. diff --git a/Source/WebKit/mui/Api/MorphOS/passwordmanagergroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/passwordmanagergroupclass.cpp
  5264. index c0978481..16cf7906 100644
  5265. --- a/Source/WebKit/mui/Api/MorphOS/passwordmanagergroupclass.cpp
  5266. +++ b/Source/WebKit/mui/Api/MorphOS/passwordmanagergroupclass.cpp
  5267. @@ -84,7 +84,7 @@ DEFNEW
  5268. DoMethod(obj, MM_PasswordManagerGroup_Load);
  5269. }
  5270.  
  5271. - return ((ULONG)obj);
  5272. + return ((IPTR)obj);
  5273. }
  5274.  
  5275. DEFDISP
  5276. @@ -452,7 +452,7 @@ DEFSMETHOD(PasswordManagerGroup_Get)
  5277. String *host = (String *) msg->host;
  5278. ExtCredential *credential = credentialMap.get(*host);
  5279.  
  5280. - return (ULONG) credential;
  5281. + return (IPTR) credential;
  5282. }
  5283.  
  5284.  
  5285. diff --git a/Source/WebKit/mui/Api/MorphOS/passwordmanagerlistclass.cpp b/Source/WebKit/mui/Api/MorphOS/passwordmanagerlistclass.cpp
  5286. index 20f48de5..7ecadc56 100644
  5287. --- a/Source/WebKit/mui/Api/MorphOS/passwordmanagerlistclass.cpp
  5288. +++ b/Source/WebKit/mui/Api/MorphOS/passwordmanagerlistclass.cpp
  5289. @@ -73,7 +73,7 @@ DEFNEW
  5290. data->cmenu = NULL;
  5291. }
  5292.  
  5293. - return ((ULONG)obj);
  5294. + return ((IPTR)obj);
  5295. }
  5296.  
  5297. DEFDISP
  5298. @@ -89,7 +89,7 @@ DEFDISP
  5299. DEFMMETHOD(List_Construct)
  5300. {
  5301. // Built by caller
  5302. - return (ULONG)msg->entry;
  5303. + return (IPTR)msg->entry;
  5304. }
  5305.  
  5306. DEFMMETHOD(List_Destruct)
  5307. @@ -168,7 +168,7 @@ DEFMMETHOD(ContextMenuBuild)
  5308.  
  5309. if (DoMethod(obj, MUIM_List_TestPos, msg->mx, msg->my, &res) && (res.entry != -1))
  5310. {
  5311. - DoMethod(obj, MUIM_List_GetEntry, res.entry, (ULONG *)&e);
  5312. + DoMethod(obj, MUIM_List_GetEntry, res.entry, (IPTR *)&e);
  5313.  
  5314. if(e)
  5315. {
  5316. @@ -190,18 +190,18 @@ DEFMMETHOD(ContextMenuBuild)
  5317. End;
  5318. }
  5319. }
  5320. - return (ULONG)data->cmenu;
  5321. + return (IPTR)data->cmenu;
  5322. }
  5323.  
  5324. DEFMMETHOD(ContextMenuChoice)
  5325. {
  5326. struct credential_entry *e = NULL;
  5327.  
  5328. - DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (ULONG *)&e);
  5329. + DoMethod(obj, MUIM_List_GetEntry, MUIV_List_GetEntry_Active, (IPTR *)&e);
  5330.  
  5331. if(e)
  5332. {
  5333. - ULONG udata = muiUserData(msg->item);
  5334. + IPTR udata = muiUserData(msg->item);
  5335.  
  5336. switch(udata)
  5337. {
  5338. diff --git a/Source/WebKit/mui/Api/MorphOS/passwordmanagerwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/passwordmanagerwindowclass.cpp
  5339. index 9434bb3f..1832874c 100644
  5340. --- a/Source/WebKit/mui/Api/MorphOS/passwordmanagerwindowclass.cpp
  5341. +++ b/Source/WebKit/mui/Api/MorphOS/passwordmanagerwindowclass.cpp
  5342. @@ -74,7 +74,7 @@ DEFGET
  5343. {
  5344. case MA_OWB_WindowType:
  5345. {
  5346. - *msg->opg_Storage = (ULONG) MV_OWB_Window_PasswordManager;
  5347. + *msg->opg_Storage = (IPTR) MV_OWB_Window_PasswordManager;
  5348. }
  5349. return TRUE;
  5350. }
  5351. diff --git a/Source/WebKit/mui/Api/MorphOS/popstringclass.cpp b/Source/WebKit/mui/Api/MorphOS/popstringclass.cpp
  5352. index 1dc3e990..9de2673f 100755
  5353. --- a/Source/WebKit/mui/Api/MorphOS/popstringclass.cpp
  5354. +++ b/Source/WebKit/mui/Api/MorphOS/popstringclass.cpp
  5355. @@ -163,15 +163,15 @@ DEFGET
  5356. switch (msg->opg_AttrID)
  5357. {
  5358. case MUIA_Popobject_Object:
  5359. - *msg->opg_Storage = (ULONG) data->lv_entries;
  5360. + *msg->opg_Storage = (IPTR) data->lv_entries;
  5361. return TRUE;
  5362.  
  5363. case MUIA_Popstring_String:
  5364. - *msg->opg_Storage = (ULONG) data->str;
  5365. + *msg->opg_Storage = (IPTR) data->str;
  5366. return TRUE;
  5367.  
  5368. case MUIA_String_Contents:
  5369. - return GetAttr(MUIA_String_Contents, data->str, (ULONGPTR)msg->opg_Storage);
  5370. + return GetAttr(MUIA_String_Contents, data->str, (IPTR *)msg->opg_Storage);
  5371. }
  5372.  
  5373. return DOSUPER;
  5374. diff --git a/Source/WebKit/mui/Api/MorphOS/prefswindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/prefswindowclass.cpp
  5375. index 2b6233f5..addc9592 100755
  5376. --- a/Source/WebKit/mui/Api/MorphOS/prefswindowclass.cpp
  5377. +++ b/Source/WebKit/mui/Api/MorphOS/prefswindowclass.cpp
  5378. @@ -234,7 +234,7 @@ STATIC CONST int proxy_values[] =
  5379. CURLPROXY_SOCKS4A,
  5380. CURLPROXY_SOCKS5,
  5381. CURLPROXY_SOCKS5_HOSTNAME,
  5382. - NULL,
  5383. + 0,
  5384. };
  5385.  
  5386. struct useragent_pair
  5387. @@ -351,7 +351,7 @@ static void cycles_init(void)
  5388. STRPTR *current = (STRPTR *)*ptr;
  5389. while(*current)
  5390. {
  5391. - *current = (STRPTR)GSI((ULONG)*current);
  5392. + *current = (STRPTR)GSI((IPTR)*current);
  5393. current++;
  5394. }
  5395. ptr++;
  5396. @@ -1162,91 +1162,91 @@ DEFGET
  5397. {
  5398. case MA_OWB_WindowType:
  5399. {
  5400. - *msg->opg_Storage = (ULONG) MV_OWB_Window_Settings;
  5401. + *msg->opg_Storage = (IPTR) MV_OWB_Window_Settings;
  5402. }
  5403. return TRUE;
  5404.  
  5405. case MA_OWBApp_DefaultURL:
  5406. {
  5407. - *msg->opg_Storage = (ULONG) getv(data->str_homepage, MUIA_String_Contents);
  5408. + *msg->opg_Storage = (IPTR) getv(data->str_homepage, MUIA_String_Contents);
  5409. }
  5410. return TRUE;
  5411.  
  5412. case MA_OWBApp_StartPage:
  5413. {
  5414. - *msg->opg_Storage = (ULONG) getv(data->str_startpage, MUIA_String_Contents);
  5415. + *msg->opg_Storage = (IPTR) getv(data->str_startpage, MUIA_String_Contents);
  5416. }
  5417. return TRUE;
  5418.  
  5419. case MA_OWBApp_NewTabPage:
  5420. {
  5421. - *msg->opg_Storage = (ULONG) getv(data->str_newtabpage, MUIA_String_Contents);
  5422. + *msg->opg_Storage = (IPTR) getv(data->str_newtabpage, MUIA_String_Contents);
  5423. }
  5424. return TRUE;
  5425.  
  5426. case MA_OWBApp_CLIDevice:
  5427. {
  5428. - *msg->opg_Storage = (ULONG) getv(data->str_clidevice, MUIA_String_Contents);
  5429. + *msg->opg_Storage = (IPTR) getv(data->str_clidevice, MUIA_String_Contents);
  5430. }
  5431. return TRUE;
  5432.  
  5433. case MA_OWBApp_ShowButtonFrame:
  5434. {
  5435. - *msg->opg_Storage = (ULONG) getv(data->ch_showbuttonframe, MUIA_Selected);
  5436. + *msg->opg_Storage = (IPTR) getv(data->ch_showbuttonframe, MUIA_Selected);
  5437. }
  5438. return TRUE;
  5439.  
  5440. case MA_OWBApp_EnablePointers:
  5441. {
  5442. - *msg->opg_Storage = (ULONG) getv(data->ch_enablepointers, MUIA_Selected);
  5443. + *msg->opg_Storage = (IPTR) getv(data->ch_enablepointers, MUIA_Selected);
  5444. }
  5445. return TRUE;
  5446.  
  5447. case MA_OWBApp_ShowSearchBar:
  5448. {
  5449. - *msg->opg_Storage = (ULONG) getv(data->ch_showsearch, MUIA_Selected);
  5450. + *msg->opg_Storage = (IPTR) getv(data->ch_showsearch, MUIA_Selected);
  5451. }
  5452. return TRUE;
  5453.  
  5454. case MA_OWBApp_ShowValidationButtons:
  5455. {
  5456. - *msg->opg_Storage = (ULONG) getv(data->ch_showvalidationbuttons, MUIA_Selected);
  5457. + *msg->opg_Storage = (IPTR) getv(data->ch_showvalidationbuttons, MUIA_Selected);
  5458. }
  5459. return TRUE;
  5460.  
  5461. case MA_OWBApp_ShowSeparators:
  5462. {
  5463. - *msg->opg_Storage = (ULONG) getv(data->ch_showseparators, MUIA_Selected);
  5464. + *msg->opg_Storage = (IPTR) getv(data->ch_showseparators, MUIA_Selected);
  5465. }
  5466. return TRUE;
  5467.  
  5468. case MA_OWBApp_EnableTabTransferAnim:
  5469. {
  5470. - *msg->opg_Storage = (ULONG) getv(data->ch_showtabtransferanim, MUIA_Selected);
  5471. + *msg->opg_Storage = (IPTR) getv(data->ch_showtabtransferanim, MUIA_Selected);
  5472. }
  5473. return TRUE;
  5474.  
  5475. case MA_OWBApp_NewPagePolicy:
  5476. {
  5477. - *msg->opg_Storage = (ULONG) (getv(data->cy_newpagepolicy, MUIA_Cycle_Active) == 0) ? MV_OWBApp_NewPagePolicy_Tab : MV_OWBApp_NewPagePolicy_Window;
  5478. + *msg->opg_Storage = (IPTR) (getv(data->cy_newpagepolicy, MUIA_Cycle_Active) == 0) ? MV_OWBApp_NewPagePolicy_Tab : MV_OWBApp_NewPagePolicy_Window;
  5479. }
  5480. return TRUE;
  5481.  
  5482. case MA_OWBApp_PopupPolicy:
  5483. {
  5484. - *msg->opg_Storage = (ULONG) (getv(data->cy_popuppolicy, MUIA_Cycle_Active) == 0) ? MV_OWBApp_NewPagePolicy_Tab : MV_OWBApp_NewPagePolicy_Window;
  5485. + *msg->opg_Storage = (IPTR) (getv(data->cy_popuppolicy, MUIA_Cycle_Active) == 0) ? MV_OWBApp_NewPagePolicy_Tab : MV_OWBApp_NewPagePolicy_Window;
  5486. }
  5487. return TRUE;
  5488.  
  5489. case MA_OWBApp_NewPagePosition:
  5490. {
  5491. - *msg->opg_Storage = (ULONG) (getv(data->cy_newpageposition, MUIA_Cycle_Active) == 0) ? MV_OWBApp_NewPagePosition_Last : MV_OWBApp_NewPagePosition_After_Active;
  5492. + *msg->opg_Storage = (IPTR) (getv(data->cy_newpageposition, MUIA_Cycle_Active) == 0) ? MV_OWBApp_NewPagePosition_Last : MV_OWBApp_NewPagePosition_After_Active;
  5493. }
  5494. return TRUE;
  5495.  
  5496. case MA_OWBApp_ToolButtonType:
  5497. {
  5498. - *msg->opg_Storage = (ULONG) getv(data->cy_toolbuttontype, MUIA_Cycle_Active);
  5499. + *msg->opg_Storage = (IPTR) getv(data->cy_toolbuttontype, MUIA_Cycle_Active);
  5500. }
  5501. return TRUE;
  5502.  
  5503. @@ -1273,13 +1273,13 @@ DEFGET
  5504.  
  5505. case MA_OWBApp_CloseRequester:
  5506. {
  5507. - *msg->opg_Storage = (ULONG) getv(data->cy_closerequester, MUIA_Cycle_Active);
  5508. + *msg->opg_Storage = (IPTR) getv(data->cy_closerequester, MUIA_Cycle_Active);
  5509. }
  5510. return TRUE;
  5511.  
  5512. case MA_OWBApp_ErrorMode:
  5513. {
  5514. - *msg->opg_Storage = (ULONG) getv(data->cy_errorreporting, MUIA_Cycle_Active) ? MV_OWBApp_ErrorMode_Page : MV_OWBApp_ErrorMode_Requester;
  5515. + *msg->opg_Storage = (IPTR) getv(data->cy_errorreporting, MUIA_Cycle_Active) ? MV_OWBApp_ErrorMode_Page : MV_OWBApp_ErrorMode_Requester;
  5516. }
  5517. return TRUE;
  5518.  
  5519. @@ -1303,7 +1303,7 @@ DEFGET
  5520.  
  5521. case MA_OWBApp_ShowFavIcons:
  5522. {
  5523. - ULONG value = 0;
  5524. + IPTR value = 0;
  5525. value |= getv(data->ch_favicon_tab, MUIA_Selected) ? MV_OWBApp_ShowFavIcons_Tab : 0;
  5526. value |= getv(data->ch_favicon_bookmark, MUIA_Selected) ? MV_OWBApp_ShowFavIcons_Bookmark : 0;
  5527. value |= getv(data->ch_favicon_history, MUIA_Selected) ? MV_OWBApp_ShowFavIcons_History : 0;
  5528. @@ -1331,7 +1331,7 @@ DEFGET
  5529.  
  5530. case MA_OWBApp_QuickLinkRows:
  5531. {
  5532. - *msg->opg_Storage = (ULONG) getv(data->sl_quicklinkrows, MUIA_Slider_Level);
  5533. + *msg->opg_Storage = (IPTR) getv(data->sl_quicklinkrows, MUIA_Slider_Level);
  5534. }
  5535. return TRUE;
  5536.  
  5537. @@ -1361,346 +1361,346 @@ DEFGET
  5538.  
  5539. case MA_OWBApp_EnablePageCache:
  5540. {
  5541. - *msg->opg_Storage = (ULONG) getv(data->ch_enablepagecache, MUIA_Selected);
  5542. + *msg->opg_Storage = (IPTR) getv(data->ch_enablepagecache, MUIA_Selected);
  5543. }
  5544. return TRUE;
  5545.  
  5546. case MA_OWBApp_CacheModel:
  5547. {
  5548. - *msg->opg_Storage = (ULONG) getv(data->cy_cachemodel, MUIA_Cycle_Active);
  5549. + *msg->opg_Storage = (IPTR) getv(data->cy_cachemodel, MUIA_Cycle_Active);
  5550. }
  5551. return TRUE;
  5552.  
  5553. case MA_OWBApp_EnableJavaScript:
  5554. {
  5555. - *msg->opg_Storage = (ULONG) getv(data->ch_enablejavascript, MUIA_Selected);
  5556. + *msg->opg_Storage = (IPTR) getv(data->ch_enablejavascript, MUIA_Selected);
  5557. }
  5558. return TRUE;
  5559.  
  5560. case MA_OWBApp_AllowJavaScriptNewWindow:
  5561. {
  5562. - *msg->opg_Storage = (ULONG) getv(data->ch_allowjavascriptnewwindow, MUIA_Selected);
  5563. + *msg->opg_Storage = (IPTR) getv(data->ch_allowjavascriptnewwindow, MUIA_Selected);
  5564. }
  5565. return TRUE;
  5566.  
  5567. case MA_OWBApp_EnableAnimation:
  5568. {
  5569. - *msg->opg_Storage = (ULONG) getv(data->ch_enableanimation, MUIA_Selected);
  5570. + *msg->opg_Storage = (IPTR) getv(data->ch_enableanimation, MUIA_Selected);
  5571. }
  5572. return TRUE;
  5573.  
  5574. case MA_OWBApp_EnableAnimationLoop:
  5575. {
  5576. - *msg->opg_Storage = (ULONG) getv(data->ch_enableanimationloop, MUIA_Selected);
  5577. + *msg->opg_Storage = (IPTR) getv(data->ch_enableanimationloop, MUIA_Selected);
  5578. }
  5579. return TRUE;
  5580. /*
  5581. case MA_OWBApp_AnimationPolicy:
  5582. {
  5583. - *msg->opg_Storage = (ULONG) getv(data->cy_animationpolicy, MUIA_Cycle_Active);
  5584. + *msg->opg_Storage = (IPTR) getv(data->cy_animationpolicy, MUIA_Cycle_Active);
  5585. }
  5586. return TRUE;
  5587. */
  5588. case MA_OWBApp_LoadImagesAutomatically:
  5589. {
  5590. - *msg->opg_Storage = (ULONG) getv(data->ch_enableimages, MUIA_Selected);
  5591. + *msg->opg_Storage = (IPTR) getv(data->ch_enableimages, MUIA_Selected);
  5592. }
  5593. return TRUE;
  5594.  
  5595. case MA_OWBApp_ShouldPrintBackgrounds:
  5596. {
  5597. - *msg->opg_Storage = (ULONG) getv(data->ch_shouldprintbackground, MUIA_Selected);
  5598. + *msg->opg_Storage = (IPTR) getv(data->ch_shouldprintbackground, MUIA_Selected);
  5599. }
  5600. return TRUE;
  5601.  
  5602. case MA_OWBApp_EnableContentBlocking:
  5603. {
  5604. - *msg->opg_Storage = (ULONG) getv(data->ch_contentblocking, MUIA_Selected);
  5605. + *msg->opg_Storage = (IPTR) getv(data->ch_contentblocking, MUIA_Selected);
  5606. }
  5607. return TRUE;
  5608.  
  5609. case MA_OWBApp_EnablePlugins:
  5610. {
  5611. - *msg->opg_Storage = (ULONG) getv(data->ch_enableplugins, MUIA_Selected);
  5612. + *msg->opg_Storage = (IPTR) getv(data->ch_enableplugins, MUIA_Selected);
  5613. }
  5614. return TRUE;
  5615.  
  5616. case MA_OWBApp_EnableInspector:
  5617. {
  5618. - *msg->opg_Storage = (ULONG) getv(data->ch_enableinspector, MUIA_Selected);
  5619. + *msg->opg_Storage = (IPTR) getv(data->ch_enableinspector, MUIA_Selected);
  5620. }
  5621. return TRUE;
  5622.  
  5623. case MA_OWBApp_DownloadDirectory:
  5624. {
  5625. - *msg->opg_Storage = (ULONG) getv(data->str_dldir, MUIA_String_Contents);
  5626. + *msg->opg_Storage = (IPTR) getv(data->str_dldir, MUIA_String_Contents);
  5627. }
  5628. return TRUE;
  5629.  
  5630. case MA_OWBApp_DownloadAutoClose:
  5631. {
  5632. - *msg->opg_Storage = (ULONG) getv(data->ch_downloadautoclose, MUIA_Selected);
  5633. + *msg->opg_Storage = (IPTR) getv(data->ch_downloadautoclose, MUIA_Selected);
  5634. }
  5635. return TRUE;
  5636.  
  5637. case MA_OWBApp_DownloadSave:
  5638. {
  5639. - *msg->opg_Storage = (ULONG) getv(data->ch_savedownloads, MUIA_Selected);
  5640. + *msg->opg_Storage = (IPTR) getv(data->ch_savedownloads, MUIA_Selected);
  5641. }
  5642. return TRUE;
  5643.  
  5644. case MA_OWBApp_DownloadStartAutomatically:
  5645. {
  5646. - *msg->opg_Storage = (ULONG) getv(data->ch_downloadstartautomatically, MUIA_Selected);
  5647. + *msg->opg_Storage = (IPTR) getv(data->ch_downloadstartautomatically, MUIA_Selected);
  5648. }
  5649. return TRUE;
  5650.  
  5651. case MA_OWBApp_DefaultFontSize:
  5652. {
  5653. - *msg->opg_Storage = (ULONG) atoi((char *) getv(data->str_defaultfontsize, MUIA_String_Contents));
  5654. + *msg->opg_Storage = (IPTR) atoi((char *) getv(data->str_defaultfontsize, MUIA_String_Contents));
  5655. }
  5656. return TRUE;
  5657.  
  5658. case MA_OWBApp_DefaultFixedFontSize:
  5659. {
  5660. - *msg->opg_Storage = (ULONG) atoi((char *) getv(data->str_defaultfixedfontsize, MUIA_String_Contents));
  5661. + *msg->opg_Storage = (IPTR) atoi((char *) getv(data->str_defaultfixedfontsize, MUIA_String_Contents));
  5662. }
  5663. return TRUE;
  5664.  
  5665. case MA_OWBApp_MinimumFontSize:
  5666. {
  5667. - *msg->opg_Storage = (ULONG) atoi((char *) getv(data->str_minimumfontsize, MUIA_String_Contents));
  5668. + *msg->opg_Storage = (IPTR) atoi((char *) getv(data->str_minimumfontsize, MUIA_String_Contents));
  5669. }
  5670. return TRUE;
  5671.  
  5672. case MA_OWBApp_MinimumLogicalFontSize:
  5673. {
  5674. - *msg->opg_Storage = (ULONG) atoi((char *) getv(data->str_minimumlogicalfontsize, MUIA_String_Contents));
  5675. + *msg->opg_Storage = (IPTR) atoi((char *) getv(data->str_minimumlogicalfontsize, MUIA_String_Contents));
  5676. }
  5677. return TRUE;
  5678.  
  5679. case MA_OWBApp_TextEncoding:
  5680. {
  5681. - ULONG i = getv(data->cy_textencoding, MUIA_Cycle_Active);
  5682. - *msg->opg_Storage = (ULONG) textencodings[i];
  5683. + IPTR i = getv(data->cy_textencoding, MUIA_Cycle_Active);
  5684. + *msg->opg_Storage = (IPTR) textencodings[i];
  5685. }
  5686. return TRUE;
  5687.  
  5688. case MA_OWBApp_SmoothingType:
  5689. {
  5690. - *msg->opg_Storage = getv(data->cy_fontsmoothing, MUIA_Cycle_Active) == 0 ? (ULONG) FontSmoothingTypeMedium : (ULONG) FontSmoothingTypeWindows;
  5691. + *msg->opg_Storage = getv(data->cy_fontsmoothing, MUIA_Cycle_Active) == 0 ? (ULONG) FontSmoothingTypeMedium : (IPTR) FontSmoothingTypeWindows;
  5692. }
  5693. return TRUE;
  5694.  
  5695. case MA_OWBApp_SansSerifFontFamily:
  5696. {
  5697. - *msg->opg_Storage = (ULONG) getv(data->str_sansseriffamily, MUIA_String_Contents);
  5698. + *msg->opg_Storage = (IPTR) getv(data->str_sansseriffamily, MUIA_String_Contents);
  5699. }
  5700. return TRUE;
  5701.  
  5702. case MA_OWBApp_SerifFontFamily:
  5703. {
  5704. - *msg->opg_Storage = (ULONG) getv(data->str_seriffamily, MUIA_String_Contents);
  5705. + *msg->opg_Storage = (IPTR) getv(data->str_seriffamily, MUIA_String_Contents);
  5706. }
  5707. return TRUE;
  5708.  
  5709. case MA_OWBApp_StandardFontFamily:
  5710. {
  5711. - *msg->opg_Storage = (ULONG) getv(data->str_standardfamily, MUIA_String_Contents);
  5712. + *msg->opg_Storage = (IPTR) getv(data->str_standardfamily, MUIA_String_Contents);
  5713. }
  5714. return TRUE;
  5715.  
  5716. case MA_OWBApp_CursiveFontFamily:
  5717. {
  5718. - *msg->opg_Storage = (ULONG) getv(data->str_cursivefamily, MUIA_String_Contents);
  5719. + *msg->opg_Storage = (IPTR) getv(data->str_cursivefamily, MUIA_String_Contents);
  5720. }
  5721. return TRUE;
  5722.  
  5723. case MA_OWBApp_FantasyFontFamily:
  5724. {
  5725. - *msg->opg_Storage = (ULONG) getv(data->str_fantasyfamily, MUIA_String_Contents);
  5726. + *msg->opg_Storage = (IPTR) getv(data->str_fantasyfamily, MUIA_String_Contents);
  5727. }
  5728. return TRUE;
  5729.  
  5730. case MA_OWBApp_FixedFontFamily:
  5731. {
  5732. - *msg->opg_Storage = (ULONG) getv(data->str_fixedfamily, MUIA_String_Contents);
  5733. + *msg->opg_Storage = (IPTR) getv(data->str_fixedfamily, MUIA_String_Contents);
  5734. }
  5735. return TRUE;
  5736.  
  5737. case MA_OWBApp_ActiveConnections:
  5738. {
  5739. - *msg->opg_Storage = (ULONG) getv(data->sl_connections, MUIA_Slider_Level);
  5740. + *msg->opg_Storage = (IPTR) getv(data->sl_connections, MUIA_Slider_Level);
  5741. }
  5742. return TRUE;
  5743.  
  5744. case MA_OWBApp_UserAgent:
  5745. {
  5746. - *msg->opg_Storage = (ULONG) useragents_strings[getv(data->cy_useragent, MUIA_Cycle_Active)];
  5747. + *msg->opg_Storage = (IPTR) useragents_strings[getv(data->cy_useragent, MUIA_Cycle_Active)];
  5748. }
  5749. return TRUE;
  5750.  
  5751. case MA_OWBApp_ProxyEnabled:
  5752. {
  5753. - *msg->opg_Storage = (ULONG) getv(data->ch_proxyenabled, MUIA_Selected);
  5754. + *msg->opg_Storage = (IPTR) getv(data->ch_proxyenabled, MUIA_Selected);
  5755. }
  5756. return TRUE;
  5757.  
  5758. case MA_OWBApp_ProxyType:
  5759. {
  5760. - *msg->opg_Storage = (ULONG) proxy_values[getv(data->cy_proxytype, MUIA_Cycle_Active)];
  5761. + *msg->opg_Storage = (IPTR) proxy_values[getv(data->cy_proxytype, MUIA_Cycle_Active)];
  5762. }
  5763. return TRUE;
  5764.  
  5765. case MA_OWBApp_ProxyHost:
  5766. {
  5767. - *msg->opg_Storage = (ULONG) getv(data->str_proxyhost, MUIA_String_Contents);
  5768. + *msg->opg_Storage = (IPTR) getv(data->str_proxyhost, MUIA_String_Contents);
  5769. }
  5770. return TRUE;
  5771.  
  5772. case MA_OWBApp_ProxyPort:
  5773. {
  5774. - *msg->opg_Storage = (ULONG) atoi((char *) getv(data->str_proxyport, MUIA_String_Contents));
  5775. + *msg->opg_Storage = (IPTR) atoi((char *) getv(data->str_proxyport, MUIA_String_Contents));
  5776. }
  5777. return TRUE;
  5778.  
  5779. case MA_OWBApp_ProxyUsername:
  5780. {
  5781. - *msg->opg_Storage = (ULONG) getv(data->str_proxyusername, MUIA_String_Contents);
  5782. + *msg->opg_Storage = (IPTR) getv(data->str_proxyusername, MUIA_String_Contents);
  5783. }
  5784. return TRUE;
  5785.  
  5786. case MA_OWBApp_ProxyPassword:
  5787. {
  5788. - *msg->opg_Storage = (ULONG) getv(data->str_proxypassword, MUIA_String_Contents);
  5789. + *msg->opg_Storage = (IPTR) getv(data->str_proxypassword, MUIA_String_Contents);
  5790. }
  5791. return TRUE;
  5792.  
  5793. case MA_OWBApp_SaveSession:
  5794. {
  5795. - *msg->opg_Storage = (ULONG) getv(data->ch_savesession, MUIA_Selected);
  5796. + *msg->opg_Storage = (IPTR) getv(data->ch_savesession, MUIA_Selected);
  5797. }
  5798. return TRUE;
  5799.  
  5800. case MA_OWBApp_DeleteSessionAtExit:
  5801. {
  5802. - *msg->opg_Storage = (ULONG) getv(data->ch_deletesessionatexit, MUIA_Selected);
  5803. + *msg->opg_Storage = (IPTR) getv(data->ch_deletesessionatexit, MUIA_Selected);
  5804. }
  5805. return TRUE;
  5806.  
  5807. case MA_OWBApp_SessionRestoreMode:
  5808. {
  5809. - *msg->opg_Storage = (ULONG) getv(data->cy_sessionrestore, MUIA_Cycle_Active);
  5810. + *msg->opg_Storage = (IPTR) getv(data->cy_sessionrestore, MUIA_Cycle_Active);
  5811. }
  5812. return TRUE;
  5813.  
  5814. /*
  5815. case MA_OWBApp_PersistantCookiesPolicy:
  5816. {
  5817. - *msg->opg_Storage = (ULONG) getv(data->cy_persistantcookiespolicy, MUIA_Cycle_Active);
  5818. + *msg->opg_Storage = (IPTR) getv(data->cy_persistantcookiespolicy, MUIA_Cycle_Active);
  5819. }
  5820. return TRUE;
  5821.  
  5822. case MA_OWBApp_TemporaryCookiesPolicy:
  5823. {
  5824. - *msg->opg_Storage = (ULONG) getv(data->cy_temporarycookiespolicy, MUIA_Cycle_Active);
  5825. + *msg->opg_Storage = (IPTR) getv(data->cy_temporarycookiespolicy, MUIA_Cycle_Active);
  5826. }
  5827. return TRUE;
  5828. */
  5829.  
  5830. case MA_OWBApp_SaveCookies:
  5831. {
  5832. - *msg->opg_Storage = (ULONG) getv(data->ch_savecookies, MUIA_Selected);
  5833. + *msg->opg_Storage = (IPTR) getv(data->ch_savecookies, MUIA_Selected);
  5834. }
  5835. return TRUE;
  5836.  
  5837. case MA_OWBApp_CookiesPolicy:
  5838. {
  5839. - *msg->opg_Storage = (ULONG) getv(data->cy_cookiespolicy, MUIA_Cycle_Active);
  5840. + *msg->opg_Storage = (IPTR) getv(data->cy_cookiespolicy, MUIA_Cycle_Active);
  5841. }
  5842. return TRUE;
  5843.  
  5844. case MA_OWBApp_EnableLocalStorage:
  5845. {
  5846. - *msg->opg_Storage = (ULONG) getv(data->ch_enablelocalstorage, MUIA_Selected);
  5847. + *msg->opg_Storage = (IPTR) getv(data->ch_enablelocalstorage, MUIA_Selected);
  5848. }
  5849. return TRUE;
  5850.  
  5851. case MA_OWBApp_SaveHistory:
  5852. {
  5853. - *msg->opg_Storage = (ULONG) getv(data->ch_savehistory, MUIA_Selected);
  5854. + *msg->opg_Storage = (IPTR) getv(data->ch_savehistory, MUIA_Selected);
  5855. }
  5856. return TRUE;
  5857.  
  5858. case MA_OWBApp_HistoryItemLimit:
  5859. {
  5860. - *msg->opg_Storage = (ULONG) getv(data->sl_historyitems, MUIA_Slider_Level);
  5861. + *msg->opg_Storage = (IPTR) getv(data->sl_historyitems, MUIA_Slider_Level);
  5862. }
  5863. return TRUE;
  5864.  
  5865. case MA_OWBApp_HistoryAgeInDaysLimit:
  5866. {
  5867. - *msg->opg_Storage = (ULONG) getv(data->sl_historymaxage, MUIA_Slider_Level);
  5868. + *msg->opg_Storage = (IPTR) getv(data->sl_historymaxage, MUIA_Slider_Level);
  5869. }
  5870. return TRUE;
  5871.  
  5872. case MA_OWBApp_SaveFormCredentials:
  5873. {
  5874. - *msg->opg_Storage = (ULONG) getv(data->ch_savecredentials, MUIA_Selected);
  5875. + *msg->opg_Storage = (IPTR) getv(data->ch_savecredentials, MUIA_Selected);
  5876. }
  5877. return TRUE;
  5878.  
  5879. case MA_OWBApp_EnableFormAutofill:
  5880. {
  5881. - *msg->opg_Storage = (ULONG) getv(data->ch_formautofill, MUIA_Selected);
  5882. + *msg->opg_Storage = (IPTR) getv(data->ch_formautofill, MUIA_Selected);
  5883. }
  5884. return TRUE;
  5885.  
  5886. case MA_OWBApp_CertificatePath:
  5887. {
  5888. - *msg->opg_Storage = (ULONG) getv(data->str_certificatepath, MUIA_String_Contents);
  5889. + *msg->opg_Storage = (IPTR) getv(data->str_certificatepath, MUIA_String_Contents);
  5890. }
  5891. return TRUE;
  5892.  
  5893. case MA_OWBApp_IgnoreSSLErrors:
  5894. {
  5895. - *msg->opg_Storage = (ULONG) getv(data->ch_ignoresslerrors, MUIA_Selected);
  5896. + *msg->opg_Storage = (IPTR) getv(data->ch_ignoresslerrors, MUIA_Selected);
  5897. }
  5898. return TRUE;
  5899.  
  5900. case MA_OWBApp_LoopFilterMode:
  5901. {
  5902. - *msg->opg_Storage = (ULONG) getv(data->cy_loopfilter, MUIA_Cycle_Active);
  5903. + *msg->opg_Storage = (IPTR) getv(data->cy_loopfilter, MUIA_Cycle_Active);
  5904. }
  5905. return TRUE;
  5906.  
  5907. case MA_OWBApp_EnableVP8:
  5908. {
  5909. - *msg->opg_Storage = (ULONG) getv(data->ch_webm, MUIA_Selected);
  5910. + *msg->opg_Storage = (IPTR) getv(data->ch_webm, MUIA_Selected);
  5911. }
  5912. return TRUE;
  5913.  
  5914. case MA_OWBApp_EnableFLV:
  5915. {
  5916. - *msg->opg_Storage = (ULONG) getv(data->ch_flv, MUIA_Selected);
  5917. + *msg->opg_Storage = (IPTR) getv(data->ch_flv, MUIA_Selected);
  5918. }
  5919. return TRUE;
  5920.  
  5921. case MA_OWBApp_EnableOgg:
  5922. {
  5923. - *msg->opg_Storage = (ULONG) getv(data->ch_ogg, MUIA_Selected);
  5924. + *msg->opg_Storage = (IPTR) getv(data->ch_ogg, MUIA_Selected);
  5925. }
  5926. return TRUE;
  5927.  
  5928. case MA_OWBApp_EnableMP4:
  5929. {
  5930. - *msg->opg_Storage = (ULONG) getv(data->ch_mp4, MUIA_Selected);
  5931. + *msg->opg_Storage = (IPTR) getv(data->ch_mp4, MUIA_Selected);
  5932. }
  5933. return TRUE;
  5934.  
  5935. case MA_OWBApp_EnablePartialContent:
  5936. {
  5937. - *msg->opg_Storage = (ULONG) getv(data->ch_partialcontent, MUIA_Selected);
  5938. + *msg->opg_Storage = (IPTR) getv(data->ch_partialcontent, MUIA_Selected);
  5939. }
  5940. return TRUE;
  5941. }
  5942. diff --git a/Source/WebKit/mui/Api/MorphOS/printerwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/printerwindowclass.cpp
  5943. index 949a47e9..9fba8b5a 100755
  5944. --- a/Source/WebKit/mui/Api/MorphOS/printerwindowclass.cpp
  5945. +++ b/Source/WebKit/mui/Api/MorphOS/printerwindowclass.cpp
  5946. @@ -225,13 +225,13 @@ DEFGET
  5947. {
  5948. case MA_OWB_WindowType:
  5949. {
  5950. - *msg->opg_Storage = (ULONG) MV_OWB_Window_Printer;
  5951. + *msg->opg_Storage = (IPTR) MV_OWB_Window_Printer;
  5952. }
  5953. return TRUE;
  5954.  
  5955. case MA_OWB_Browser:
  5956. {
  5957. - *msg->opg_Storage = (ULONG) data->browser;
  5958. + *msg->opg_Storage = (IPTR) data->browser;
  5959. }
  5960. return TRUE;
  5961. }
  5962. @@ -431,7 +431,9 @@ DEFTMETHOD(PrinterWindow_Start)
  5963. }
  5964. else
  5965. {
  5966. +#if (0)
  5967. MUI_Request(app, obj, 0, GSI(MSG_REQUESTER_ERROR_TITLE), GSI(MSG_PRINTERWINDOW_ERROR), TAG_DONE);
  5968. +#endif
  5969. }
  5970.  
  5971. printContext.end();
  5972. @@ -459,7 +461,7 @@ DEFTMETHOD(PrinterWindow_Start)
  5973. if(!(OpenDevice((STRPTR)"printer.device", 0, (struct IORequest *)PIO, 0)))
  5974. {
  5975. PD = (struct PrinterData *)PIO->iodrp.io_Device;
  5976. - TP_Installed = (((ULONG *)(PD->pd_OldStk))[2] == TPMATCHWORD);
  5977. + TP_Installed = (((IPTR *)(PD->pd_OldStk))[2] == TPMATCHWORD);
  5978. TPVersion = PIO->iodrp.io_Device->dd_Library.lib_Version;
  5979.  
  5980. if(TP_Installed && TPVersion >= 39)
  5981. @@ -546,7 +548,7 @@ DEFTMETHOD(PrinterWindow_Start)
  5982. pctx->PIO->iodrp.io_Special = SPECIAL_MILROWS | SPECIAL_MILCOLS; // save aspect ratio of picture,
  5983. // turn on inches input for above fields
  5984. // new: io.Modes must point to a new Structure (ExtIoDrp)
  5985. - pctx->PIO->iodrp.io_Modes = (ULONG)&pctx->ExtIoDrp;
  5986. + pctx->PIO->iodrp.io_Modes = (IPTR)&pctx->ExtIoDrp;
  5987.  
  5988. // fill in the new structure
  5989. pctx->ExtIoDrp.PixAspX = 1; // for the correct aspect ratio
  5990. diff --git a/Source/WebKit/mui/Api/MorphOS/quicklinkbuttongroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/quicklinkbuttongroupclass.cpp
  5991. index ec47ce6b..9fb12c31 100755
  5992. --- a/Source/WebKit/mui/Api/MorphOS/quicklinkbuttongroupclass.cpp
  5993. +++ b/Source/WebKit/mui/Api/MorphOS/quicklinkbuttongroupclass.cpp
  5994. @@ -176,7 +176,7 @@ DEFNEW
  5995. }
  5996. }
  5997.  
  5998. - if (!tmp.node) return (NULL);
  5999. + if (!tmp.node) return (IPTR)NULL;
  6000.  
  6001. if ((tmp.node->alias) && (*tmp.node->alias!='\0'))
  6002. {
  6003. @@ -193,7 +193,7 @@ DEFNEW
  6004.  
  6005. tmp.title = (STRPTR)malloc(strlen(title)+1);
  6006.  
  6007. - if (!tmp.title) return (NULL);
  6008. + if (!tmp.title) return (IPTR)NULL;
  6009.  
  6010. strcpy(tmp.title,title);
  6011.  
  6012. @@ -238,7 +238,7 @@ DEFNEW
  6013. }
  6014.  
  6015. }
  6016. - return ((ULONG)obj);
  6017. + return ((IPTR)obj);
  6018. }
  6019.  
  6020.  
  6021. @@ -277,13 +277,13 @@ DEFGET
  6022.  
  6023. case MA_OWB_URL:
  6024. {
  6025. - *msg->opg_Storage = (ULONG) data->node->address;
  6026. + *msg->opg_Storage = (IPTR) data->node->address;
  6027. }
  6028. return TRUE;
  6029.  
  6030. case MA_QuickLinkGroup_Mode:
  6031. {
  6032. - *msg->opg_Storage = (ULONG) data->mode;
  6033. + *msg->opg_Storage = (IPTR) data->mode;
  6034. }
  6035. return TRUE;
  6036. }
  6037. @@ -335,7 +335,7 @@ struct popupmenu_entry
  6038. APTR icon;
  6039. };
  6040.  
  6041. -static ULONG build_menu(Object *menu, Object *lt, struct MUIS_Listtree_TreeNode *list, struct MinList *menuentry_list)
  6042. +static IPTR build_menu(Object *menu, Object *lt, struct MUIS_Listtree_TreeNode *list, struct MinList *menuentry_list)
  6043. {
  6044. struct MUIS_Listtree_TreeNode *tn;
  6045. struct treedata *node;
  6046. @@ -403,7 +403,7 @@ static ULONG build_menu(Object *menu, Object *lt, struct MUIS_Listtree_TreeNode
  6047. MUIA_Weight, 0,
  6048. TAG_DONE);
  6049.  
  6050. - snprintf(label, sizeof(label), "\033O[%08lx] %s", (ULONG) entry->icon, truncatedTitle.latin1().data());
  6051. + snprintf(label, sizeof(label), "\033O[%08lx] %s", (IPTR) entry->icon, truncatedTitle.latin1().data());
  6052. }
  6053. else
  6054. {
  6055. @@ -475,7 +475,7 @@ DEFTMETHOD(QuickLinkButtonGroup_BuildMenu)
  6056. {
  6057. if(data->node->treenode)
  6058. {
  6059. - ULONG rc;
  6060. + IPTR rc;
  6061. ULONG count = 0;
  6062. APTR n, m;
  6063. struct MinList menuentry_list;
  6064. @@ -613,13 +613,13 @@ DEFMMETHOD(ContextMenuBuild)
  6065. End,
  6066. End;
  6067.  
  6068. - return (ULONG)data->cMenu;
  6069. + return (IPTR)data->cMenu;
  6070. }
  6071.  
  6072. DEFMMETHOD(ContextMenuChoice)
  6073. {
  6074. GETDATA;
  6075. - ULONG udata = muiUserData(msg->item);
  6076. + IPTR udata = muiUserData(msg->item);
  6077.  
  6078. switch (udata)
  6079. {
  6080. @@ -651,7 +651,7 @@ DEFMMETHOD(ContextMenuChoice)
  6081. default:
  6082. ;
  6083. }
  6084. - return (ULONG)NULL;
  6085. + return (IPTR)NULL;
  6086. }
  6087.  
  6088. DEFMMETHOD(CreateShortHelp)
  6089. @@ -667,7 +667,7 @@ DEFMMETHOD(CreateShortHelp)
  6090. if (help)
  6091. {
  6092. sprintf(help, "%s\n%s", data->node->title, data->node->address);
  6093. - return ((ULONG)help);
  6094. + return ((IPTR)help);
  6095. }
  6096. }
  6097. return (0);
  6098. diff --git a/Source/WebKit/mui/Api/MorphOS/quicklinkgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/quicklinkgroupclass.cpp
  6099. index 72287057..a49ee518 100755
  6100. --- a/Source/WebKit/mui/Api/MorphOS/quicklinkgroupclass.cpp
  6101. +++ b/Source/WebKit/mui/Api/MorphOS/quicklinkgroupclass.cpp
  6102. @@ -37,7 +37,7 @@
  6103. #include "bookmarkgroupclass.h"
  6104.  
  6105. #ifndef get
  6106. -#define get(obj,attr,store) GetAttr(attr,obj,(ULONGPTR)store)
  6107. +#define get(obj,attr,store) GetAttr(attr,obj,(IPTR *)store)
  6108. #endif
  6109.  
  6110. #define D(x)
  6111. @@ -112,7 +112,7 @@ static void doset(Object *obj, struct Data *data, struct TagItem *tags)
  6112. NEXTTAG
  6113. }
  6114.  
  6115. -static ULONG LayoutFonc( struct Hook *hook, Object *obj, struct MUI_LayoutMsg *lm )
  6116. +static IPTR LayoutFonc( struct Hook *hook, Object *obj, struct MUI_LayoutMsg *lm )
  6117. {
  6118. struct Data *data=NULL;
  6119.  
  6120. @@ -136,7 +136,7 @@ static ULONG LayoutFonc( struct Hook *hook, Object *obj, struct MUI_LayoutMsg *l
  6121.  
  6122. get(obj, MA_QuickLinkGroup_Data, &data);
  6123.  
  6124. - D(kprintf("### QuickLinkGroup MinMax Data: %08lx:\n",(ULONG)data));
  6125. + D(kprintf("### QuickLinkGroup MinMax Data: %08lx:\n",(IPTR)data));
  6126. if (!data) return(FALSE);
  6127.  
  6128. //get(obj, MUIA_Group_HorizSpacing, &data->hspace);
  6129. @@ -232,7 +232,7 @@ static ULONG LayoutFonc( struct Hook *hook, Object *obj, struct MUI_LayoutMsg *l
  6130.  
  6131. get(obj, MA_QuickLinkGroup_Data, &data);
  6132.  
  6133. - D(kprintf("### QuickLinkGroup Layout Data: %08lx:\n",(ULONG)data));
  6134. + D(kprintf("### QuickLinkGroup Layout Data: %08lx:\n",(IPTR)data));
  6135. if (!data) return(FALSE);
  6136. //D(kprintf("Layout Width=%ld Button_w=%ld Hspace=%ld\n", lm->lm_Layout.Width, data->button_w, data->hspace));
  6137.  
  6138. @@ -479,7 +479,7 @@ static ULONG LayoutFonc( struct Hook *hook, Object *obj, struct MUI_LayoutMsg *l
  6139. return(TRUE);
  6140. }
  6141. }
  6142. - return((ULONG)MUILM_UNKNOWN);
  6143. + return((IPTR)MUILM_UNKNOWN);
  6144. }
  6145.  
  6146. static struct Hook LayoutFonc_hook = {
  6147. @@ -518,7 +518,7 @@ DEFNEW
  6148. data->ehnode.ehn_Flags = MUI_EHF_GUIMODE;
  6149. */
  6150. }
  6151. - return ((ULONG)obj);
  6152. + return ((IPTR)obj);
  6153. }
  6154.  
  6155. DEFDISP
  6156. @@ -534,7 +534,7 @@ DEFGET
  6157. {
  6158. case MA_QuickLinkGroup_Data:
  6159. {
  6160. - *msg->opg_Storage = (ULONG)data;
  6161. + *msg->opg_Storage = (IPTR)data;
  6162. return (TRUE);
  6163. }
  6164. case MA_QuickLinkGroup_Mode:
  6165. @@ -650,7 +650,7 @@ DEFSMETHOD(QuickLinkGroup_Add)
  6166.  
  6167. button=(Object *)NewObject(getquicklinkbuttongroupclass(), NULL,
  6168. MA_QuickLinkGroup_Mode, data->mode,
  6169. - MA_QuickLinkButtonGroup_Node, (ULONG)msg->td,
  6170. + MA_QuickLinkButtonGroup_Node, (IPTR)msg->td,
  6171. End;
  6172.  
  6173. if (button) DoMethod(obj, MUIM_Group_AddTail, button);
  6174. diff --git a/Source/WebKit/mui/Api/MorphOS/quicklinkparentgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/quicklinkparentgroupclass.cpp
  6175. index f10df5ed..de924e20 100755
  6176. --- a/Source/WebKit/mui/Api/MorphOS/quicklinkparentgroupclass.cpp
  6177. +++ b/Source/WebKit/mui/Api/MorphOS/quicklinkparentgroupclass.cpp
  6178. @@ -38,7 +38,7 @@
  6179. #include "bookmarkgroupclass.h"
  6180.  
  6181. #ifndef get
  6182. -#define get(obj,attr,store) GetAttr(attr,obj,(ULONGPTR)store)
  6183. +#define get(obj,attr,store) GetAttr(attr,obj,(IPTR *)store)
  6184. #endif
  6185.  
  6186. //#define D(x)
  6187. @@ -55,7 +55,7 @@ extern Object *app;
  6188. #define D(x)
  6189. #define LOC(a,b) (b)
  6190.  
  6191. -static ULONG LayoutFonc( struct Hook *hook, Object *obj, struct MUI_LayoutMsg *lm )
  6192. +static IPTR LayoutFonc( struct Hook *hook, Object *obj, struct MUI_LayoutMsg *lm )
  6193. {
  6194. //struct Data *data=NULL;
  6195.  
  6196. @@ -174,7 +174,7 @@ static ULONG LayoutFonc( struct Hook *hook, Object *obj, struct MUI_LayoutMsg *l
  6197. return (TRUE);
  6198. }
  6199. }
  6200. - return((ULONG)MUILM_UNKNOWN);
  6201. + return((IPTR)MUILM_UNKNOWN);
  6202. }
  6203.  
  6204. static struct Hook LayoutFonc_hook = {
  6205. @@ -293,7 +293,7 @@ DEFNEW
  6206. data->hidden=FALSE;
  6207. doset(obj, data, msg->ops_AttrList);
  6208. }
  6209. - return ((ULONG)obj);
  6210. + return ((IPTR)obj);
  6211. }
  6212.  
  6213. DEFDISP
  6214. diff --git a/Source/WebKit/mui/Api/MorphOS/scriptmanagergroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/scriptmanagergroupclass.cpp
  6215. index 4492611d..2db840da 100644
  6216. --- a/Source/WebKit/mui/Api/MorphOS/scriptmanagergroupclass.cpp
  6217. +++ b/Source/WebKit/mui/Api/MorphOS/scriptmanagergroupclass.cpp
  6218. @@ -795,7 +795,7 @@ DEFSMETHOD(ScriptManagerGroup_ScriptsForURL)
  6219. }
  6220. }
  6221.  
  6222. - return (ULONG) matchingscripts;
  6223. + return (IPTR) matchingscripts;
  6224. }
  6225.  
  6226. BEGINMTABLE
  6227. diff --git a/Source/WebKit/mui/Api/MorphOS/scriptmanagerhostlistclass.cpp b/Source/WebKit/mui/Api/MorphOS/scriptmanagerhostlistclass.cpp
  6228. index 6cb4615c..f16ec517 100644
  6229. --- a/Source/WebKit/mui/Api/MorphOS/scriptmanagerhostlistclass.cpp
  6230. +++ b/Source/WebKit/mui/Api/MorphOS/scriptmanagerhostlistclass.cpp
  6231. @@ -65,7 +65,7 @@ DEFDISP
  6232.  
  6233. DEFMMETHOD(List_Construct)
  6234. {
  6235. - return (ULONG)msg->entry;
  6236. + return (IPTR)msg->entry;
  6237. }
  6238.  
  6239. DEFMMETHOD(List_Destruct)
  6240. diff --git a/Source/WebKit/mui/Api/MorphOS/scriptmanagerlistclass.cpp b/Source/WebKit/mui/Api/MorphOS/scriptmanagerlistclass.cpp
  6241. index 3ec6578e..dd27b576 100644
  6242. --- a/Source/WebKit/mui/Api/MorphOS/scriptmanagerlistclass.cpp
  6243. +++ b/Source/WebKit/mui/Api/MorphOS/scriptmanagerlistclass.cpp
  6244. @@ -67,7 +67,7 @@ DEFDISP
  6245.  
  6246. DEFMMETHOD(List_Construct)
  6247. {
  6248. - return (ULONG)msg->entry;
  6249. + return (IPTR)msg->entry;
  6250. }
  6251.  
  6252. DEFMMETHOD(List_Destruct)
  6253. diff --git a/Source/WebKit/mui/Api/MorphOS/scriptmanagerwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/scriptmanagerwindowclass.cpp
  6254. index 8bd1437d..2163d375 100644
  6255. --- a/Source/WebKit/mui/Api/MorphOS/scriptmanagerwindowclass.cpp
  6256. +++ b/Source/WebKit/mui/Api/MorphOS/scriptmanagerwindowclass.cpp
  6257. @@ -73,7 +73,7 @@ DEFGET
  6258. {
  6259. case MA_OWB_WindowType:
  6260. {
  6261. - *msg->opg_Storage = (ULONG) MV_OWB_Window_ScriptManager;
  6262. + *msg->opg_Storage = (IPTR) MV_OWB_Window_ScriptManager;
  6263. }
  6264. return TRUE;
  6265. }
  6266. diff --git a/Source/WebKit/mui/Api/MorphOS/searchbargroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/searchbargroupclass.cpp
  6267. index 45927c9a..d647882d 100755
  6268. --- a/Source/WebKit/mui/Api/MorphOS/searchbargroupclass.cpp
  6269. +++ b/Source/WebKit/mui/Api/MorphOS/searchbargroupclass.cpp
  6270. @@ -140,7 +140,7 @@ DEFNEW
  6271.  
  6272. if(labels == NULL)
  6273. {
  6274. - return NULL;
  6275. + return (IPTR)NULL;
  6276. }
  6277.  
  6278. obj = (Object *) DoSuperNew(cl, obj,
  6279. @@ -170,7 +170,7 @@ DEFNEW
  6280. DoMethod((Object *) getv(pop_search, MUIA_Popstring_String), MUIM_Notify, MUIA_String_Acknowledge, MUIV_EveryTime, obj, 3, MM_OWBWindow_LoadURL, NULL, NULL);
  6281. }
  6282.  
  6283. - return (ULONG)obj;
  6284. + return (IPTR)obj;
  6285. }
  6286.  
  6287. DEFDISP
  6288. @@ -236,7 +236,7 @@ DEFGET
  6289. switch (msg->opg_AttrID)
  6290. {
  6291. case MUIA_String_Contents:
  6292. - return GetAttr(MUIA_String_Contents, data->pop_search, (ULONGPTR)msg->opg_Storage);
  6293. + return GetAttr(MUIA_String_Contents, data->pop_search, (IPTR *)msg->opg_Storage);
  6294.  
  6295. case MA_SearchBarGroup_SearchButton:
  6296. *msg->opg_Storage = data->bt_search != NULL;
  6297. diff --git a/Source/WebKit/mui/Api/MorphOS/searchmanagergroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/searchmanagergroupclass.cpp
  6298. index e8be272b..fceb7c10 100644
  6299. --- a/Source/WebKit/mui/Api/MorphOS/searchmanagergroupclass.cpp
  6300. +++ b/Source/WebKit/mui/Api/MorphOS/searchmanagergroupclass.cpp
  6301. @@ -239,7 +239,7 @@ DEFNEW
  6302. DoMethod(st_shortcut, MUIM_Notify, MUIA_String_Contents, MUIV_EveryTime, obj, 1, MM_SearchManagerGroup_Change);
  6303. }
  6304.  
  6305. - return ((ULONG)obj);
  6306. + return ((IPTR)obj);
  6307. }
  6308.  
  6309. DEFDISP
  6310. @@ -295,7 +295,7 @@ DEFGET
  6311. }
  6312. }
  6313.  
  6314. - *msg->opg_Storage = (ULONG)&data->labels;
  6315. + *msg->opg_Storage = (IPTR)&data->labels;
  6316. return TRUE;
  6317. }
  6318.  
  6319. @@ -329,7 +329,7 @@ DEFGET
  6320. }
  6321. }
  6322.  
  6323. - *msg->opg_Storage = (ULONG)&data->requests;
  6324. + *msg->opg_Storage = (IPTR)&data->requests;
  6325. return TRUE;
  6326. }
  6327.  
  6328. @@ -363,7 +363,7 @@ DEFGET
  6329. }
  6330. }
  6331.  
  6332. - *msg->opg_Storage = (ULONG)&data->shortcuts;
  6333. + *msg->opg_Storage = (IPTR)&data->shortcuts;
  6334. return TRUE;
  6335. }
  6336. }
  6337. diff --git a/Source/WebKit/mui/Api/MorphOS/searchmanagerlistclass.cpp b/Source/WebKit/mui/Api/MorphOS/searchmanagerlistclass.cpp
  6338. index c5493b54..27f0e37e 100644
  6339. --- a/Source/WebKit/mui/Api/MorphOS/searchmanagerlistclass.cpp
  6340. +++ b/Source/WebKit/mui/Api/MorphOS/searchmanagerlistclass.cpp
  6341. @@ -54,7 +54,7 @@ DEFNEW
  6342. TAG_MORE, INITTAGS
  6343. );
  6344.  
  6345. - return ((ULONG)obj);
  6346. + return ((IPTR)obj);
  6347. }
  6348.  
  6349. DEFDISP
  6350. @@ -65,7 +65,7 @@ DEFDISP
  6351. DEFMMETHOD(List_Construct)
  6352. {
  6353. // Built by caller
  6354. - return (ULONG)msg->entry;
  6355. + return (IPTR)msg->entry;
  6356. }
  6357.  
  6358. DEFMMETHOD(List_Destruct)
  6359. diff --git a/Source/WebKit/mui/Api/MorphOS/searchmanagerwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/searchmanagerwindowclass.cpp
  6360. index b2e4ba30..d385fa8a 100644
  6361. --- a/Source/WebKit/mui/Api/MorphOS/searchmanagerwindowclass.cpp
  6362. +++ b/Source/WebKit/mui/Api/MorphOS/searchmanagerwindowclass.cpp
  6363. @@ -75,13 +75,13 @@ DEFGET
  6364. {
  6365. case MA_OWB_WindowType:
  6366. {
  6367. - *msg->opg_Storage = (ULONG) MV_OWB_Window_SearchManager;
  6368. + *msg->opg_Storage = (IPTR) MV_OWB_Window_SearchManager;
  6369. }
  6370. return TRUE;
  6371.  
  6372. case MA_SearchManagerWindow_Group:
  6373. {
  6374. - *msg->opg_Storage = (ULONG) data->group;
  6375. + *msg->opg_Storage = (IPTR) data->group;
  6376. }
  6377. return TRUE;
  6378. }
  6379. diff --git a/Source/WebKit/mui/Api/MorphOS/seeksliderclass.cpp b/Source/WebKit/mui/Api/MorphOS/seeksliderclass.cpp
  6380. index 6b93d6a4..2a0cb54e 100644
  6381. --- a/Source/WebKit/mui/Api/MorphOS/seeksliderclass.cpp
  6382. +++ b/Source/WebKit/mui/Api/MorphOS/seeksliderclass.cpp
  6383. @@ -25,7 +25,7 @@ DEFNEW
  6384. TAG_MORE, INITTAGS,
  6385. End;
  6386.  
  6387. - return (ULONG)obj;
  6388. + return (IPTR)obj;
  6389. }
  6390.  
  6391. DEFMMETHOD(Setup)
  6392. @@ -42,7 +42,7 @@ DEFMMETHOD(Setup)
  6393. data->ehnode.ehn_Events = IDCMP_RAWKEY;
  6394. data->ehnode.ehn_Priority = 3;
  6395. data->ehnode.ehn_Flags = MUI_EHF_GUIMODE;
  6396. - DoMethod(_win(obj), MUIM_Window_AddEventHandler, (ULONG)&data->ehnode);
  6397. + DoMethod(_win(obj), MUIM_Window_AddEventHandler, (IPTR)&data->ehnode);
  6398.  
  6399. return TRUE;
  6400. }
  6401. @@ -51,7 +51,7 @@ DEFMMETHOD(Cleanup)
  6402. {
  6403. GETDATA;
  6404.  
  6405. - DoMethod(_win(obj), MUIM_Window_RemEventHandler, (ULONG)&data->ehnode);
  6406. + DoMethod(_win(obj), MUIM_Window_RemEventHandler, (IPTR)&data->ehnode);
  6407.  
  6408. return DOSUPER;
  6409. }
  6410. @@ -69,7 +69,7 @@ DEFMMETHOD(Numeric_Stringify)
  6411.  
  6412. snprintf(data->buffer, sizeof(data->buffer), "%02d:%02d:%02d", h, m, s);
  6413.  
  6414. - return ((ULONG)data->buffer);
  6415. + return ((IPTR)data->buffer);
  6416. }
  6417.  
  6418. DEFMMETHOD(AskMinMax)
  6419. diff --git a/Source/WebKit/mui/Api/MorphOS/spacerclass.cpp b/Source/WebKit/mui/Api/MorphOS/spacerclass.cpp
  6420. index 4b842727..7d4adc06 100644
  6421. --- a/Source/WebKit/mui/Api/MorphOS/spacerclass.cpp
  6422. +++ b/Source/WebKit/mui/Api/MorphOS/spacerclass.cpp
  6423. @@ -50,7 +50,7 @@ DEFNEW
  6424. data->brightness_threshold = 255;
  6425. }
  6426.  
  6427. - return ((ULONG)obj);
  6428. + return ((IPTR)obj);
  6429. }
  6430.  
  6431. #define SPACE_WIDTH 10
  6432. diff --git a/Source/WebKit/mui/Api/MorphOS/splashwindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/splashwindowclass.cpp
  6433. index d27bd790..5b854b19 100755
  6434. --- a/Source/WebKit/mui/Api/MorphOS/splashwindowclass.cpp
  6435. +++ b/Source/WebKit/mui/Api/MorphOS/splashwindowclass.cpp
  6436. @@ -56,7 +56,7 @@ extern "C"
  6437.  
  6438. /* Methods */
  6439. #define MUIM_Process_Launch 0x80425df7 /* V20 */
  6440. -struct MUIP_Process_Launch { ULONG MethodID; };
  6441. +struct MUIP_Process_Launch { STACKED ULONG MethodID; };
  6442.  
  6443. /* Attributes */
  6444. #define MUIA_Process_AutoLaunch 0x80428855 /* V20 i.. ULONG */
  6445. @@ -235,6 +235,9 @@ DEFNEW
  6446. MUIA_Process_SourceClass , cl,
  6447. MUIA_Process_SourceObject, obj,
  6448. MUIA_Process_Name , "[OWB] FontConfig Cache",
  6449. +#if defined(__AROS__)
  6450. + MUIA_Process_StackSize, (10 * AROS_STACKSIZE),
  6451. +#endif
  6452. MUIA_Process_Priority , 0,
  6453. MUIA_Process_AutoLaunch , FALSE,
  6454. TAG_DONE);
  6455. diff --git a/Source/WebKit/mui/Api/MorphOS/suggestlistclass.cpp b/Source/WebKit/mui/Api/MorphOS/suggestlistclass.cpp
  6456. index cb6cb9fd..73d841ec 100755
  6457. --- a/Source/WebKit/mui/Api/MorphOS/suggestlistclass.cpp
  6458. +++ b/Source/WebKit/mui/Api/MorphOS/suggestlistclass.cpp
  6459. @@ -88,7 +88,7 @@ DEFNEW
  6460.  
  6461. doset(obj, data, msg->ops_AttrList);
  6462. }
  6463. - return ((ULONG)obj);
  6464. + return ((IPTR)obj);
  6465. }
  6466.  
  6467. DEFDISP
  6468. @@ -103,7 +103,7 @@ DEFGET
  6469. switch (msg->opg_AttrID)
  6470. {
  6471. case MA_SuggestList_Opened:
  6472. - *msg->opg_Storage = (ULONG) data->opened;
  6473. + *msg->opg_Storage = (IPTR) data->opened;
  6474. return TRUE;
  6475. }
  6476.  
  6477. @@ -182,7 +182,7 @@ DEFMMETHOD(HandleEvent)
  6478.  
  6479. DEFMMETHOD(List_Construct)
  6480. {
  6481. - return (ULONG) msg->entry;
  6482. + return (IPTR) msg->entry;
  6483. }
  6484.  
  6485. DEFMMETHOD(List_Destruct)
  6486. diff --git a/Source/WebKit/mui/Api/MorphOS/suggestpopstringclass.cpp b/Source/WebKit/mui/Api/MorphOS/suggestpopstringclass.cpp
  6487. index 62de3ec1..a38c139a 100755
  6488. --- a/Source/WebKit/mui/Api/MorphOS/suggestpopstringclass.cpp
  6489. +++ b/Source/WebKit/mui/Api/MorphOS/suggestpopstringclass.cpp
  6490. @@ -330,16 +330,16 @@ DEFGET
  6491. return TRUE;
  6492.  
  6493. case MUIA_Popobject_Object:
  6494. - *msg->opg_Storage = (ULONG) data->lv_entries;
  6495. + *msg->opg_Storage = (IPTR) data->lv_entries;
  6496. return TRUE;
  6497.  
  6498. case MUIA_Popstring_String:
  6499. - *msg->opg_Storage = (ULONG) data->str;
  6500. + *msg->opg_Storage = (IPTR) data->str;
  6501. return TRUE;
  6502.  
  6503. case MA_OWB_URL:
  6504. case MUIA_String_Contents:
  6505. - return GetAttr(MUIA_String_Contents, data->str, (ULONGPTR)msg->opg_Storage);
  6506. + return GetAttr(MUIA_String_Contents, data->str, (IPTR *)msg->opg_Storage);
  6507. }
  6508.  
  6509. return DOSUPER;
  6510. diff --git a/Source/WebKit/mui/Api/MorphOS/tabtransferanimclass.cpp b/Source/WebKit/mui/Api/MorphOS/tabtransferanimclass.cpp
  6511. index 9cfa64a6..83c822e7 100755
  6512. --- a/Source/WebKit/mui/Api/MorphOS/tabtransferanimclass.cpp
  6513. +++ b/Source/WebKit/mui/Api/MorphOS/tabtransferanimclass.cpp
  6514. @@ -65,7 +65,7 @@ STATIC VOID doset(struct Data *data, APTR obj, struct TagItem *taglist)
  6515.  
  6516. while ((tag = NextTagItem(&tstate)) != NULL)
  6517. {
  6518. - ULONG tag_data = tag->ti_Data;
  6519. + IPTR tag_data = tag->ti_Data;
  6520.  
  6521. switch (tag->ti_Tag)
  6522. {
  6523. @@ -78,7 +78,7 @@ STATIC VOID doset(struct Data *data, APTR obj, struct TagItem *taglist)
  6524.  
  6525. if (data->is_shown && !data->added)
  6526. {
  6527. - DoMethod(_app(obj), MUIM_Application_AddInputHandler, (ULONG)&data->ihnode);
  6528. + DoMethod(_app(obj), MUIM_Application_AddInputHandler, (IPTR)&data->ihnode);
  6529. data->added = TRUE;
  6530. }
  6531. }
  6532. @@ -89,7 +89,7 @@ STATIC VOID doset(struct Data *data, APTR obj, struct TagItem *taglist)
  6533.  
  6534. if (data->is_shown && data->added)
  6535. {
  6536. - DoMethod(_app(obj), MUIM_Application_RemInputHandler, (ULONG)&data->ihnode);
  6537. + DoMethod(_app(obj), MUIM_Application_RemInputHandler, (IPTR)&data->ihnode);
  6538. data->added = FALSE;
  6539. }
  6540.  
  6541. diff --git a/Source/WebKit/mui/Api/MorphOS/titleclass.cpp b/Source/WebKit/mui/Api/MorphOS/titleclass.cpp
  6542. index bc73ce36..92f43f4e 100755
  6543. --- a/Source/WebKit/mui/Api/MorphOS/titleclass.cpp
  6544. +++ b/Source/WebKit/mui/Api/MorphOS/titleclass.cpp
  6545. @@ -71,7 +71,7 @@ DEFNEW
  6546. data->added = FALSE;
  6547. }
  6548.  
  6549. - return ((ULONG)obj);
  6550. + return ((IPTR)obj);
  6551. }
  6552.  
  6553. DEFMMETHOD(Hide)
  6554. @@ -189,9 +189,9 @@ DEFMMETHOD(DragQuery)
  6555.  
  6556. if (obj != msg->obj && (type == MV_OWB_ObjectType_Tab) /*&& _win(obj) == _win(msg->obj)*/)
  6557. {
  6558. - ULONG value = 0;
  6559. + IPTR value = 0;
  6560.  
  6561. - if(GetAttr(MUIA_Title_Sortable, obj, (ULONGPTR) &value))
  6562. + if(GetAttr(MUIA_Title_Sortable, obj, (IPTR *) &value))
  6563. {
  6564. return (MUIV_DragQuery_Accept);
  6565. }
  6566. @@ -223,7 +223,7 @@ DEFMMETHOD(Title_New)
  6567. }
  6568. DEFMMETHOD(Title_CreateNewButton)
  6569. {
  6570. - return (ULONG) NewObject(gettoolbutton_newtabclass(), NULL, TAG_DONE);
  6571. + return (IPTR) NewObject(gettoolbutton_newtabclass(), NULL, TAG_DONE);
  6572. }
  6573.  
  6574. #endif
  6575. diff --git a/Source/WebKit/mui/Api/MorphOS/titlelabelclass.cpp b/Source/WebKit/mui/Api/MorphOS/titlelabelclass.cpp
  6576. index 5d8fea57..ee035e68 100755
  6577. --- a/Source/WebKit/mui/Api/MorphOS/titlelabelclass.cpp
  6578. +++ b/Source/WebKit/mui/Api/MorphOS/titlelabelclass.cpp
  6579. @@ -141,7 +141,7 @@ DEFNEW
  6580. DoMethod(favicon, MUIM_Notify, MA_FavIcon_NeedRedraw, MUIV_EveryTime, obj, 1, MM_Title_Redraw);
  6581. }
  6582. }
  6583. - return ((ULONG)obj);
  6584. + return ((IPTR)obj);
  6585. }
  6586.  
  6587. DEFDISP
  6588. @@ -174,21 +174,21 @@ DEFGET
  6589. case MA_OWB_URL:
  6590. {
  6591. Object *browser = (Object *) muiUserData(obj);
  6592. - *msg->opg_Storage = (ULONG) getv(browser, MA_OWBBrowser_URL);
  6593. + *msg->opg_Storage = (IPTR) getv(browser, MA_OWBBrowser_URL);
  6594. }
  6595. return TRUE;
  6596.  
  6597. case MA_OWB_Title:
  6598. {
  6599. Object *browser = (Object *) muiUserData(obj);
  6600. - *msg->opg_Storage = (ULONG) getv(browser, MA_OWBBrowser_Title);
  6601. + *msg->opg_Storage = (IPTR) getv(browser, MA_OWBBrowser_Title);
  6602. }
  6603. return TRUE;
  6604.  
  6605. case MA_OWB_Browser:
  6606. {
  6607. Object *browser = (Object *) muiUserData(obj);
  6608. - *msg->opg_Storage = (ULONG) browser;
  6609. + *msg->opg_Storage = (IPTR) browser;
  6610. }
  6611. return TRUE;
  6612. }
  6613. @@ -260,13 +260,13 @@ DEFMMETHOD(ContextMenuBuild)
  6614. End,
  6615. End;
  6616.  
  6617. - return (ULONG)data->cmenu;
  6618. + return (IPTR)data->cmenu;
  6619. }
  6620.  
  6621. DEFMMETHOD(ContextMenuChoice)
  6622. {
  6623. Object *browser = (Object *) muiUserData(obj);
  6624. - ULONG udata = muiUserData(msg->item);
  6625. + IPTR udata = muiUserData(msg->item);
  6626.  
  6627. switch(udata)
  6628. {
  6629. @@ -334,9 +334,9 @@ DEFMMETHOD(DragQuery)
  6630. // Sortable tabs handling
  6631. if(type == MV_OWB_ObjectType_Tab)
  6632. {
  6633. - ULONG value = 0;
  6634. + IPTR value = 0;
  6635.  
  6636. - if(GetAttr(MUIA_Title_Sortable, _parent(msg->obj), (ULONGPTR) &value))
  6637. + if(GetAttr(MUIA_Title_Sortable, _parent(msg->obj), (IPTR *) &value))
  6638. {
  6639. if(value)
  6640. {
  6641. diff --git a/Source/WebKit/mui/Api/MorphOS/toolbutton_addbookmarkclass.cpp b/Source/WebKit/mui/Api/MorphOS/toolbutton_addbookmarkclass.cpp
  6642. index ec01c075..3f104e38 100755
  6643. --- a/Source/WebKit/mui/Api/MorphOS/toolbutton_addbookmarkclass.cpp
  6644. +++ b/Source/WebKit/mui/Api/MorphOS/toolbutton_addbookmarkclass.cpp
  6645. @@ -44,7 +44,7 @@ static void doset(Object * obj, struct Data *data, struct TagItem *tags)
  6646. {
  6647. case MA_ToolButton_AddBookmark_IsBookmark:
  6648. {
  6649. - ULONG isbookmark = tag->ti_Data;
  6650. + IPTR isbookmark = tag->ti_Data;
  6651. set(obj, MA_ToolButton_Image, isbookmark ? "PROGDIR:resource/addbookmark_added.png" : "PROGDIR:resource/addbookmark_notadded.png");
  6652. }
  6653. break;
  6654. @@ -69,7 +69,7 @@ DEFNEW
  6655. TAG_MORE, INITTAGS,
  6656. TAG_DONE);
  6657.  
  6658. - return (ULONG)obj;
  6659. + return (IPTR)obj;
  6660. }
  6661.  
  6662. DEFSET
  6663. diff --git a/Source/WebKit/mui/Api/MorphOS/toolbutton_bookmarksclass.cpp b/Source/WebKit/mui/Api/MorphOS/toolbutton_bookmarksclass.cpp
  6664. index 9f33b320..f7cd7f83 100644
  6665. --- a/Source/WebKit/mui/Api/MorphOS/toolbutton_bookmarksclass.cpp
  6666. +++ b/Source/WebKit/mui/Api/MorphOS/toolbutton_bookmarksclass.cpp
  6667. @@ -54,7 +54,7 @@ DEFNEW
  6668. TAG_MORE, INITTAGS,
  6669. TAG_DONE);
  6670.  
  6671. - return (ULONG)obj;
  6672. + return (IPTR)obj;
  6673. }
  6674.  
  6675. BEGINMTABLE
  6676. diff --git a/Source/WebKit/mui/Api/MorphOS/toolbutton_newtabclass.cpp b/Source/WebKit/mui/Api/MorphOS/toolbutton_newtabclass.cpp
  6677. index f1cf4f01..00ea4c24 100755
  6678. --- a/Source/WebKit/mui/Api/MorphOS/toolbutton_newtabclass.cpp
  6679. +++ b/Source/WebKit/mui/Api/MorphOS/toolbutton_newtabclass.cpp
  6680. @@ -48,7 +48,7 @@ DEFNEW
  6681. TAG_MORE, INITTAGS,
  6682. TAG_DONE);
  6683.  
  6684. - return (ULONG)obj;
  6685. + return (IPTR)obj;
  6686. }
  6687.  
  6688. DEFMMETHOD(DragQuery)
  6689. diff --git a/Source/WebKit/mui/Api/MorphOS/toolbuttonclass.cpp b/Source/WebKit/mui/Api/MorphOS/toolbuttonclass.cpp
  6690. index cd782079..8adae902 100755
  6691. --- a/Source/WebKit/mui/Api/MorphOS/toolbuttonclass.cpp
  6692. +++ b/Source/WebKit/mui/Api/MorphOS/toolbuttonclass.cpp
  6693. @@ -304,7 +304,7 @@ DEFNEW
  6694. switch(background)
  6695. {
  6696. case MV_ToolButton_Background_Parent:
  6697. - muibackground = (ULONG) "";
  6698. + muibackground = (IPTR) "";
  6699. break;
  6700.  
  6701. default:
  6702. @@ -333,7 +333,7 @@ DEFNEW
  6703.  
  6704. doset(obj, data, INITTAGS);
  6705.  
  6706. - return (ULONG)obj;
  6707. + return (IPTR)obj;
  6708. }
  6709.  
  6710. return(0);
  6711. diff --git a/Source/WebKit/mui/Api/MorphOS/transferanimclass.cpp b/Source/WebKit/mui/Api/MorphOS/transferanimclass.cpp
  6712. index 53f04b07..22d354d6 100755
  6713. --- a/Source/WebKit/mui/Api/MorphOS/transferanimclass.cpp
  6714. +++ b/Source/WebKit/mui/Api/MorphOS/transferanimclass.cpp
  6715. @@ -65,7 +65,7 @@ STATIC VOID doset(struct Data *data, APTR obj, struct TagItem *taglist)
  6716.  
  6717. while ((tag = NextTagItem(&tstate)) != NULL)
  6718. {
  6719. - ULONG tag_data = tag->ti_Data;
  6720. + IPTR tag_data = tag->ti_Data;
  6721.  
  6722. switch (tag->ti_Tag)
  6723. {
  6724. @@ -76,7 +76,7 @@ STATIC VOID doset(struct Data *data, APTR obj, struct TagItem *taglist)
  6725.  
  6726. if (data->is_shown && !data->added)
  6727. {
  6728. - DoMethod(_app(obj), MUIM_Application_AddInputHandler, (ULONG)&data->ihnode);
  6729. + DoMethod(_app(obj), MUIM_Application_AddInputHandler, (IPTR)&data->ihnode);
  6730. data->added = TRUE;
  6731. }
  6732.  
  6733. @@ -87,7 +87,7 @@ STATIC VOID doset(struct Data *data, APTR obj, struct TagItem *taglist)
  6734.  
  6735. if (data->is_shown && data->added)
  6736. {
  6737. - DoMethod(_app(obj), MUIM_Application_RemInputHandler, (ULONG)&data->ihnode);
  6738. + DoMethod(_app(obj), MUIM_Application_RemInputHandler, (IPTR)&data->ihnode);
  6739. data->added = FALSE;
  6740. }
  6741.  
  6742. diff --git a/Source/WebKit/mui/Api/MorphOS/urlprefsgroupclass.cpp b/Source/WebKit/mui/Api/MorphOS/urlprefsgroupclass.cpp
  6743. index 98a046b7..79344cbe 100644
  6744. --- a/Source/WebKit/mui/Api/MorphOS/urlprefsgroupclass.cpp
  6745. +++ b/Source/WebKit/mui/Api/MorphOS/urlprefsgroupclass.cpp
  6746. @@ -45,7 +45,7 @@
  6747. #include "utils.h"
  6748.  
  6749. #ifndef get
  6750. -#define get(obj,attr,store) GetAttr(attr,obj,(ULONG *)store)
  6751. +#define get(obj,attr,store) GetAttr(attr,obj,(IPTR *)store)
  6752. #endif
  6753.  
  6754. extern CONST_STRPTR * get_user_agent_strings();
  6755. @@ -105,7 +105,7 @@ static void cycles_init(void)
  6756. STRPTR *current = (STRPTR *)*ptr;
  6757. while(*current)
  6758. {
  6759. - *current = (STRPTR)GSI((ULONG)*current);
  6760. + *current = (STRPTR)GSI((IPTR)*current);
  6761. current++;
  6762. }
  6763. ptr++;
  6764. @@ -577,11 +577,11 @@ DEFSMETHOD(URLPrefsGroup_UserAgentForURL)
  6765.  
  6766. if(re.match(msg->url) >=0)
  6767. {
  6768. - return (ULONG) get_user_agent_strings()[un->settings.useragent];
  6769. + return (IPTR) get_user_agent_strings()[un->settings.useragent];
  6770. }
  6771. }
  6772.  
  6773. - return NULL;
  6774. + return (IPTR)NULL;
  6775. }
  6776.  
  6777. DEFSMETHOD(URLPrefsGroup_CookiePolicyForURLAndName)
  6778. @@ -627,7 +627,7 @@ DEFSMETHOD(URLPrefsGroup_CookiePolicyForURLAndName)
  6779. }
  6780. }
  6781.  
  6782. - return (ULONG) policy;
  6783. + return (IPTR) policy;
  6784. }
  6785.  
  6786. BEGINMTABLE
  6787. diff --git a/Source/WebKit/mui/Api/MorphOS/urlprefslistclass.cpp b/Source/WebKit/mui/Api/MorphOS/urlprefslistclass.cpp
  6788. index 1a1ba2c5..c0f9acdd 100644
  6789. --- a/Source/WebKit/mui/Api/MorphOS/urlprefslistclass.cpp
  6790. +++ b/Source/WebKit/mui/Api/MorphOS/urlprefslistclass.cpp
  6791. @@ -57,12 +57,12 @@ DEFNEW
  6792. TAG_MORE, INITTAGS
  6793. );
  6794.  
  6795. - return ((ULONG)obj);
  6796. + return ((IPTR)obj);
  6797. }
  6798.  
  6799. DEFMMETHOD(List_Construct)
  6800. {
  6801. - return (ULONG)msg->entry;
  6802. + return (IPTR)msg->entry;
  6803. }
  6804.  
  6805. DEFMMETHOD(List_Destruct)
  6806. diff --git a/Source/WebKit/mui/Api/MorphOS/urlprefswindowclass.cpp b/Source/WebKit/mui/Api/MorphOS/urlprefswindowclass.cpp
  6807. index 677cc0df..c7421991 100644
  6808. --- a/Source/WebKit/mui/Api/MorphOS/urlprefswindowclass.cpp
  6809. +++ b/Source/WebKit/mui/Api/MorphOS/urlprefswindowclass.cpp
  6810. @@ -72,7 +72,7 @@ DEFGET
  6811. {
  6812. case MA_OWB_WindowType:
  6813. {
  6814. - *msg->opg_Storage = (ULONG) MV_OWB_Window_URLPrefs;
  6815. + *msg->opg_Storage = (IPTR) MV_OWB_Window_URLPrefs;
  6816. }
  6817. return TRUE;
  6818. }
  6819. diff --git a/Source/WebKit/mui/Api/MorphOS/urlstringclass.cpp b/Source/WebKit/mui/Api/MorphOS/urlstringclass.cpp
  6820. index 6c74729d..4aa3e7ad 100755
  6821. --- a/Source/WebKit/mui/Api/MorphOS/urlstringclass.cpp
  6822. +++ b/Source/WebKit/mui/Api/MorphOS/urlstringclass.cpp
  6823. @@ -63,8 +63,9 @@ DEFNEW
  6824. TAG_MORE, INITTAGS,
  6825. TAG_DONE);
  6826.  
  6827. - return (ULONG)obj;
  6828. + return (IPTR)obj;
  6829. }
  6830. +
  6831. /*
  6832. DEFMMETHOD(Hide)
  6833. {
  6834. diff --git a/Source/WebKit/mui/Api/MorphOS/volumesliderclass.cpp b/Source/WebKit/mui/Api/MorphOS/volumesliderclass.cpp
  6835. index 8e143807..d99a5338 100644
  6836. --- a/Source/WebKit/mui/Api/MorphOS/volumesliderclass.cpp
  6837. +++ b/Source/WebKit/mui/Api/MorphOS/volumesliderclass.cpp
  6838. @@ -24,7 +24,7 @@ DEFNEW
  6839. TAG_MORE, INITTAGS,
  6840. End;
  6841.  
  6842. - return (ULONG)obj;
  6843. + return (IPTR)obj;
  6844. }
  6845.  
  6846. DEFMMETHOD(Numeric_Stringify)
  6847. @@ -33,7 +33,7 @@ DEFMMETHOD(Numeric_Stringify)
  6848.  
  6849. snprintf(data->buffer, sizeof(data->buffer), " ");
  6850.  
  6851. - return ((ULONG)data->buffer);
  6852. + return ((IPTR)data->buffer);
  6853. }
  6854.  
  6855. DEFMMETHOD(AskMinMax)
  6856. diff --git a/Source/cmake/AROS.cmake b/Source/cmake/AROS.cmake
  6857. deleted file mode 100644
  6858. index bc9f4228..00000000
  6859. --- a/Source/cmake/AROS.cmake
  6860. +++ /dev/null
  6861. @@ -1,26 +0,0 @@
  6862. -# this one is important
  6863. -SET(CMAKE_SYSTEM_NAME Generic)
  6864. -#this one not so much
  6865. -SET(CMAKE_SYSTEM_VERSION 1)
  6866. -
  6867. -# specify the cross compiler
  6868. -SET(CMAKE_C_COMPILER i386-aros-gcc)
  6869. -SET(CMAKE_CXX_COMPILER i386-aros-g++)
  6870. -
  6871. -# options
  6872. -SET(CMAKE_CXX_FLAGS "")
  6873. -SET(CMAKE_CXX_FLAGS_DEBUG "-g -gdwarf-3")
  6874. -
  6875. -SET(CMAKE_C_FLAGS "")
  6876. -SET(CMAKE_C_FLAGS_DEBUG "-g -gdwarf-3")
  6877. -
  6878. -SET(CMAKE_MODULE_LINKER_FLAGS "")
  6879. -
  6880. -# where is the target environment
  6881. -SET(CMAKE_FIND_ROOT_PATH "")
  6882. -
  6883. -# search for programs in the build host directories
  6884. -SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
  6885. -# for libraries and headers in the target directories
  6886. -SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
  6887. -SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
  6888. diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake
  6889. index 613d9113..0ce04318 100644
  6890. --- a/Source/cmake/WebKitHelpers.cmake
  6891. +++ b/Source/cmake/WebKitHelpers.cmake
  6892. @@ -10,18 +10,18 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
  6893. set(OLD_COMPILE_FLAGS "")
  6894. endif ()
  6895.  
  6896. -# get_target_property(TARGET_TYPE ${_target} TYPE)
  6897. -# if (${TARGET_TYPE} STREQUAL "STATIC_LIBRARY") # -fPIC is automatically added to shared libraries
  6898. -# set(OLD_COMPILE_FLAGS "-fPIC ${OLD_COMPILE_FLAGS}")
  6899. -# endif ()
  6900. + if (NOT AROS)
  6901. + get_target_property(TARGET_TYPE ${_target} TYPE)
  6902. + if (${TARGET_TYPE} STREQUAL "STATIC_LIBRARY") # -fPIC is automatically added to shared libraries
  6903. + set(OLD_COMPILE_FLAGS "-fPIC ${OLD_COMPILE_FLAGS}")
  6904. + endif ()
  6905. + endif ()
  6906.  
  6907. # Suppress -Wparentheses-equality warning of Clang
  6908. if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
  6909. set(OLD_COMPILE_FLAGS "-Wno-parentheses-equality ${OLD_COMPILE_FLAGS}")
  6910. endif ()
  6911.  
  6912. - set(OLD_COMPILE_FLAGS "-march=i686 ${OLD_COMPILE_FLAGS}")
  6913. -
  6914. # Enable warnings by default
  6915. if (NOT ${OPTION_IGNORECXX_WARNINGS})
  6916. set(OLD_COMPILE_FLAGS "-Wall -Wextra -Wcast-align -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wundef -Wwrite-strings ${OLD_COMPILE_FLAGS}")
  6917. diff --git a/Tools/OdysseyWebBrowser/CMakeLists.txt b/Tools/OdysseyWebBrowser/CMakeLists.txt
  6918. index 03afcffb..8cbc73a7 100644
  6919. --- a/Tools/OdysseyWebBrowser/CMakeLists.txt
  6920. +++ b/Tools/OdysseyWebBrowser/CMakeLists.txt
  6921. @@ -10,16 +10,15 @@ set(OdysseyWebBrowser_INCLUDE_DIRECTORIES
  6922. )
  6923.  
  6924. set(OdysseyWebBrowser_LIBRARIES
  6925. - JavaScriptCore
  6926. - WebCore
  6927. WebKit
  6928. - -lz
  6929. + WebCore
  6930. + JavaScriptCore
  6931. -lcairo
  6932. -lpixman
  6933. + -lz
  6934. -lfontconfig
  6935. -lfreetype2
  6936. -lxml2
  6937. - -lz
  6938. -lcurl
  6939. -ljpeg
  6940. -lpng
  6941. @@ -37,7 +36,6 @@ set(OdysseyWebBrowser_LIBRARIES
  6942. -lbz2
  6943. -lavcodec
  6944. -liconv
  6945. - -lz
  6946. -lavutil
  6947. -lswresample
  6948. -lswscale
  6949. @@ -45,4 +43,4 @@ set(OdysseyWebBrowser_LIBRARIES
  6950.  
  6951. include_directories(${OdysseyWebBrowser_INCLUDE_DIRECTORIES})
  6952. add_executable(owb ${OdysseyWebBrowser_SOURCES})
  6953. -target_link_libraries(owb ${OdysseyWebBrowser_LIBRARIES})
  6954. +target_link_libraries(owb -Wl,--start-group ${OdysseyWebBrowser_LIBRARIES} -Wl,--end-group)
  6955. diff --git a/Tools/OdysseyWebBrowser/main.cpp b/Tools/OdysseyWebBrowser/main.cpp
  6956. index eb27e74d..6a2675c0 100644
  6957. --- a/Tools/OdysseyWebBrowser/main.cpp
  6958. +++ b/Tools/OdysseyWebBrowser/main.cpp
  6959. @@ -306,7 +306,7 @@ Object *create_application(char *url)
  6960. if(classes_init())
  6961. {
  6962. methodstack_init();
  6963. - obj = (Object *) NewObject(getowbappclass(), NULL, MA_OWBBrowser_URL, (ULONG) url, TAG_DONE);
  6964. + obj = (Object *) NewObject(getowbappclass(), NULL, MA_OWBBrowser_URL, (IPTR) url, TAG_DONE);
  6965. }
  6966. else
  6967. {
  6968. diff --git a/cross-build/build_aros b/cross-build/build_aros
  6969. deleted file mode 100755
  6970. index 72641472..00000000
  6971. --- a/cross-build/build_aros
  6972. +++ /dev/null
  6973. @@ -1,14 +0,0 @@
  6974. -#!/bin/bash
  6975. -
  6976. -AROS_DEVELOPMENT=/ssd/deadwood/repo-gitorious-aros/abi-v0-on-trunk-pc-i386-4.8.3/bin/pc-i386/AROS/Development
  6977. -
  6978. -cmake \
  6979. - -DCMAKE_CROSSCOMPILING=ON \
  6980. - -DCMAKE_TOOLCHAIN_FILE=../Source/cmake/AROS.cmake \
  6981. - -DCMAKE_BUILD_TYPE=Release \
  6982. - -DPORT=MUI \
  6983. - -DCMAKE_SYSTEM_PROCESSOR=i386 \
  6984. - -DCAIRO_INCLUDE_DIRS=$AROS_DEVELOPMENT/include/cairo/ \
  6985. - -DFREETYPE_INCLUDE_DIRS=$AROS_DEVELOPMENT/include/freetype/ \
  6986. - -DLIBXML2_INCLUDE_DIR=$AROS_DEVELOPMENT/include/libxml2/ \
  6987. - ..
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!