From 865844ede7ffa096c83149657f7223ccda405c2e Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 5 Aug 2019 22:13:24 +0100 Subject: riscos: Try and fix up all the content changes Signed-off-by: Daniel Silverstone --- frontends/riscos/content-handlers/artworks.c | 21 ++++++++++++++------- frontends/riscos/content-handlers/draw.c | 3 ++- frontends/riscos/content-handlers/sprite.c | 6 ++++-- frontends/riscos/gui/url_bar.c | 10 ---------- frontends/riscos/sslcert.c | 1 + frontends/riscos/theme_install.c | 2 +- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/frontends/riscos/content-handlers/artworks.c b/frontends/riscos/content-handlers/artworks.c index fcae271ee..5bd34bfb7 100644 --- a/frontends/riscos/content-handlers/artworks.c +++ b/frontends/riscos/content-handlers/artworks.c @@ -184,7 +184,8 @@ bool artworks_convert(struct content *c) &used, NULL, NULL); if (used >= 0) { NSLOG(netsurf, INFO, "Alias$LoadArtWorksModules not defined"); - msg_data.error = messages_get("AWNotSeen"); + msg_data.errordata.errorcode = NSERROR_UNKNOWN; + msg_data.errordata.errormsg = messages_get("AWNotSeen"); content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } @@ -194,7 +195,8 @@ bool artworks_convert(struct content *c) if (error) { NSLOG(netsurf, INFO, "xos_cli: 0x%x: %s", error->errnum, error->errmess); - msg_data.error = error->errmess; + msg_data.errordata.errorcode = NSERROR_UNKNOWN; + msg_data.errordata.errormsg = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } @@ -205,7 +207,8 @@ bool artworks_convert(struct content *c) if (error) { NSLOG(netsurf, INFO, "AWRender_FileInitAddress: 0x%x: %s", error->errnum, error->errmess); - msg_data.error = error->errmess; + msg_data.errordata.errorcode = NSERROR_UNKNOWN; + msg_data.errordata.errorcode = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } @@ -216,7 +219,8 @@ bool artworks_convert(struct content *c) if (error) { NSLOG(netsurf, INFO, "AWRender_RenderAddress: 0x%x: %s", error->errnum, error->errmess); - msg_data.error = error->errmess; + msg_data.errordata.errorcode = NSERROR_UNKNOWN; + msg_data.errordata.errormsg = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } @@ -229,7 +233,8 @@ bool artworks_convert(struct content *c) if (error) { NSLOG(netsurf, INFO, "awrender_init: 0x%x : %s", error->errnum, error->errmess); - msg_data.error = error->errmess; + msg_data.errordata.errorcode = NSERROR_UNKNOWN; + msg_data.errordata.errormsg = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } @@ -245,7 +250,8 @@ bool artworks_convert(struct content *c) if (error) { NSLOG(netsurf, INFO, "AWRender_DocBounds: 0x%x: %s", error->errnum, error->errmess); - msg_data.error = error->errmess; + msg_data.errordata.errorcode = NSERROR_UNKNOWN; + msg_data.errordata.errormsg = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } @@ -261,7 +267,8 @@ bool artworks_convert(struct content *c) if (!aw->block) { NSLOG(netsurf, INFO, "failed to create block for ArtworksRenderer"); - msg_data.error = messages_get("NoMemory"); + msg_data.errordata.errorcode = NSERROR_NOMEM; + msg_data.errordata.errormsg = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } diff --git a/frontends/riscos/content-handlers/draw.c b/frontends/riscos/content-handlers/draw.c index a436ccee7..76eff8fc1 100644 --- a/frontends/riscos/content-handlers/draw.c +++ b/frontends/riscos/content-handlers/draw.c @@ -128,7 +128,8 @@ bool draw_convert(struct content *c) if (error) { NSLOG(netsurf, INFO, "xdrawfile_bbox: 0x%x: %s", error->errnum, error->errmess); - msg_data.error = error->errmess; + msg_data.errordata.errorcode = NSERROR_UNKNOWN; + msg_data.errordata.errorcode = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } diff --git a/frontends/riscos/content-handlers/sprite.c b/frontends/riscos/content-handlers/sprite.c index 650d8e9aa..704e5d6fe 100644 --- a/frontends/riscos/content-handlers/sprite.c +++ b/frontends/riscos/content-handlers/sprite.c @@ -126,7 +126,8 @@ bool sprite_convert(struct content *c) /* check for bad data */ if ((int)source_size + 4 != area->used) { - msg_data.error = messages_get("BadSprite"); + msg_data.errordata.errorcode = NSERROR_UNKNOWN; + msg_data.errordata.errormsg = messages_get("BadSprite"); content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } @@ -140,7 +141,8 @@ bool sprite_convert(struct content *c) "xosspriteop_read_sprite_info: 0x%x: %s", error->errnum, error->errmess); - msg_data.error = error->errmess; + msg_data.errordata.errorcode = NSERROR_UNKNOWN; + msg_data.errordata.errorcode = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c index 6fb3b2a2a..ee5c689df 100644 --- a/frontends/riscos/gui/url_bar.c +++ b/frontends/riscos/gui/url_bar.c @@ -1327,16 +1327,6 @@ static nserror ro_gui_url_bar_res_cb(hlcache_handle *handle, r->height = content_get_height(handle); break; - case CONTENT_MSG_QUERY: - /** \todo QUERY - Decide what is right here */ - /* For now, the only safe decision is to cancel the fetch */ - event->data.query_msg->cb(false, event->data.query_msg->cb_pw); - return NSERROR_OK; - - case CONTENT_MSG_QUERY_FINISHED: - /** \todo QUERY - Decide what is right here */ - return NSERROR_OK; - default: break; } diff --git a/frontends/riscos/sslcert.c b/frontends/riscos/sslcert.c index 4d81268f4..961e48339 100644 --- a/frontends/riscos/sslcert.c +++ b/frontends/riscos/sslcert.c @@ -25,6 +25,7 @@ #include #include "utils/log.h" +#include "utils/nsurl.h" #include "netsurf/plotters.h" #include "desktop/sslcert_viewer.h" diff --git a/frontends/riscos/theme_install.c b/frontends/riscos/theme_install.c index a235fe471..1e1af6c9a 100644 --- a/frontends/riscos/theme_install.c +++ b/frontends/riscos/theme_install.c @@ -149,7 +149,7 @@ nserror theme_install_callback(struct hlcache_handle *handle, case CONTENT_MSG_ERROR: theme_install_close(dialog_theme_install); - ro_warn_user(event->data.error, 0); + ro_warn_user(event->data.errordata.errormsg, 0); break; default: -- cgit v1.2.3