Fix for spurious CHR$(255) from Scale

Was calling Window_GetWimpHandle as though a SWI number, when that define is actually a subreason of Toolbox_ObjectMiscOp.
Fixes https://www.riscosopen.org/forum/forums/4/topics/16280

Version 0.18. Tagged as 'Scale-0_18'

VersionNum

-/* (0.17)
+/* (0.18)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        0.17
+#define Module_MajorVersion_CMHG        0.18
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                13 Feb 2021
+#define Module_Date_CMHG                20 Mar 2021
 
-#define Module_MajorVersion             "0.17"
-#define Module_Version                  17
+#define Module_MajorVersion             "0.18"
+#define Module_Version                  18
 #define Module_MinorVersion             ""
-#define Module_Date                     "13 Feb 2021"
+#define Module_Date                     "20 Mar 2021"
 
-#define Module_ApplicationDate          "13-Feb-21"
+#define Module_ApplicationDate          "20-Mar-21"
 
 #define Module_ComponentName            "Scale"
 
-#define Module_FullVersion              "0.17"
-#define Module_HelpVersion              "0.17 (13 Feb 2021)"
-#define Module_LibraryVersionInfo       "0:17"
+#define Module_FullVersion              "0.18"
+#define Module_HelpVersion              "0.18 (20 Mar 2021)"
+#define Module_LibraryVersionInfo       "0:18"

c/create

@@ -76,7 +76,6 @@ extern _kernel_oserror *create_object (_kernel_swi_regs *r, TaskDescriptor *t)
 
    _kernel_oserror      *e;
    _kernel_swi_regs      regs,
-                         win_regs,
                         *user_regs         = (_kernel_swi_regs *) r->r[4];
    ObjectTemplateHeader *obj_temp_hdr      = (ObjectTemplateHeader *) user_regs->r[1];
    ScaleTemplate        *template          = (ScaleTemplate *) obj_temp_hdr->body;
@@ -145,11 +144,12 @@ extern _kernel_oserror *create_object (_kernel_swi_regs *r, TaskDescriptor *t)
       = ((template->flags & Scale_GenerateShowEvent) ? ScaleInternal_GenerateShowEvent : 0)
       | ((template->flags & Scale_GenerateHideEvent) ? ScaleInternal_GenerateHideEvent : 0);
 
-   win_regs.r[0] = 0;
-   win_regs.r[1] = internal->sub_object_id;
-   win_regs.r[2] = internal->wimp_handle;
-   if ((e = _kernel_swi (Window_GetWimpHandle, &regs, &regs)) != NULL)
+   regs.r[0] = 0; /* flags */
+   regs.r[1] = internal->sub_object_id;
+   regs.r[2] = Window_GetWimpHandle;
+   if ((e = _kernel_swi (Toolbox_ObjectMiscOp, &regs, &regs)) != NULL)
       return e;
+   internal->wimp_handle = regs.r[0];
 
    if (t->object_list) { /* If there are already fileinfos attached to the task ... */