Changeset 229 for trunk/src/helpers/dosh.c

Timestamp:

Nov 24, 2002, 9:45:05 PM (23 years ago)

Author:

umoeller

Message:

Sources as of 1.0.0.

File:

• trunk/src/helpers/dosh.c (modified) (7 diffs)

trunk/src/helpers/dosh.c

@@ -302 +302 @@
  *      buffer, which should be free()'d afterwards.
  *
+ *      The returned string is properly null-terminated but
+ *      should not end with a line break (\r or \n) if I see
+ *      this correctly.
+ *
  *      Returns NULL upon errors.
+ *
+ *@@changed V1.0.0 (2002-09-24) [umoeller]: now supporting NET messages as well
  */
 
 PSZ doshQuerySysErrorMsg(APIRET arc)    // in: DOS error code
 {
-    PSZ     pszReturn = 0;
+    PSZ     pszReturn = NULL;
     CHAR    szDosError[1000];
     ULONG   cbDosError = 0;
-    DosGetMessage(NULL, 0,       // no string replacements
-                  szDosError, sizeof(szDosError),
-                  arc,
-                  "OSO001.MSG",        // default OS/2 message file
-                  &cbDosError);
-    if (cbDosError > 2)
+    PCSZ    pcszMsgFile;
+
+    if (    (arc >= 2100)
+         && (arc <= 8000)
+       )
+        pcszMsgFile = "NET.MSG";
+    else
+        pcszMsgFile = "OSO001.MSG";        // default OS/2 message file
+
+    if (!DosGetMessage(NULL, 0,       // no string replacements
+                       szDosError, sizeof(szDosError),
+                       arc,
+                       (PSZ)pcszMsgFile,
+                       &cbDosError))
     {
         szDosError[cbDosError - 2] = 0;
         pszReturn = strdup(szDosError);
     }
-    return (pszReturn);
+
+    return pszReturn;
 }
 
@@ -728 +743 @@
  *      CD-ROM drive.
  *
- *@@added V0.9.21 (2002-08-31) [umoeller]
+ *@@added V1.0.0 (2002-08-31) [umoeller]
  */
 
@@ -785 +800 @@
  *      to close the device again.
  *
- *@@added V0.9.21 (2002-08-31) [umoeller]
+ *@@added V1.0.0 (2002-08-31) [umoeller]
  */
 
@@ -823 +838 @@
  *
  *@@added V0.9.14 (2001-08-01) [umoeller]
- *@@changed V0.9.21 (2002-08-31) [umoeller]: removed ulLogicalDrive which was not needed
+ *@@changed V1.0.0 (2002-08-31) [umoeller]: removed ulLogicalDrive which was not needed
  */
 
@@ -852 +867 @@
         else
         {
-            #pragma pack(1)         // V0.9.21 (2002-08-31) [umoeller]
+            #pragma pack(1)         // V1.0.0 (2002-08-31) [umoeller]
 
             struct {
@@ -959 +974 @@
  *      to find out if the door is open with OS/2.
  *
- *@@added V0.9.21 (2002-08-31) [umoeller]
+ *@@added V1.0.0 (2002-08-31) [umoeller]
  */
 
@@ -1146 +1161 @@
     HFILE   hf;
 
-    // exported this code to doshOpenDrive V0.9.21 (2002-08-31) [umoeller]
+    // exported this code to doshOpenDrive V1.0.0 (2002-08-31) [umoeller]
     arc = doshOpenDrive(ulLogicalDrive,
                         &hf);