Changeset 54 for trunk/include/helpers

Timestamp:

Apr 4, 2001, 4:39:06 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

Location:

trunk/include/helpers

Files:

• dialog.h (modified) (4 diffs)
• dosh.h (modified) (3 diffs)
• tree.h (modified) (2 diffs)

trunk/include/helpers/dialog.h

@@ -7 +7 @@
  *            numbering.
  *
+ *@@added V0.9.9 (2001-04-01) [umoeller]
  *@@include <os2.h>
  *@@include #include "dialog.h"
@@ -70 +71 @@
      *      DLGHITEM.
      *
-     *@@added V0.9.9 (2001-04-01) [umoeller]
      */
 
@@ -112 +112 @@
      *@@ DLGHITEMTYPE:
      *
-     *@@added V0.9.9 (2001-04-01) [umoeller]
      */
 
@@ -147 +146 @@
      *      See dlghCreateDlg for details.
      *
-     *@@added V0.9.9 (2001-04-01) [umoeller]
      */
 

trunk/include/helpers/dosh.h

@@ -335 +335 @@
      *
      ********************************************************************/
+
+    ULONG XWPENTRY doshMyPID(VOID);
+    typedef ULONG XWPENTRY DOSHMYPID(VOID);
+    typedef DOSHMYPID *PDOSHMYPID;
+
+    ULONG XWPENTRY doshMyTID(VOID);
+    typedef ULONG XWPENTRY DOSHMYTID(VOID);
+    typedef DOSHMYTID *PDOSHMYTID;
 
     APIRET doshFindExecutable(const char *pcszCommand,
@@ -678 +686 @@
     APIRET doshExecQueryBldLevel(PEXECUTABLE pExec);
 
-    PFSYSRESOURCE doshExecQueryResources(PEXECUTABLE pExec,
-                                         PULONG pcResources);
+    APIRET doshExecQueryImportedModules(PEXECUTABLE pExec,
+                                        PFSYSMODULE *ppaModules,
+                                        PULONG pcModules);
+
+    APIRET doshExecFreeImportedModules(PFSYSMODULE paModules);
+
+    APIRET doshExecQueryExportedFunctions(PEXECUTABLE pExec,
+                                          PFSYSFUNCTION *ppaFunctions,
+                                          PULONG pcFunctions);
+
+    APIRET doshExecFreeExportedFunctions(PFSYSFUNCTION paFunctions);
+
+    APIRET doshExecQueryResources(PEXECUTABLE pExec,
+                                  PFSYSRESOURCE *ppaResources,
+                                  PULONG pcResources);
 
     APIRET doshExecFreeResources(PFSYSRESOURCE paResources);
-
-    PFSYSMODULE doshExecQueryImportedModules(PEXECUTABLE pExec,
-                                             PULONG pcModules);
-
-    APIRET doshExecFreeImportedModules(PFSYSMODULE paModules);
-
-    PFSYSFUNCTION doshExecQueryExportedFunctions(PEXECUTABLE pExec,
-                                                 PULONG pcFunctions);
-
-    APIRET doshExecFreeExportedFunctions(PFSYSFUNCTION paFunctions);
 
     /********************************************************************
@@ -851 +862 @@
     #pragma pack()
 
-    char* doshType2FSName(unsigned char bFSType);
+    const char* doshType2FSName(unsigned char bFSType);
 
     APIRET doshGetBootManager(USHORT   *pusDisk,

trunk/include/helpers/tree.h

@@ -101 +101 @@
     } TREE, *PTREE;
 
+    #if defined(__IBMC__) || defined(__IBMCPP__)
+        #define TREEENTRY _Optlink
+    #else
+        // EMX or whatever: doesn't know calling conventions
+        #define TREENTRY
+    #endif
+
     // The tree algorithm needs to know how to sort the data.
     // It does this using a functions provided by the calling program.
@@ -107 +114 @@
     // --  -1: t1 < t2
     // --  +1: t1 > t2
-    typedef int XWPENTRY FNTREE_COMPARE_NODES(TREE *t1, TREE *t2);
-    typedef int XWPENTRY FNTREE_COMPARE_DATA(TREE *t1, void *pData);
+    typedef int TREEENTRY FNTREE_COMPARE_NODES(TREE *t1, TREE *t2);
+    typedef int TREEENTRY FNTREE_COMPARE_DATA(TREE *t1, void *pData);
 
     //  Define a function type for use with the tree traversal function
-    typedef void XWPENTRY TREE_PROCESS(TREE *t, void *pUser);
+    typedef void TREEENTRY TREE_PROCESS(TREE *t, void *pUser);
 
     //  Global variables