diff options
Diffstat (limited to 'frontends/riscos/content-handlers')
| -rw-r--r-- | frontends/riscos/content-handlers/artworks.c | 21 | ||||
| -rw-r--r-- | frontends/riscos/content-handlers/draw.c | 3 | ||||
| -rw-r--r-- | frontends/riscos/content-handlers/sprite.c | 6 |
3 files changed, 20 insertions, 10 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; } |