ui: correct memory far stuff

Author: jmalak

bld/ui/c/uiballoc.c

@@ -34,6 +34,9 @@
 #include <stdio.h>
 #if defined( _M_IX86 )
     #include <i86.h>
+  #if defined( _M_I86 ) && ( defined( __SMALL__ ) || defined( __MEDIUM__ ) )
+    #include <malloc.h>
+  #endif
 #endif
 #include "uidef.h"
 #include "uifar.h"
@@ -64,8 +67,8 @@ bool intern balloc( BUFFER *bptr, uisize height, uisize width )
     LP_PIXEL    ptr;
 
     bptr->increment = width;
-    ptr = MemAlloc( height * width * sizeof( PIXEL ) );
 #if defined( __DOS__ ) && !defined( _M_I86 )
+    ptr = MemAlloc( height * width * sizeof( PIXEL ) );
     if( ptr != NULL ) {
         /* convert ptr to far if necessary: use DS for segment value */
         bptr->origin = ptr;
@@ -74,7 +77,12 @@ bool intern balloc( BUFFER *bptr, uisize height, uisize width )
     /* use 0 for segment value */
     bptr->origin = NULL;
     return( false );
+#elif defined( _M_I86 ) && ( defined( __SMALL__ ) || defined( __MEDIUM__ ) )
+    ptr = _fmalloc( height * width * sizeof( PIXEL ) );
+    bptr->origin = ptr;
+    return( ptr != NULL );
 #else
+    ptr = MemAlloc( height * width * sizeof( PIXEL ) );
     bptr->origin = ptr;
     return( ptr != NULL );
 #endif
@@ -90,6 +98,8 @@ void intern bfree( BUFFER *bptr )
      * this is safe because we synthesized the segment part to begin with.
      */
     MemFree( (void *)_FP_OFF( bptr->origin ) );
+#elif defined( _M_I86 ) && ( defined( __SMALL__ ) || defined( __MEDIUM__ ) )
+    _ffree( bptr->origin );
 #else
     MemFree( (void *)bptr->origin );
 #endif

bld/ui/c/uimenu.c

@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2019 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2026 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -97,8 +97,8 @@ char UIAPI uialtchar( ui_event ui_ev )
 }
 
 
-static void mstring( BUFFER *bptr, ORD row, ORD col, ATTR attr, LPC_STRING string, uisize string_len )
-/****************************************************************************************************/
+static void mstring( BUFFER *bptr, ORD row, ORD col, ATTR attr, const char *string, uisize string_len )
+/*****************************************************************************************************/
 {
     SAREA       area;
 

bld/ui/c/uivstr.c

@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2019 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2026 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -38,7 +38,7 @@
 
 
 void UIAPI uitextfield( VSCREEN *vs, ORD row, ORD col, unsigned field_len,
-                        ATTR attr, LPC_STRING string, unsigned string_len )
+                        ATTR attr, const char *string, unsigned string_len )
 /**************************************************************************/
 {
     uisize          count;

bld/ui/h/stdui.h

@@ -551,14 +551,8 @@ typedef int             CATTR;          /* cursor attributes type */
 
 #if defined( __DOS__ ) || defined( _M_I86 )
 typedef PIXEL       __far *LP_PIXEL;
-typedef char        __far *LP_STRING;
-typedef const char  __far *LPC_STRING;
-typedef void        __far *LP_VOID;
 #else
 typedef PIXEL       *LP_PIXEL;
-typedef char        *LP_STRING;
-typedef const char  *LPC_STRING;
-typedef void        *LP_VOID;
 #endif
 
 typedef enum {
@@ -742,7 +736,7 @@ extern void             UIAPI uivsetactive( VSCREEN _FARD * );
 extern void             UIAPI uivsetcursor( VSCREEN _FARD * );
 extern bool             UIAPI uivshow( VSCREEN _FARD * );
 extern void             UIAPI uivtextput( VSCREEN _FARD *, ORD, ORD, ATTR, const char _FARD *, unsigned );
-extern void             UIAPI uitextfield( VSCREEN _FARD *, ORD, ORD, unsigned, ATTR, LPC_STRING, unsigned );
+extern void             UIAPI uitextfield( VSCREEN _FARD *, ORD, ORD, unsigned, ATTR, const char *, unsigned );
 extern void             UIAPI uimousespeed( unsigned );
 extern unsigned char    UIAPI uicheckshift( void );
 extern ui_event         UIAPI uikeyboardevent( void );

bld/ui/h/uidef.h

@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2026 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -48,6 +48,14 @@
 #define CHAR_VALUE(c)       (char)(unsigned char)(c)
 #define UCHAR_VALUE(c)      (unsigned char)(c)
 
+#if defined( __DOS__ ) || defined( _M_I86 )
+typedef char        __far *LP_STRING;
+typedef const char  __far *LPC_STRING;
+#else
+typedef char        *LP_STRING;
+typedef const char  *LPC_STRING;
+#endif
+
 typedef enum {
     UI_MOUSE_PRESS          = 1,
     UI_MOUSE_PRESS_RIGHT    = 2,