Changeset 127 for trunk/include/helpers/dosh.h

Timestamp:

Jan 5, 2002, 8:11:10 PM (24 years ago)

Author:

umoeller

Message:

Tons of updates for turbo folders and replacement icons.

File:

• trunk/include/helpers/dosh.h (modified) (13 diffs)

trunk/include/helpers/dosh.h

@@ -345 +345 @@
                            ULONG ulAttr);
 
-    APIRET doshOpenExisting(PCSZ pcszFilename,
+    /* APIRET doshOpenExisting(PCSZ pcszFilename,
                             ULONG ulOpenFlags,
                             HFILE *phf);
-
-    APIRET doshWriteAt(HFILE hf,
-                       LONG lOffset,
-                       ULONG ulMethod,
-                       ULONG cb,
-                       PBYTE pbData);
-
-    APIRET doshReadAt(HFILE hf,
-                      LONG lOffset,
-                      ULONG ulMethod,
-                      PULONG pcb,
-                      PBYTE pbData);
+       */
 
     /*
@@ -377 +366 @@
 
     #define XOPEN_READ_EXISTING           0x0001
-    #define XOPEN_READWRITE_APPEND        0x0002
-    #define XOPEN_READWRITE_NEW           0x0003
+    #define XOPEN_READWRITE_EXISTING      0x0002
+    #define XOPEN_READWRITE_APPEND        0x0003
+    #define XOPEN_READWRITE_NEW           0x0004
     #define XOPEN_ACCESS_MASK             0xffff
 
@@ -388 +378 @@
                     PXFILE *ppFile);
 
+    APIRET doshReadAt(PXFILE pFile,
+                      ULONG ulOffset,
+                      PULONG pcb,
+                      PBYTE pbData);
+
     APIRET doshWrite(PXFILE pFile,
-                     PCSZ pcsz,
-                     ULONG cb);
+                     ULONG cb,
+                     PCSZ pbData);
+
+    APIRET doshWriteAt(PXFILE pFile,
+                       ULONG ulOffset,
+                       ULONG cb,
+                       PCSZ pbData);
 
     APIRET doshWriteLogEntry(PXFILE pFile,
@@ -858 +858 @@
     #define EXEFORMAT_LX            4
     #define EXEFORMAT_TEXT_BATCH    5
-    #define EXEFORMAT_TEXT_REXX     6
+    #define EXEFORMAT_TEXT_CMD      6       // REXX or plain OS/2 batch
+    #define EXEFORMAT_COM           7       // added V0.9.16 (2002-01-04) [umoeller]
 
     // target OS (in NE and LX)
@@ -869 +870 @@
     #define EXEOS_WIN32             6
 
+#ifndef __STRIP_DOWN_EXECUTABLE__
+// for mini stubs in warpin, which has its own
+// implementation of this
+
     /*
      *@@ EXECUTABLE:
@@ -877 +882 @@
     typedef struct _EXECUTABLE
     {
-        HFILE               hfExe;
+        // executable opened by doshOpen
+        PXFILE              pFile;
 
         /* All the following fields are set by
@@ -891 +897 @@
 
         // New Executable (NE) header, if ulExeFormat == EXEFORMAT_NE
-#ifndef __STRIP_DOWN_EXECUTABLE__       // for mini stubs in warpin, to reduce code size
         PNEHEADER           pNEHeader;
         ULONG               cbNEHeader;
-#endif
 
         // Linear Executable (LX) header, if ulExeFormat == EXEFORMAT_LX
@@ -901 +905 @@
 
         // Portable Executable (PE) header, if ulExeFormat == EXEFORMAT_PE
-#ifndef __STRIP_DOWN_EXECUTABLE__       // for mini stubs in warpin, to reduce code size
         PPEHEADER           pPEHeader;
         ULONG               cbPEHeader;
-#endif
+
         // module analysis (always set):
         ULONG               ulExeFormat;
@@ -913 +916 @@
                 // EXEFORMAT_LX            4
                 // EXEFORMAT_TEXT_BATCH    5
-                // EXEFORMAT_TEXT_REXX     6
+                // EXEFORMAT_TEXT_CMD      6
+                // EXEFORMAT_COM           7
 
         BOOL                fLibrary,           // TRUE if this is a DLL
@@ -942 +946 @@
                 // module info substring (if IBM BLDLEVEL format)
 
-#ifndef __STRIP_DOWN_EXECUTABLE__       // for mini stubs in warpin, to reduce code size
         // if pszInfo is extended DESCRIPTION field, the following
         // are set as well:
@@ -964 +967 @@
         POS2NERESTBLENTRY       paOS2NEResTblEntry;
         POS2NESEGMENT           paOS2NESegments;
-
-#endif
     } EXECUTABLE, *PEXECUTABLE;
 
@@ -1061 +1062 @@
                               PCSZ *papcszExtensions,
                               ULONG cExtensions);
+#endif
 
     /********************************************************************
@@ -1264 +1266 @@
     VOID doshFreeLVMInfo(PLVMINFO pInfo);
 
+    /* ******************************************************************
+     *
+     *   Wildcard matching
+     *
+     ********************************************************************/
+
+    BOOL doshMatch(const char *pcszMask,
+                   const char *pcszName);
+
 #endif