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

Timestamp:

Jan 8, 2004, 5:43:29 PM (22 years ago)

Author:

umoeller

Message:

Fixes that have piled up in the last three months.

File:

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

trunk/src/helpers/dosh.c

@@ -2588 +2588 @@
  *@@changed V0.9.16 (2001-12-18) [umoeller]: fixed error codes
  *@@changed V1.0.1 (2003-01-10) [umoeller]: now allowing read for all modes
+ *@@changed V1.0.2 (2003-11-13) [umoeller]: optimized; now calling doshQueryPathSize only on failure
  */
 
@@ -2615 +2616 @@
             // which isn't that meaningful
             // V0.9.16 (2001-12-08) [umoeller]
-            arc = doshQueryPathSize(pcszFilename,
-                                    pcbFile);
+            /* arc = doshQueryPathSize(pcszFilename,
+                                    pcbFile); */
+                // moved this down V1.0.2 (2003-11-13) [umoeller]
         break;
 
@@ -2625 +2627 @@
                           | OPEN_ACCESS_READWRITE;
 
-            arc = doshQueryPathSize(pcszFilename,
-                                    pcbFile);
+            /* arc = doshQueryPathSize(pcszFilename,
+                                    pcbFile); */
+                // moved this down V1.0.2 (2003-11-13) [umoeller]
         break;
 
@@ -2646 +2649 @@
     }
 
-    if ((!arc) && fsOpenFlags && pcbFile && ppFile)
+    if (    (!arc)
+         && fsOpenFlags
+         && pcbFile
+         && ppFile
+       )
     {
         PXFILE pFile;
@@ -2695 +2702 @@
                 pFile->pszFilename = strdup(pcszFilename);
             }
-            #ifdef DEBUG_DOSOPEN
             else
-                 _Pmpf((__FUNCTION__ ": DosOpen returned %d for %s",
+            {
+                #ifdef DEBUG_DOSOPEN
+                    _Pmpf((__FUNCTION__ ": DosOpen returned %d for %s",
                              arc, pcszFilename));
-            #endif
+                #endif
+
+                // open failed: if the file doesn't exist, DosOpen only
+                // returns OPEN_FAILED, while ERROR_FILE_NOT_FOUND would
+                // be a bit more informative
+                // (this check used to be before DosOpen, but is a bit
+                // excessive and should only be run if we really have no open)
+                if (arc == ERROR_OPEN_FAILED)
+                    arc = doshQueryPathSize(pcszFilename,
+                                            pcbFile);
+            }
 
             if (arc)
@@ -2750 +2768 @@
  *@@added V0.9.13 (2001-06-14) [umoeller]
  *@@changed V0.9.16 (2001-12-18) [umoeller]: now with XFILE, and always using FILE_BEGIN
- *@@chaanged V0.9.19 (2002-04-02) [umoeller]: added params checking
+ *@@changed V0.9.19 (2002-04-02) [umoeller]: added params checking
+ *@@changed V1.0.2 (2003-11-13) [umoeller]: optimized cache (using realloc)
  */
 
@@ -2828 +2847 @@
             #endif
 
+#if 0
             // free old cache
             if (pFile->pbCache)
@@ -2834 +2854 @@
             // allocate new cache
             if (!(pFile->pbCache = (PBYTE)malloc(pFile->cbCache)))
+#else
+            // realloc is better V1.0.2 (2003-11-13) [umoeller]
+            if (!(pFile->pbCache = (PBYTE)realloc(pFile->pbCache,
+                                                  pFile->cbCache)))
+#endif
                 arc = ERROR_NOT_ENOUGH_MEMORY;
             else
@@ -4487 +4512 @@
 
 /*
+ *@@ doshMyParentPID:
+ *      returns the PID of the parent of the current process.
+ *
+ *      This uses an interesting hack which is way
+ *      faster than DosGetInfoBlocks.
+ *
+ *@@added V1.0.2 (2003-11-13) [umoeller]
+ */
+
+ULONG doshMyParentPID(VOID)
+{
+    if (!G_pvLocalInfoSeg)
+        // first call:
+        GetInfoSegs();
+
+    // parent PID is at offset 2 in the local info seg
+    return *(PUSHORT)((PBYTE)G_pvLocalInfoSeg + 2);
+}
+
+/*
  *@@ doshMyTID:
  *      returns the TID of the current thread.