translate5 · malofan · Mar 31, 2025 · Apr 3, 2025 · Apr 7, 2025 · Apr 8, 2025
diff --git a/build.sh b/build.sh
@@ -30,9 +30,9 @@ do_build() {
 
   # Check if ASan should be enabled
   if [ "$ENABLE_ASAN" = "ON" ]; then
-    cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASAN=ON ../source
+    cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DENABLE_ASAN=ON ../source 
   else
-    cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ../source
+    cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 ../source
   fi
 
   make -j${CORES}

diff --git a/docker/workdir/TABLE/otmxml.c b/docker/workdir/TABLE/otmxml.c
@@ -236,23 +236,6 @@ EQF_BOOL  /*APIENTRY*/ EQFPOSTUNSEGW(
 
 
 
-USHORT  /*APIENTRY*/ EQFQUERYEXITINFO(PSZ pszTagTable,  // name of the markup table, e.g. "OTMHTM32"
-                        USHORT usMode,   // type of information being queried
-                        PSZ pszBuffer,      // buffer area receiving the information returned by the exit
-                        USHORT usBufLen // length of buffer area
-)
-{
-
-    if( usMode == QUERYEXIT_ADDFILES) {
-        QueryExportFiles(pszTagTable, pszBuffer, usBufLen, FALSE);
-    }
-
-    return 0;
-}
-
-
-
-
 /*******************************************************************************
 *
 *       function:       IsFileUTF16           

diff --git a/docs/index.html b/docs/index.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>T5Memory API</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700|Roboto:300,400,700" rel="stylesheet">
+
+    <!--
+    Redoc doesn't change outer page styles
+    -->
+    <style>
+        body {
+            margin: 0;
+            padding: 0;
+        }
+    </style>
+</head>
+<body>
+  <redoc spec-url="https://translate5.github.io/t5memory/t5memory.openapi.yaml"></redoc>
+  <script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"> </script>
+</body>
+</html>
diff --git a/docs/t5memory.apidog.json b/docs/t5memory.apidog.json
diff --git a/docs/t5memory.openapi.json b/docs/t5memory.openapi.json
diff --git a/docs/t5memory.openapi.yaml b/docs/t5memory.openapi.yaml
diff --git a/docs/t5memory.postman.json b/docs/t5memory.postman.json
diff --git a/include/EQF.H b/include/EQF.H
@@ -555,22 +555,6 @@
   }
 
 
-#ifdef TEMPORARY_COMMENTED
-#define CBQUERYSELECTEDITEMTEXT( sItem, hwnd, id, szBuffer ) \
-  { \
-    sItem = (SHORT)SendDlgItemMessage( hwnd, id, CB_GETCURSEL, 0, 0L ); \
-    if( sItem != CB_ERR ) \
-    { \
-       SendDlgItemMessage( hwnd, id, CB_GETLBTEXT, MP1FROMSHORT( sItem ), \
-                           MP2FROMP( szBuffer ) ); \
-    } \
-    else \
-    { \
-      szBuffer [0] = EOS; \
-    } /* endif */ \
-  }
-#endif
-
 #define CBQUERYSELECTEDITEMTEXTHWND( sItem, hwnd, szBuffer ) \
   { \
     sItem = (SHORT)CPLUSPLUS SendMessage( hwnd, CB_GETCURSEL, 0, 0L ); \
@@ -3642,9 +3626,9 @@ typedef ULONG HPRINT, *PHPRINT;
     ULONG   UtlLongToDateString( LONG, PSZ, ULONG );
     ULONG   UtlLongToTimeStringW( LONG, PSZ_W, ULONG );
     ULONG   UtlLongToDateStringW( LONG, PSZ_W, ULONG );
-    BOOL    UtlLoadFile( PSZ, PVOID *, USHORT *, BOOL, BOOL );
-    BOOL    UtlLoadFileL( PSZ, PVOID *, ULONG *, BOOL, BOOL );
-    BOOL    UtlLoadFileHwnd( PSZ, PVOID *, ULONG *, BOOL, BOOL, HWND );
+    BOOL    UtlLoadFile( PSZ, BytesRef , USHORT *, BOOL, BOOL );
+    BOOL    UtlLoadFileL( PSZ, BytesRef , ULONG *, BOOL, BOOL );
+    BOOL    UtlLoadFileHwnd( PSZ, BytesRef , ULONG *, BOOL, BOOL, HWND );
     USHORT  UtlCheckSpaceForFile( PSZ, USHORT, LONG, PSZ *, LONG *, BOOL );
     USHORT  UtlCheckSpaceForFileEx( PSZ, USHORT, LONG, PSZ *, LONG *, BOOL, PUSHORT );
     ULONG64 UtlQueryFreeSpace( CHAR, BOOL );
@@ -3669,7 +3653,6 @@ typedef ULONG HPRINT, *PHPRINT;
     PSZ     UtlMakeFullPath ( PSZ, PSZ, PSZ, PSZ, PSZ );
     USHORT  UtlWriteFile( PSZ pszFile, ULONG ulDataLength, PVOID pData);
     BOOL    UtlIsEqfDrive( CHAR chDrive );
-    BOOL    UtlGetCheckedEqfDrives( PSZ pszDrives );
     char*     UtlGetFnameFromPath( const char* path);
     PSZ     UtlMakeObjName( PSZ p, PSZ drive, PSZ path, PSZ fname, PSZ ext);
     VOID UtlMakeFNameAndPath( PSZ, PSZ, PSZ );
@@ -3707,14 +3690,11 @@ SHORT UtlDriveType( CHAR chDrive );
 VOID UtlSetHorzScrollingForLB(HWND hLB);
 
 VOID   UtlSaveWindowPos( HWND hFrame, EQF_PSWP pSwp);
-BOOL   UtlAllocHwnd ( PVOID *, LONG, LONG, USHORT, HWND );
 BOOL   UtlInitUtils( HAB );
 BOOL   UtlRegisterEqfHelp( HAB );
 BOOL   UtlTerminateUtils( VOID );
 USHORT UtlError ( SHORT, USHORT, USHORT, PSZ *, ERRTYPE );
 USHORT UtlErrorHwnd ( SHORT, USHORT, USHORT, PSZ *, ERRTYPE, HWND );
-USHORT UtlErrorW ( SHORT, USHORT, USHORT, PSZ_W *, ERRTYPE, BOOL );
-USHORT UtlErrorHwndW ( SHORT, USHORT, USHORT, PSZ_W *, ERRTYPE, HWND, BOOL );
 VOID UtlGetMsgTxt( SHORT, PSZ, USHORT, PSZ *);
 
 VOID   UtlInitError ( HAB, HWND, HWND, PSZ );
@@ -3907,13 +3887,7 @@ USHORT  UtlFillTableLB( HWND, USHORT );     // get languages
 USHORT SetSystemLanguage( PSZ pLanguage );
 USHORT UtlSetFHandState( HFILE hf, USHORT fsState, BOOL fMsg );
 USHORT UtlSetFHandStateHwnd( HFILE hf, USHORT fsState, BOOL fMsg, HWND hwnd );
-BOOL   UtlAllocTrace ( PVOID *, LONG, LONG, USHORT, PSZ, USHORT );
-BOOL   UtlAllocTraceHwnd ( PVOID *, LONG, LONG, USHORT, HWND, PSZ, USHORT );
 #ifdef UTLFFST
-  #define UtlAlloc( par1, par2, par3, par4 ) \
-              UtlAllocTrace(par1, par2, par3, par4, __FILE__, __LINE__ )
-  #define UtlAllocHwnd( par1, par2, par3, par4, par5 ) \
-              UtlAllocTraceHwnd(par1, par2, par3, par4, par5, __FILE__, __LINE__ )
 
 #endif
 USHORT EqfDriveType(USHORT iDrive);
@@ -3945,11 +3919,6 @@ BOOL UtlKeepInTWB( PSWP pswpWin );
 USHORT UtlCheckDlgPos( HWND hwndDlg, BOOL fShow );
 LONG UtlTime( PLONG plTime );
 
-#ifdef UTLFFST
-#define UtlAlloc( par1, par2, par3, par4 ) \
-            UtlAllocTrace(par1, par2, par3, par4, __FILE__, __LINE__ )
-
-#endif
 
 VOID UtlWait( SHORT sWaitTime );       // wait the given time
 USHORT UtlLoadWidth( HAB, HMODULE, SHORT, PUSHORT );
@@ -5383,8 +5352,6 @@ ULONG GetOrgLangCP( PSZ pLanguage, BOOL  fASCII );
 //------------------------------------------------------------------------------
 struct TERMLENOFFS
 {
- //  int  iLength;                   // length of term
- //  int  iOffset;                   // offset of term data in buffer
    USHORT  iLength;                   // length of term
    USHORT  iOffset;                   // offset of term data in buffer
    TERMLENOFFS(){iLength = iOffset = 0;}
@@ -5428,7 +5395,6 @@ void LogSysInfo( VOID );
 PSZ_W UTF16strcpy( PSZ_W pszTarget, PSZ_W pszSource );
 PSZ_W UTF16strcat( PSZ_W pszTarget, PSZ_W pszSource );
 PSZ_W UTF16strncpy(PSZ_W pusTarget, PSZ_W pusSource, LONG lLen);
-int   UTF16strcmp( PSZ_W pszString1, PSZ_W pszString2 );
 int   UTF16strncmpL( PSZ_W pszString1, PSZ_W pszString2, LONG lLen );
 int UTF16strnicmpL( PSZ_W pszString1, PSZ_W pszString2, LONG lLen );
 int   UTF16strncmp( PSZ_W pszString1, PSZ_W pszString2, USHORT usLen );
@@ -5657,19 +5623,6 @@ BOOL DicGetCheckPassword( PSZ pszPassword, PULONG pulPassword, BOOL fCheckPasswo
 #define XLATEOS2_MARKUP "XLATEOS2"
 #define XLATEWIN_MARKUP "XLATEWIN"
 
-// support additional pages in document import/export
-typedef struct _EXTRAIDA
-{
-   CHAR     szFileName[ MAX_PATH144 ];  // filename to be used
-   HWND     hwndExpListbox;             // handle of listbox containing selected docs
-   OBJNAME  szFolderObjName;            // folder object name
-   PVOID    pIda;                       // product specifics
-   USHORT   usExtraPage;                // number of extra page
-   HWND     hwnd;                       // handle of parent dialog
-   OBJNAME  szParentObjName;            // parent (sub)folder object name
-} EXTRAIDA, *PEXTRAIDA;
-
-
 
 // defines for SGML Formats
 #define SGMLFORMAT_ANSI     1
@@ -5745,7 +5698,6 @@ NTMCompareBetweenTokens
     PSZ_W pD2,
     PSZ   pszMarkup,
     SHORT sLangID,
-    ULONG ulSrcCP,
     PBOOL pfStringEqual
 );
 

diff --git a/include/EQFDASD.H b/include/EQFDASD.H
@@ -212,15 +212,7 @@ typedef enum _TERMTYPE
 #define STYLEPREFIX_UNDEFINED 0x2715        //
 
 
-#define ASD_GUARDED  0x01              // Open dictionary in guarded mode
-#define ASD_LOCKED   0x10              // Open dictionary and lock it
-#define ASD_FORCE_WRITE   0x40         // force imm.write of any changed record
-#define ASD_NOINDEX  0x80              // Do not process index dictionary
-                                       // Caution: this define should be used
-                                       // only for dictionary organize!!!
 #define ASD_ORGANIZE 0x100             // work in organize mode
-#define ASD_NOOPENCHECK 0x200          // do not check QDAM header open flag
-#define ASD_READONLY    0x400          // open in read only mode
 
 
 // AsdTranslate mode: return terms only

diff --git a/include/EQFDDE.H b/include/EQFDDE.H
@@ -587,10 +587,10 @@ typedef struct _BATCHIMPORTPARMS
 
 HGLOBAL MakeDDEDataSeg(USHORT, PSZ, PVOID, USHORT, USHORT );
 
-static BOOL EQFFunctionCmdLine (PDDECLIENT );
-static BATCHCMD ValidateToken ( PSZ  *ppToken, PBATCHLIST  pBatchList );
-static BOOL CheckBatchOccurrence (PDDECLIENT, PUSHORT);
-static DDETASK ValidateTask ( PDDECLIENT pDDEClient );
+BOOL EQFFunctionCmdLine (PDDECLIENT );
+BATCHCMD ValidateToken ( PSZ  *ppToken, PBATCHLIST  pBatchList );
+BOOL CheckBatchOccurrence (PDDECLIENT, PUSHORT);
+DDETASK ValidateTask ( PDDECLIENT pDDEClient );
 
 BOOL DDEDocUnLoad( PDOCIMPEXP pDocExpIda );
 BOOL DDEDocLoad( PDOCIMPEXP pDocImpIda );

diff --git a/include/EQFFUZZ.H b/include/EQFFUZZ.H
@@ -1,4 +1,4 @@
-
+#include "lowlevelotmdatastructs.h"
 #ifndef _EQFFUZZ_H_
 #define _EQFFUZZ_H_
 
@@ -31,9 +31,6 @@ typedef struct _LCSTOKEN
   SHORT sTotalLen;
 } LCSTOKEN, *PLSCTOKEN;
 
-
-
-
 //static 
 SHORT CompFuzzyTok (   PFUZZYTOK , PFUZZYTOK,  BOOL );
 
@@ -43,18 +40,16 @@ SHORT CompFuzzyTok (   PFUZZYTOK , PFUZZYTOK,  BOOL );
 //static 
 VOID MakeHashValue ( PULONG, USHORT, PSZ_W, PULONG );
 
-
-
 //static 
-BOOL PrepareTokens ( PLOADEDTABLE, PBYTE, PBYTE, PSZ_W, SHORT, PFUZZYTOK *, ULONG );
+BOOL PrepareTokens ( PLOADEDTABLE, PSZ_W, SHORT, std::vector<FUZZYTOK> & );
 //static 
 BOOL FuzzyReplace ( PSZ_W, PSZ_W, PSZ_W, PREPLLIST, PREPLLIST );
 //static 
 VOID  TransferSource( PSZ_W, PSZ_W, PSZ_W );
 //static 
 SHORT TokStrCompare ( PFUZZYTOK, PFUZZYTOK);
 //static 
-PFUZZYTOK SplitTokens (PFUZZYTOK, USHORT, SHORT, int, PSZ_W);
+void SplitTokens (std::vector<FUZZYTOK>&, USHORT, SHORT, int, PSZ_W);
 //static  
 //static 
 SHORT Snake ( PFUZZYTOK, PFUZZYTOK, SHORT, SHORT, SHORT, SHORT, BOOL);
@@ -64,13 +59,11 @@ SHORT FindMiddleSnake( PFUZZYTOK, PFUZZYTOK, PFUZZYTOK, PFUZZYTOK,
 //static 
 VOID LCS( LCSTOKEN, LCSTOKEN , BOOL);
 //static 
-BOOL EQFBTokCountDiff(PFUZZYTOK, PFUZZYTOK,
-                             USHORT, USHORT, PUSHORT);
 //static
- BOOL EQFBMarkModDelIns( PFUZZYTOK, PFUZZYTOK, PFUZZYTOK*, PFUZZYTOK *,
+ BOOL EQFBMarkModDelIns( std::vector<FUZZYTOK>&, std::vector<FUZZYTOK>&, std::vector<FUZZYTOK>&, std::vector<FUZZYTOK>&, 
                                USHORT, USHORT);
 //static 
-void EQFBSimplifyAndCountMarks (PFUZZYTOK, PUSHORT, PUSHORT);
+void EQFBSimplifyAndCountMarks (std::vector<FUZZYTOK>&, PUSHORT, PUSHORT);
 
 /**********************************************************************/
 /* macro to calculate the number of tokens in the list ...            */

diff --git a/include/EQFMORPH.H b/include/EQFMORPH.H
@@ -98,15 +98,7 @@
 #include "LogWrapper.h"
 
 
-/**********************************************************************/
-/* Structure to access MORPH_FLAG_OFFSLIST type term lists            */
-/**********************************************************************/
-typedef struct _FLAGOFFSLIST
-{
-  LONG             lFlags;             // flags of term
-  USHORT           usLen;              // length of term
-  USHORT           usOffs;             // offset of term
-} FLAGOFFSLIST, *PFLAGOFFSLIST;
+
 
 //+----------------------------------------------------------------------------+
 //   Flags for flagged term lists                                               
@@ -190,12 +182,7 @@ USHORT MorphTokenizeW
 (
    SHORT    sLanguageID,               // language ID
    PSZ_W    pszInData,                 // pointer to input segment
-   PUSHORT  pusBufferSize,             // address of variable containing size of
-                                       //    term list buffer
-   TERMLENOFFS** ppTermList,               // address of caller's term list pointer
-   USHORT   usListType,                 // type of term list MORPH_ZTERMLIST or
-                                       //    MORPH_OFFSLIST
-   ULONG    ulOemCP
+   std::vector<TERMLENOFFS>& ppTermList// address of caller's term list pointer
 );
 
 
@@ -330,26 +317,9 @@ USHORT MorphAddTermToList2
 
 USHORT MorphAddTermToList2W
 (
-  PSZ_W    *ppList,                    // ptr to term list pointer
-  PULONG   pulSize,                    // ptr to allocated size of term list
-  PULONG   pulUsed,                    // ptr to used bytes in term list
-  PSZ_W    pszTerm,                    // ptr to new term being added to list
-  USHORT   usLength,                   // length of term
-  USHORT   usOffs,                     // offset of term
-  ULONG    ulFlags,                    // flags for the term
-  USHORT   usListType                  // type of list MORPH_ZTERMLIST or
-);
-
-
-USHORT MorphCopyTermListASCII2Unicode
-(
-  PSZ      pList,                      // ptr to ASCII termlist
-  USHORT   usBufferSize,               // size of allocated buffer
-  PSZ_W    *ppListW,                   // ptr to term list pointer
-  PULONG   pulSize,                    // ptr to allocated size of term list
-  PULONG   pulUsed,                    // ptr to used bytes in term list
-  USHORT   usListType,                  // type of list
-  ULONG    ulOemCP
+  std::vector<TERMLENOFFS>&   pList,                    // ptr to term list pointer
+  int      iLength,                   // length of term in # of w's
+  int      iOffs                     // offset of term in # of w's???
 );
 
 

diff --git a/include/EQFOSWIN.H b/include/EQFOSWIN.H
@@ -130,7 +130,6 @@ HWND WinQueryWindow ( HWND, SHORT, BOOL );
 /* one might probably use NULL as default, but we use our UTL-function*/
 /* which stores the anchor block for PM - we store the instead instead*/
 /**********************************************************************/
-#define WinQueryAnchorBlock( a )     ((HAB) UtlQueryULong( QL_HAB ))
 /**********************************************************************/
 /* resource strings                                                   */
 /**********************************************************************/
@@ -1048,12 +1047,7 @@ USHORT DosGetDateTime( PDATETIME pDateTime );
 /**********************************************************************/
 SHORT GetNextSelection( HWND hwndLB, SHORT sPos );
 
-/**********************************************************************/
-/* force use of GetOEMCP- needed for 32-bit                           */
-/* GetKBCodePage returns  437 for TChin/SChin/Korean under Win95!     */
-/* which causes that no DBCS chars are detected!!                     */
-/**********************************************************************/
-#define GetKBCodePage() GetOEMCP()
+
 
 /**********************************************************************/
 /* allow to fill the rectangle in the selected color                  */