DosTrueGetMessage proto fix. DosScanEnv wrapper. Fix handle of some e…

…rrors in all_GetSystemErrorMessage (error message already provided for some errors during message handling).
osfree-project · Jun 20, 2024 · c21a5a1 · c21a5a1
1 parent 89a553e
commit c21a5a1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/OS2/CPI/doscalls/legacy/dos16scanenv.c b/OS2/CPI/doscalls/legacy/dos16scanenv.c
@@ -0,0 +1,7 @@
+#include "kal.h"
+
+
+APIRET16 APIENTRY16     DOS16SCANENV(char * _Seg16 pszEnvVar, char * _Seg16 * _Seg16 ppszResult)
+{
+  return DosScanEnv(pszEnvVar, ppszResult);
+}
diff --git a/OS2/CPI/doscalls/legacy/dos16truegetmessage.c b/OS2/CPI/doscalls/legacy/dos16truegetmessage.c
@@ -6,10 +6,10 @@ APIRET APIENTRY DosTrueGetMessage(void *msgSeg, PCHAR *pTable, ULONG cTable, PCH
                                   ULONG cbBuf, ULONG msgnumber,
                                   PSZ pszFile, PULONG pcbMsg);
 
-USHORT APIENTRY16     DOS16TRUEGETMESSAGE(void * _Seg16 pMsgSeg, char * _Seg16 * _Seg16 ivTable,
+USHORT APIENTRY16     DOS16TRUEGETMESSAGE(char * _Seg16 * _Seg16 ivTable,
                                           USHORT ivCount, char * _Seg16 pData, USHORT cbData,
                                           USHORT msgNum, char * _Seg16 pszFileName,
-                                          USHORT * _Seg16 msgLen)
+                                          USHORT * _Seg16 msgLen, void * _Seg16 pMsgSeg)
 {
   USHORT rc;
   ULONG cbMsg=*msgLen;

diff --git a/OS2/CPI/doscalls/legacy/unimp16.c b/OS2/CPI/doscalls/legacy/unimp16.c
@@ -1002,12 +1002,6 @@ USHORT APIENTRY16     DOS16SEARCHPATH(USHORT control, char * _Seg16 pszPath,
 }
 
 
-USHORT APIENTRY16     DOS16SCANENV(char * _Seg16 pszEnvVar, char * _Seg16 * _Seg16 ppszResult)
-{
-  return unimplemented(__FUNCTION__);
-}
-
-
 // fix prototype !!! (undoc)
 USHORT APIENTRY16     DOS16QPROCSTATUS(void)
 {

diff --git a/OS2/CPI/doscalls/makefile b/OS2/CPI/doscalls/makefile
@@ -82,6 +82,7 @@ srcfiles = $(p)msg$(e) &
 		   $(p)dos16makepipe$(e) &
 		   $(p)dos16newsize$(e) &
 		   $(p)dos16editname$(e) &
+		   $(p)dos16scanenv$(e) &
            $(p)doserror$(e) &
            $(p)dosexecpgm$(e) &
            $(p)dossetcurrentdir$(e) &

diff --git a/OS2/Shared/all_messages.c b/OS2/Shared/all_messages.c
@@ -34,24 +34,30 @@
 PSZ all_GetSystemErrorMessage(ULONG ulRc)
 {
   APIRET  rc;
-  CHAR    szErrorMessage[1000];
+  CHAR    szErrorMessage[1000]={0};
 #ifdef __386__
   ULONG   cbErrorMessage = 0;
 #else
   USHORT  cbErrorMessage = 0;
 #endif
 
-  rc=DosGetMessage(NULL, 0,szErrorMessage, sizeof(szErrorMessage),
-                  ulRc,
+  rc=DosGetMessage(NULL, 0,				// Argument table is empty
+				  szErrorMessage, sizeof(szErrorMessage), // Message buffer
+                  ulRc,					// Error number
                   "OSO001.MSG",        // default OS/2 message file
-                  &cbErrorMessage);
+                  &cbErrorMessage);		// Returned message size
 
   switch (rc)
   {
     case NO_ERROR: /* message retrieved, ok... */
       break;
     case ERROR_FILE_NOT_FOUND :
             sprintf(szErrorMessage, "SYS%04u (Message file not found!)", ulRc);
+      break;
+	  /* Error message already prepared in szErrorMessage */
+	//case ERROR_MR_CANT_FORMAT: 
+	//case ERROR_MR_READ_ERROR:
+	case ERROR_MR_INV_IVCOUNT:
       break;
     default:
             sprintf(szErrorMessage, "SYS%04u (Error %d while retrieving message text!)", ulRc, rc);