Changeset 113 for trunk/src/helpers

Timestamp:

Oct 23, 2001, 11:25:46 PM (24 years ago)

Author:

umoeller

Message:

Misc updates.

Location:

trunk/src/helpers

Files:

• apps.c (modified) (10 diffs)
• dialog.c (modified) (2 diffs)
• dosh.c (modified) (11 diffs)
• helpers_pre.in (modified) (1 diff)
• linklist.c (modified) (3 diffs)
• nls.c (modified) (1 diff)
• semaphores.c (modified) (3 diffs)
• tmsgfile.c (modified) (3 diffs)
• tree.c (modified) (9 diffs)
• winh.c (modified) (1 diff)
• wphandle.c (modified) (25 diffs)
• xml.c (modified) (11 diffs)

trunk/src/helpers/apps.c

@@ -47 +47 @@
 #include "helpers\prfh.h"
 #include "helpers\stringh.h"
+#include "helpers\winh.h"
 #include "helpers\xstring.h"
 
@@ -797 +798 @@
  *          from the shell.
  *
- +      --  However, if you specify an environment, you _must_
- *          specify a complemete environment. This function
+ *      --  However, if you specify an environment, you _must_
+ *          specify a complete environment. This function
  *          will not merge environments. Use
  *          appSetEnvironmentVar to change environment
@@ -808 +809 @@
  *          See appQueryDefaultWin31Environment.
  *
- *      --  WARNING: Since this uses WinStartApp internally,
- *          and WinStartApp completely hangs PM if a Win-OS/2
- *          full-screen session is started from a thread that
- *          is NOT thread1, THIS SHOULD ONLY BE CALLED ON
- *          THREAD 1 of your application.
- *
  *      Even though this isn't clearly said in PMREF,
  *      PROGDETAILS.swpInitial is important:
@@ -823 +818 @@
  *         This flag is now in the newer toolkit headers.
  *
+ *      In addition, this supports the following session
+ *      flags with ulFlags if PROG_DEFAULT is specified:
+ *
+ *      --  APP_RUN_FULLSCREEN
+ *
+ *      --  APP_RUN_ENHANCED
+ *
+ *      --  APP_RUN_STANDARD
+ *
+ *      --  APP_RUN_SEPARATE
+ *
  *      Since this calls WinStartApp in turn, this
  *      requires a message queue on the calling thread.
+ *
+ *      Note that this also does minimal checking on
+ *      the specified parameters so it can return something
+ *      more meaningful than FALSE like WinStartApp.
+ *      As a result, you get a DOS error code now (V0.9.16).
+ *
+ *      Most importantly:
+ *
+ *      --  ERROR_INVALID_THREADID: not running on thread 1.
+ *          Since this uses WinStartApp internally and
+ *          WinStartApp completely hangs the session manager
+ *          if a Win-OS/2 full-screen session is started from
+ *          a thread that is NOT thread1, this will fail
+ *          with an error for safety (V0.9.16).
+ *
+ *      --  ERROR_INVALID_PARAMETER: pcProgDetails or
+ *          phapp is NULL; or PROGDETAILS.pszExecutable is NULL.
+ *
+ *      --  ERROR_FILE_NOT_FOUND, ERROR_PATH_NOT_FOUND:
+ *          PROGDETAILS.pszExecutable and/or PROGDETAILS.pszStartupDir
+ *          are invalid.
+ *          A NULL PROGDETAILS.pszStartupDir is supported though.
+ *
+ *      --  ERROR_NOT_ENOUGH_MEMORY
  *
  *@@added V0.9.6 (2000-10-16) [umoeller]
@@ -834 +864 @@
  *@@changed V0.9.14 (2001-08-07) [pr]: removed some env. strings for Win. apps.
  *@@changed V0.9.14 (2001-08-23) [pr]: added session type options
- */
-
-HAPP appStartApp(HWND hwndNotify,                  // in: notify window (as with WinStartApp)
-                 const PROGDETAILS *pcProgDetails, // in: program data
-                 ULONG ulFlags)                    // in: session type options
-{
-    HAPP            happ = NULLHANDLE;
-    XSTRING         strParamsPatched;
+ *@@changed V0.9.16 (2001-10-19) [umoeller]: added prototype to return APIRET
+ *@@changed V0.9.16 (2001-10-19) [umoeller]: added thread-1 check
+ */
+
+APIRET appStartApp(HWND hwndNotify,        // in: notify window or NULLHANDLE
+                   const PROGDETAILS *pcProgDetails, // in: program spec (req.)
+                   ULONG ulFlags,          // in: APP_RUN_* flags
+                   HAPP *phapp)            // out: application handle if NO_ERROR is returned
+{
+    APIRET          arc = NO_ERROR;
     PROGDETAILS     ProgDetails;
 
-    PSZ             pszWinOS2Env = 0;
+    if (!pcProgDetails || !phapp)
+        return (ERROR_INVALID_PARAMETER);
 
     memcpy(&ProgDetails, pcProgDetails, sizeof(PROGDETAILS));
@@ -850 +883 @@
     ProgDetails.Length = sizeof(PROGDETAILS);
     ProgDetails.progt.fbVisible = SHE_VISIBLE;
-    // ProgDetails.pszEnvironment = 0;
 
     // all this only makes sense if this contains something...
     // besides, this crashed on string comparisons V0.9.9 (2001-01-27) [umoeller]
-    if (ProgDetails.pszExecutable)
-    {
-        ULONG ulIsWinApp;
+    if (!ProgDetails.pszExecutable)
+        arc = ERROR_INVALID_PARAMETER;
+    else if (doshMyTID() != 1)          // V0.9.16 (2001-10-19) [umoeller]
+        arc = ERROR_INVALID_THREADID;
+    else
+    {
+        ULONG           ulIsWinApp;
+
+        XSTRING         strParamsPatched;
+        PSZ             pszWinOS2Env = 0;
 
         // memset(&ProgDetails.swpInitial, 0, sizeof(SWP));
@@ -891 +930 @@
         }
 
-        // Set session type from option flags
+        // set session type from option flags
         if (ulFlags & APP_RUN_FULLSCREEN)
         {
@@ -919 +958 @@
                                                 : PROG_31_ENHSEAMLESSCOMMON;
             }
+
+            // re-run V0.9.16 (2001-10-19) [umoeller]
+            ulIsWinApp = appIsWindowsApp(ProgDetails.progt.progc);
         }
 
@@ -968 +1010 @@
         else
         {
-            PSZ pszExtension;
-            switch (ProgDetails.progt.progc)
-            {
-                /*
-                 *  .CMD files fixups
-                 *
-                 */
-
-                case PROG_FULLSCREEN:       // OS/2 fullscreen
-                case PROG_WINDOWABLEVIO:    // OS/2 window
+            // now check if the executable is valid
+            // V0.9.16 (2001-10-19) [umoeller]
+            ULONG ulAttr;
+            _Pmpf(("  %d now, checking %s", arc, ProgDetails.pszExecutable));
+            if (!(arc = doshQueryPathAttr(ProgDetails.pszExecutable,
+                                          &ulAttr)))
+            {
+                // make sure startup dir is really a directory
+                if (ProgDetails.pszStartupDir)
                 {
-                    if (    (pszExtension = doshGetExtension(ProgDetails.pszExecutable))
-                         && (!stricmp(pszExtension, "CMD"))
+                    _Pmpf(("  checking %s", ProgDetails.pszStartupDir));
+                    if (!(arc = doshQueryPathAttr(ProgDetails.pszStartupDir,
+                                                  &ulAttr)))
+                        if (!(ulAttr & FILE_DIRECTORY))
+                            arc = ERROR_PATH_NOT_FOUND;
+                                        // @@todo
+                }
+            }
+
+            _Pmpf(("  after checking %d", arc));
+
+            if (!arc)
+            {
+                PSZ pszExtension;
+                switch (ProgDetails.progt.progc)
+                {
+                    /*
+                     *  .CMD files fixups
+                     *
+                     */
+
+                    case PROG_FULLSCREEN:       // OS/2 fullscreen
+                    case PROG_WINDOWABLEVIO:    // OS/2 window
+                    {
+                        if (    (pszExtension = doshGetExtension(ProgDetails.pszExecutable))
+                             && (!stricmp(pszExtension, "CMD"))
+                           )
+                        {
+                            CallBatchCorrectly(&ProgDetails,
+                                               &strParamsPatched,
+                                               "OS2_SHELL",
+                                               "CMD.EXE");
+                        }
+                    break; }
+
+                    case PROG_VDM:              // DOS fullscreen
+                    case PROG_WINDOWEDVDM:      // DOS window
+                    {
+                        if (    (pszExtension = doshGetExtension(ProgDetails.pszExecutable))
+                             && (!stricmp(pszExtension, "BAT"))
+                           )
+                        {
+                            CallBatchCorrectly(&ProgDetails,
+                                               &strParamsPatched,
+                                               NULL,
+                                               "COMMAND.COM");
+                        }
+                    break; }
+                } // end switch (ProgDetails.progt.progc)
+            }
+        }
+
+        if (!arc)
+        {
+            if (    (ulIsWinApp)
+                 && (    (ProgDetails.pszEnvironment == NULL)
+                      || (!strlen(ProgDetails.pszEnvironment))
+                    )
+               )
+            {
+                // this is a windoze app, and caller didn't bother
+                // to give us an environment:
+                // we MUST set one then, or we'll get the strangest
+                // errors, up to system hangs. V0.9.12 (2001-05-26) [umoeller]
+
+                DOSENVIRONMENT Env = {0};
+
+                // get standard WIN-OS/2 environment
+                PSZ pszTemp = appQueryDefaultWin31Environment();
+
+                if (!(arc = appParseEnvironment(pszTemp,
+                                                &Env)))
+                {
+                    // now override KBD_CTRL_BYPASS=CTRL_ESC
+                    if (    (!(arc = appSetEnvironmentVar(&Env,
+                                                          "KBD_CTRL_BYPASS=CTRL_ESC",
+                                                          FALSE)))        // add last
+                         && (!(arc = appConvertEnvironment(&Env,
+                                                           &pszWinOS2Env,   // freed at bottom
+                                                           NULL)))
                        )
+                        ProgDetails.pszEnvironment = pszWinOS2Env;
+
+                    appFreeEnvironment(&Env);
+                }
+
+                free(pszTemp);
+            }
+
+            if (!arc)
+            {
+                if (!ProgDetails.pszTitle)
+                    ProgDetails.pszTitle = ProgDetails.pszExecutable;
+
+                ProgDetails.pszParameters = strParamsPatched.psz;
+
+                /*  _Pmpf(("progt.progc: %d", ProgDetails.progt.progc));
+                _Pmpf(("progt.fbVisible: 0x%lX", ProgDetails.progt.fbVisible));
+                _Pmpf(("progt.pszTitle: \"%s\"", (ProgDetails.pszTitle) ? ProgDetails.pszTitle : "NULL"));
+                _Pmpf(("exec: \"%s\"", (ProgDetails.pszExecutable) ? ProgDetails.pszExecutable : "NULL"));
+                _Pmpf(("params: \"%s\"", (ProgDetails.pszParameters) ? ProgDetails.pszParameters : "NULL"));
+                _Pmpf(("startup: \"%s\"", (ProgDetails.pszStartupDir) ? ProgDetails.pszStartupDir : "NULL"));
+                _Pmpf(("pszIcon: \"%s\"", (ProgDetails.pszIcon) ? ProgDetails.pszIcon : "NULL"));
+                _Pmpf(("environment: "));
+                {
+                    PSZ pszThis = ProgDetails.pszEnvironment;
+                    while (pszThis && *pszThis)
                     {
-                        CallBatchCorrectly(&ProgDetails,
-                                           &strParamsPatched,
-                                           "OS2_SHELL",
-                                           "CMD.EXE");
+                        _Pmpf(("  \"%s\"", pszThis));
+                        pszThis += strlen(pszThis) + 1;
                     }
-                break; }
-
-                case PROG_VDM:              // DOS fullscreen
-                case PROG_WINDOWEDVDM:      // DOS window
-                {
-                    if (    (pszExtension = doshGetExtension(ProgDetails.pszExecutable))
-                         && (!stricmp(pszExtension, "BAT"))
-                       )
-                    {
-                        CallBatchCorrectly(&ProgDetails,
-                                           &strParamsPatched,
-                                           NULL,
-                                           "COMMAND.COM");
-                    }
-                break; }
-            } // end switch (ProgDetails.progt.progc)
-        }
-
-        if (    (ulIsWinApp)
-             && (    (ProgDetails.pszEnvironment == NULL)
-                  || (!strlen(ProgDetails.pszEnvironment))
-                )
-           )
-        {
-            // this is a windoze app, and caller didn't bother
-            // to give us an environment:
-            // we MUST set one then, or we'll get the strangest
-            // errors, up to system hangs. V0.9.12 (2001-05-26) [umoeller]
-
-            DOSENVIRONMENT Env = {0};
-
-            // get standard WIN-OS/2 environment
-            PSZ pszTemp = appQueryDefaultWin31Environment();
-
-            if (!appParseEnvironment(pszTemp,
-                                     &Env))
-            {
-                // now override KBD_CTRL_BYPASS=CTRL_ESC
-                appSetEnvironmentVar(&Env,
-                                     "KBD_CTRL_BYPASS=CTRL_ESC",
-                                     FALSE);        // add last
-                /*
-                 * These should be set by the default environment. It is
-                 * not our business to override them really. V0.9.14
-                 *
-                appSetEnvironmentVar(&Env,
-                                     "KBD_ALTHOME_BYPASS=1",
-                                     FALSE);        // add last
-                appSetEnvironmentVar(&Env,
-                                     "INT_DURING_IO=1",
-                                     FALSE);        // add last
-                appSetEnvironmentVar(&Env,
-                                     "HW_TIMER=1",
-                                     FALSE);        // add last
-                appSetEnvironmentVar(&Env,
-                                     "MOUSE_EXCLUSIVE_ACCESS=0",
-                                     FALSE);        // add last
-                appSetEnvironmentVar(&Env,
-                                     "VIDEO_RETRACE_EMULATION=1",
-                                     FALSE);        // add last
-                appSetEnvironmentVar(&Env,
-                                     "VIDEO_SWITCH_NOTIFICATION=1",
-                                     FALSE);        // add last
-                appSetEnvironmentVar(&Env,
-                                     "VIDEO_8514A_XGA_IOTRAP=0",
-                                     FALSE);        // add last
-                 */
-
-                if (!appConvertEnvironment(&Env,
-                                           &pszWinOS2Env,   // freed at bottom
-                                           NULL))
-                    ProgDetails.pszEnvironment = pszWinOS2Env;
-
-                appFreeEnvironment(&Env);
-            }
-
-            free(pszTemp);
-        }
-
-        if (!ProgDetails.pszTitle)
-            ProgDetails.pszTitle = ProgDetails.pszExecutable;
-
-        ProgDetails.pszParameters = strParamsPatched.psz;
-
-        /*  _Pmpf(("progt.progc: %d", ProgDetails.progt.progc));
-        _Pmpf(("progt.fbVisible: 0x%lX", ProgDetails.progt.fbVisible));
-        _Pmpf(("progt.pszTitle: \"%s\"", (ProgDetails.pszTitle) ? ProgDetails.pszTitle : "NULL"));
-        _Pmpf(("exec: \"%s\"", (ProgDetails.pszExecutable) ? ProgDetails.pszExecutable : "NULL"));
-        _Pmpf(("params: \"%s\"", (ProgDetails.pszParameters) ? ProgDetails.pszParameters : "NULL"));
-        _Pmpf(("startup: \"%s\"", (ProgDetails.pszStartupDir) ? ProgDetails.pszStartupDir : "NULL"));
-        _Pmpf(("pszIcon: \"%s\"", (ProgDetails.pszIcon) ? ProgDetails.pszIcon : "NULL"));
-        _Pmpf(("environment: "));
-        {
-            PSZ pszThis = ProgDetails.pszEnvironment;
-            while (pszThis && *pszThis)
-            {
-                _Pmpf(("  \"%s\"", pszThis));
-                pszThis += strlen(pszThis) + 1;
-            }
-        }
-
-        _Pmpf(("swpInitial.fl = 0x%lX, x = %d, y = %d, cx = %d, cy = %d:",
-                    ProgDetails.swpInitial.fl,
-                    ProgDetails.swpInitial.x,
-                    ProgDetails.swpInitial.y,
-                    ProgDetails.swpInitial.cx,
-                    ProgDetails.swpInitial.cy));
-        _Pmpf(("  behind = %d, hwnd = %d, res1 = %d, res2 = %d",
-                    ProgDetails.swpInitial.hwndInsertBehind,
-                    ProgDetails.swpInitial.hwnd,
-                    ProgDetails.swpInitial.ulReserved1,
-                    ProgDetails.swpInitial.ulReserved2));
-            */
-
-        /* if (WinMessageBox(HWND_DESKTOP,
-                          NULLHANDLE,
-                          (ProgDetails.pszExecutable) ? ProgDetails.pszExecutable : "NULL",
-                          "Start?",
-                          0,
-                          MB_YESNO | MB_MOVEABLE)
-                  == MBID_YES) */
-        happ = WinStartApp(hwndNotify,
-                                    // receives WM_APPTERMINATENOTIFY
-                           &ProgDetails,
-                           strParamsPatched.psz,
-                           NULL,            // "reserved", PMREF says...
-                           SAF_INSTALLEDCMDLINE);
-                                // we MUST use SAF_INSTALLEDCMDLINE
-                                // or no Win-OS/2 session will start...
-                                // whatever is going on here... Warp 4 FP11
-
-                                // do not use SAF_STARTCHILDAPP, or the
-                                // app will be terminated automatically
-                                // when the WPS terminates!
-
-        // _Pmpf((__FUNCTION__ ": got happ 0x%lX", happ));
+                }
+
+                _Pmpf(("swpInitial.fl = 0x%lX, x = %d, y = %d, cx = %d, cy = %d:",
+                            ProgDetails.swpInitial.fl,
+                            ProgDetails.swpInitial.x,
+                            ProgDetails.swpInitial.y,
+                            ProgDetails.swpInitial.cx,
+                            ProgDetails.swpInitial.cy));
+                _Pmpf(("  behind = %d, hwnd = %d, res1 = %d, res2 = %d",
+                            ProgDetails.swpInitial.hwndInsertBehind,
+                            ProgDetails.swpInitial.hwnd,
+                            ProgDetails.swpInitial.ulReserved1,
+                            ProgDetails.swpInitial.ulReserved2));
+                    */
+
+                /* if (WinMessageBox(HWND_DESKTOP,
+                                  NULLHANDLE,
+                                  (ProgDetails.pszExecutable) ? ProgDetails.pszExecutable : "NULL",
+                                  "Start?",
+                                  0,
+                                  MB_YESNO | MB_MOVEABLE)
+                          == MBID_YES) */
+                if (!(*phapp = WinStartApp(hwndNotify,
+                                                    // receives WM_APPTERMINATENOTIFY
+                                           &ProgDetails,
+                                           strParamsPatched.psz,
+                                           NULL,            // "reserved", PMREF says...
+                                           SAF_INSTALLEDCMDLINE)))
+                                                // we MUST use SAF_INSTALLEDCMDLINE
+                                                // or no Win-OS/2 session will start...
+                                                // whatever is going on here... Warp 4 FP11
+
+                                                // do not use SAF_STARTCHILDAPP, or the
+                                                // app will be terminated automatically
+                                                // when the WPS terminates!
+                    arc = ERROR_BAD_FORMAT;
+                            // @@todo we can probably do better
+                            // V0.9.16 (2001-10-19) [umoeller]
+
+                // _Pmpf((__FUNCTION__ ": got happ 0x%lX", happ));
+            }
+        }
 
         xstrClear(&strParamsPatched);
@@ -1130 +1179 @@
     } // end if (ProgDetails.pszExecutable)
 
-    return (happ);
-}
-
-
+    _Pmpf((__FUNCTION__ ": returning %d", arc));
+
+    return (arc);
+}
+
+/*
+ *@@ appWaitForApp:
+ *      waits for the specified application to terminate
+ *      and returns its exit code.
+ *
+ *@@added V0.9.9 (2001-03-07) [umoeller]
+ */
+
+BOOL appWaitForApp(HWND hwndNotify,     // in: notify window
+                   HAPP happ,           // in: app to wait for
+                   PULONG pulExitCode)  // out: exit code (ptr can be NULL)
+{
+    BOOL brc = FALSE;
+
+    if (happ)
+    {
+        // app started:
+        // enter a modal message loop until we get the
+        // WM_APPTERMINATENOTIFY for happ. Then we
+        // know the app is done.
+        HAB     hab = WinQueryAnchorBlock(hwndNotify);
+        QMSG    qmsg;
+        // ULONG   ulXFixReturnCode = 0;
+        while (WinGetMsg(hab, &qmsg, NULLHANDLE, 0, 0))
+        {
+            if (    (qmsg.msg == WM_APPTERMINATENOTIFY)
+                 && (qmsg.hwnd == hwndNotify)
+                 && (qmsg.mp1 == (MPARAM)happ)
+               )
+            {
+                // xfix has terminated:
+                // get xfix return code from mp2... this is:
+                // -- 0: everything's OK, continue.
+                // -- 1: handle section was rewritten, restart Desktop
+                //       now.
+                if (pulExitCode)
+                    *pulExitCode = (ULONG)qmsg.mp2;
+                brc = TRUE;
+                // do not dispatch this
+                break;
+            }
+
+            WinDispatchMsg(hab, &qmsg);
+        }
+    }
+
+    return (brc);
+}
+
+/*
+ *@@ appQuickStartApp:
+ *      shortcut for simply starting an app and
+ *      waiting until it's finished.
+ *
+ *      On errors, NULLHANDLE is returned.
+ *
+ *      If pulReturnCode != NULL, it receives the
+ *      return code of the app.
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ */
+
+HAPP appQuickStartApp(const char *pcszFile,
+                      ULONG ulProgType,         // e.g. PROG_PM
+                      const char *pcszArgs,
+                      PULONG pulExitCode)
+{
+    PROGDETAILS    pd = {0};
+    HAPP           happ,
+                   happReturn = NULLHANDLE;
+    CHAR           szDir[CCHMAXPATH] = "";
+    PCSZ           p;
+    HWND           hwndObject;
+
+    pd.Length = sizeof(pd);
+    pd.progt.progc = ulProgType;
+    pd.progt.fbVisible = SHE_VISIBLE;
+    pd.pszExecutable = (PSZ)pcszFile;
+    pd.pszParameters = (PSZ)pcszArgs;
+    if (p = strrchr(pcszFile, '\\'))
+    {
+       strhncpy0(szDir,
+                 pcszFile,
+                 p - pcszFile);
+       pd.pszStartupDir = szDir;
+    }
+
+    if (    (hwndObject = winhCreateObjectWindow(WC_STATIC, NULL))
+         && (!appStartApp(hwndObject,
+                          &pd,
+                          0,
+                          &happ))
+       )
+    {
+        if (appWaitForApp(hwndObject,
+                          happ,
+                          pulExitCode))
+            happReturn = happ;
+    }
+
+    return (happReturn);
+}

trunk/src/helpers/dialog.c

@@ -1576 +1576 @@
  *          fl specifies formatting flags for the row. This
  *          can be one of ROW_VALIGN_BOTTOM, ROW_VALIGN_CENTER,
- *          ROW_VALIGN_TOP and affects all items in the control.
+ *          ROW_VALIGN_TOP and affects all items in the row.
  *
  *      --  CONTROL_DEF(pDef) defines a control in a table row.
@@ -1892 +1892 @@
  *          dialog should be modified according to
  *          flFlags.
+ *
+ *      This is what's used in XWorkplace for notebook
+ *      settings pages since these always have to be
+ *      based on a resource dialog (which is loaded
+ *      empty).
  *
  *      flFlags can be any combination of the following:

trunk/src/helpers/dosh.c

@@ -51 +51 @@
 #define INCL_DOSSESMGR
 #define INCL_DOSQUEUES
+#define INCL_DOSSEMAPHORES
 #define INCL_DOSMISC
 #define INCL_DOSDEVICES
@@ -62 +63 @@
 #include <string.h>
 #include <stdio.h>
+#include <stdarg.h>
 
 #include "setup.h"                      // code generation and debugging options
 
 #include "helpers\dosh.h"
+#include "helpers\standards.h"
 
 #pragma hdrstop
@@ -286 +289 @@
  *
  ********************************************************************/
+
+/*
+ *@@ Allocate:
+ *      wrapper around malloc() which automatically
+ *      sets ERROR_NOT_ENOUGH_MEMORY.
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ */
+
+PVOID doshMalloc(ULONG cb,
+                 APIRET *parc)
+{
+    PVOID pv;
+    *parc = NO_ERROR;
+    if (!(pv = malloc(cb)))
+        *parc = ERROR_NOT_ENOUGH_MEMORY;
+
+    return (pv);
+}
 
 /*
@@ -1281 +1303 @@
  *      Use doshQueryPathSize to query the size of
  *      any file.
- */
-
-ULONG doshQueryFileSize(HFILE hFile)
-{
+ *
+ *@@changed V0.9.16 (2001-10-19) [umoeller]: now returning APIRET
+ */
+
+APIRET doshQueryFileSize(HFILE hFile,
+                         PULONG pulSize)
+{
+    APIRET arc;
     FILESTATUS3 fs3;
-    if (DosQueryFileInfo(hFile, FIL_STANDARD, &fs3, sizeof(fs3)))
-        return (0);
-    else
-        return (fs3.cbFile);
+    if (!(arc = DosQueryFileInfo(hFile, FIL_STANDARD, &fs3, sizeof(fs3))))
+        *pulSize = fs3.cbFile;
+    return (arc);
 }
 
@@ -1299 +1324 @@
  *      Use doshQueryFileSize instead to query the
  *      size if you have a HFILE.
- */
-
-ULONG doshQueryPathSize(PSZ pszFile)
-{
+ *
+ *@@changed V0.9.16 (2001-10-19) [umoeller]: now returning APIRET
+ */
+
+APIRET doshQueryPathSize(PCSZ pcszFile,
+                         PULONG pulSize)
+{
+    APIRET arc;
     FILESTATUS3 fs3;
-    if (DosQueryPathInfo(pszFile, FIL_STANDARD, &fs3, sizeof(fs3)))
-        return (0);
-    else
-        return (fs3.cbFile);
+    if (!(arc = DosQueryPathInfo((PSZ)pcszFile, FIL_STANDARD, &fs3, sizeof(fs3))))
+        *pulSize = fs3.cbFile;
+    return (arc);
 }
 
@@ -1499 +1527 @@
 
 /*
+ * doshOpen:
+ *      wrapper around DosOpen for simpler opening
+ *      of files.
+ *
+ *      ulOpenMode determines the mode to open the
+ *      file in:
+ *
+ +      +-------------------------+------+-----------+-----------+
+ +      |                         |      |           |           |
+ +      |  ulOpenMode             | mode | if exists | if new    |
+ +      +-------------------------+------+-----------+-----------+
+ +      |  XOPEN_READ_EXISTING    | read | opens     | fails     |
+ +      +-------------------------+------+-----------+-----------+
+ +      |  XOPEN_READWRITE_APPEND | r/w  | opens,    | creates   |
+ +      |                         |      | appends   |           |
+ +      +-------------------------+------+-----------+-----------+
+ +      |  XOPEN_READWRITE_NEW    | r/w  | replaces  | creates   |
+ +      +-------------------------+------+-----------+-----------+
+ *
+ *      *ppFile receives a new XFILE structure describing
+ *      the open file, if NO_ERROR is returned.
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ */
+
+APIRET doshOpen(const char *pcszFilename,   // in: filename to open
+                ULONG ulOpenMode,       // in: XOPEN_* mode
+                PULONG pcbFile,         // in: new file size (if new file is created)
+                                        // out: file size
+                PXFILE *ppFile)
+{
+    APIRET arc = NO_ERROR;
+
+    ULONG   fsOpenFlags = 0,
+            fsOpenMode =    OPEN_FLAGS_FAIL_ON_ERROR
+                          | OPEN_FLAGS_NO_LOCALITY
+                          | OPEN_FLAGS_NOINHERIT;
+
+    switch (ulOpenMode)
+    {
+        case XOPEN_READ_EXISTING:
+            fsOpenFlags =   OPEN_ACTION_FAIL_IF_NEW
+                          | OPEN_ACTION_OPEN_IF_EXISTS;
+            fsOpenMode |=   OPEN_SHARE_DENYWRITE
+                          | OPEN_ACCESS_READONLY;
+        break;
+
+        case XOPEN_READWRITE_APPEND:
+            fsOpenFlags =   OPEN_ACTION_CREATE_IF_NEW
+                          | OPEN_ACTION_OPEN_IF_EXISTS;
+            fsOpenMode |=   OPEN_SHARE_DENYREADWRITE
+                          | OPEN_ACCESS_READWRITE;
+        break;
+
+        case XOPEN_READWRITE_NEW:
+            fsOpenFlags =   OPEN_ACTION_CREATE_IF_NEW
+                          | OPEN_ACTION_REPLACE_IF_EXISTS;
+            fsOpenMode |=   OPEN_SHARE_DENYREADWRITE
+                          | OPEN_ACCESS_READWRITE;
+        break;
+    }
+
+    if (pcszFilename && fsOpenFlags && pcbFile && ppFile)
+    {
+        PXFILE pFile;
+        if (pFile = NEW(XFILE))
+        {
+            ULONG ulAction;
+
+            ZERO(pFile);
+
+            if (!(arc = DosOpen((PSZ)pcszFilename,
+                                &pFile->hf,
+                                &ulAction,
+                                *pcbFile,
+                                FILE_ARCHIVED,
+                                fsOpenFlags,
+                                fsOpenMode,
+                                NULL)))       // EAs
+            {
+                // alright, got the file:
+
+                if (    (ulAction == FILE_EXISTED)
+                     && (ulOpenMode == XOPEN_READWRITE_APPEND)
+                   )
+                    // get its size and set ptr to end for append
+                    arc = DosSetFilePtr(pFile->hf,
+                                        0,
+                                        FILE_END,
+                                        pcbFile);
+                else
+                    arc = doshQueryFileSize(pFile->hf,
+                                            pcbFile);
+                    // file ptr is at beginning
+
+                // store file size
+                pFile->cbInitial
+                = pFile->cbCurrent
+                = *pcbFile;
+            }
+
+            if (arc)
+                doshClose(&pFile);
+            else
+                *ppFile = pFile;
+        }
+        else
+            arc = ERROR_NOT_ENOUGH_MEMORY;
+    }
+    else
+        arc = ERROR_INVALID_PARAMETER;
+
+    return (arc);
+}
+
+/*
+ *@@ doshLockFile:
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ */
+
+APIRET doshLockFile(PXFILE pFile)
+{
+    if (!pFile)
+        return (ERROR_INVALID_PARAMETER);
+
+    if (!pFile->hmtx)
+        // first call:
+        return (DosCreateMutexSem(NULL,
+                                  &pFile->hmtx,
+                                  0,
+                                  TRUE));        // request!
+
+    return (DosRequestMutexSem(pFile->hmtx, SEM_INDEFINITE_WAIT));
+}
+
+/*
+ *@@ doshUnlockFile:
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ */
+
+APIRET doshUnlockFile(PXFILE pFile)
+{
+    if (pFile)
+        return (DosReleaseMutexSem(pFile->hmtx));
+
+    return (ERROR_INVALID_PARAMETER);
+}
+
+/*
+ *@@ doshWrite:
+ *      writes the specified data to the file.
+ *      If (cb == 0), this runs strlen on pcsz
+ *      to find out the length.
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ */
+
+APIRET doshWrite(PXFILE pFile,
+                 PCSZ pcsz,
+                 ULONG cb)
+{
+    APIRET arc;
+    if (!pcsz)
+        arc = ERROR_INVALID_PARAMETER;
+    else
+    {
+        if (!cb)
+            cb = strlen(pcsz);
+
+        if (!cb)
+            arc = ERROR_INVALID_PARAMETER;
+        else
+            if (!(arc = doshLockFile(pFile)))   // this checks for pFile
+            {
+                ULONG cbWritten;
+                if (!(arc = DosWrite(pFile->hf,
+                                     (PSZ)pcsz,
+                                     cb,
+                                     &cbWritten)))
+                    pFile->cbCurrent += cbWritten;
+
+                doshUnlockFile(pFile);
+            }
+    }
+
+    return (arc);
+}
+
+/*
+ *@@ doshWriteLogEntry
+ *      writes a log string to an XFILE, adding a
+ *      leading timestamp before the line.
+ *
+ *      The internal string buffer is limited to 2000
+ *      characters. \n is NOT translated to \r\n before
+ *      writing.
+ */
+
+APIRET doshWriteLogEntry(PXFILE pFile,
+                         const char* pcszFormat,
+                         ...)
+{
+    APIRET arc;
+
+    DATETIME dt;
+    CHAR szTemp[2000];
+    ULONG   ulLength;
+
+    DosGetDateTime(&dt);
+    if (ulLength = sprintf(szTemp,
+                           "%04d-%02d-%02d %02d:%02d:%02d:%02d ",
+                           dt.year, dt.month, dt.day,
+                           dt.hours, dt.minutes, dt.seconds, dt.hundredths))
+    {
+        if (!(arc = doshWrite(pFile,
+                              szTemp,
+                              ulLength)))
+        {
+            va_list arg_ptr;
+            va_start(arg_ptr, pcszFormat);
+            ulLength = vsprintf(szTemp, pcszFormat, arg_ptr);
+            va_end(arg_ptr);
+
+            szTemp[ulLength++] = '\r';
+            szTemp[ulLength++] = '\n';
+
+            arc = doshWrite(pFile,
+                            (PVOID)szTemp,
+                            ulLength);
+        }
+    }
+
+    return (arc);
+}
+
+/*
+ * doshClose:
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ */
+
+APIRET doshClose(PXFILE *ppFile)
+{
+    APIRET arc = NO_ERROR;
+    PXFILE pFile;
+
+    if (    (ppFile)
+         && (pFile = *ppFile)
+       )
+    {
+        // request the mutex so that we won't be
+        // taking the file away under someone's butt
+        if (!(arc = doshLockFile(pFile)))
+        {
+            HMTX hmtx = pFile->hmtx;
+            pFile->hmtx = NULLHANDLE;
+
+            // now that the file is locked,
+            // set the ptr to NULL
+            *ppFile = NULL;
+
+            if (pFile->hf)
+            {
+                DosSetFileSize(pFile->hf, pFile->cbCurrent);
+                DosClose(pFile->hf);
+                pFile->hf = NULLHANDLE;
+            }
+
+            doshUnlockFile(pFile);
+            DosCloseMutexSem(pFile->hmtx);
+        }
+
+        free(pFile);
+    }
+    else
+        arc = ERROR_INVALID_PARAMETER;
+
+    return (arc);
+}
+
+/*
  *@@ doshLoadTextFile:
  *      reads a text file from disk, allocates memory
@@ -1521 +1832 @@
     PSZ     pszContent = NULL;
 
-    APIRET arc = DosOpen((PSZ)pcszFile,
-                         &hFile,
-                         &ulAction,                      // action taken
-                         5000L,                          // primary allocation size
-                         FILE_ARCHIVED | FILE_NORMAL,    // file attribute
-                         OPEN_ACTION_OPEN_IF_EXISTS,     // open flags
-                         OPEN_FLAGS_NOINHERIT
-                            | OPEN_SHARE_DENYNONE
-                            | OPEN_ACCESS_READONLY,      // read-only mode
-                         NULL);                          // no EAs
-
-    if (arc == NO_ERROR)
-    {
-        ulSize = doshQueryFileSize(hFile);
-        pszContent = (PSZ)malloc(ulSize+1);
-        arc = DosSetFilePtr(hFile,
-                            0L,
-                            FILE_BEGIN,
-                            &ulLocal);
-        arc = DosRead(hFile,
-                      pszContent,
-                      ulSize,
-                      &ulBytesRead);
+    APIRET arc;
+
+    *ppszContent = 0;
+
+    if (!(arc = DosOpen((PSZ)pcszFile,
+                        &hFile,
+                        &ulAction,                      // action taken
+                        5000L,                          // primary allocation size
+                        FILE_ARCHIVED | FILE_NORMAL,    // file attribute
+                        OPEN_ACTION_OPEN_IF_EXISTS,     // open flags
+                        OPEN_FLAGS_NOINHERIT
+                           | OPEN_SHARE_DENYNONE
+                           | OPEN_ACCESS_READONLY,      // read-only mode
+                        NULL)))                         // no EAs
+    {
+        if (!(arc = doshQueryFileSize(hFile, &ulSize)))
+        {
+            pszContent = (PSZ)malloc(ulSize+1);
+
+            if (!(arc = DosSetFilePtr(hFile,
+                                      0L,
+                                      FILE_BEGIN,
+                                      &ulLocal)))
+                if (!(arc = DosRead(hFile,
+                                    pszContent,
+                                    ulSize,
+                                    &ulBytesRead)))
+                {
+                    *(pszContent+ulBytesRead) = 0;
+                    // set output buffer pointer
+                    *ppszContent = pszContent;
+                }
+
+            if (arc)
+                free(pszContent);
+        }
         DosClose(hFile);
-        *(pszContent+ulBytesRead) = 0;
-
-        // set output buffer pointer
-        *ppszContent = pszContent;
-    }
-    else
-        *ppszContent = 0;
+    }
 
     return (arc);
@@ -1577 +1895 @@
     ULONG   ulCount = 1;
     CHAR    szCount[5];
+    ULONG   ulDummy;
 
     strcpy(szFilename, pszExisting);
@@ -1588 +1907 @@
         strcpy(pszLastDot, szCount);
         ulCount++;
-    } while (doshQueryPathSize(szFilename) != 0);
+    } while (!doshQueryPathSize(szFilename, &ulDummy));
 
     return (strdup(szFilename));
@@ -1803 +2122 @@
         }
 
-        arc = DosOpen((PSZ)pszFile,
-                      &hFile,
-                      &ulAction,                      // action taken
-                      ulSize,                         // primary allocation size
-                      FILE_ARCHIVED | FILE_NORMAL,    // file attribute
-                      OPEN_ACTION_CREATE_IF_NEW
-                         | OPEN_ACTION_REPLACE_IF_EXISTS,  // open flags
-                      OPEN_FLAGS_NOINHERIT
-                         | OPEN_FLAGS_SEQUENTIAL         // sequential, not random access
-                         | OPEN_SHARE_DENYWRITE          // deny write mode
-                         | OPEN_ACCESS_WRITEONLY,        // write mode
-                      NULL);                          // no EAs
-
-        if (arc == NO_ERROR)
+        if (!(arc = DosOpen((PSZ)pszFile,
+                            &hFile,
+                            &ulAction,                      // action taken
+                            ulSize,                         // primary allocation size
+                            FILE_ARCHIVED | FILE_NORMAL,    // file attribute
+                            OPEN_ACTION_CREATE_IF_NEW
+                               | OPEN_ACTION_REPLACE_IF_EXISTS,  // open flags
+                            OPEN_FLAGS_NOINHERIT
+                               | OPEN_FLAGS_SEQUENTIAL         // sequential, not random access
+                               | OPEN_SHARE_DENYWRITE          // deny write mode
+                               | OPEN_ACCESS_WRITEONLY,        // write mode
+                            NULL)))                         // no EAs
         {
-            arc = DosSetFilePtr(hFile,
-                                0L,
-                                FILE_BEGIN,
-                                &ulLocal);
-            if (arc == NO_ERROR)
-            {
-                arc = DosWrite(hFile,
-                               (PVOID)pszContent,
-                               ulSize,
-                               &ulWritten);
-                if (arc == NO_ERROR)
+            if (!(arc = DosSetFilePtr(hFile,
+                                      0L,
+                                      FILE_BEGIN,
+                                      &ulLocal)))
+                if (!(arc = DosWrite(hFile,
+                                     (PVOID)pszContent,
+                                     ulSize,
+                                     &ulWritten)))
                     arc = DosSetFileSize(hFile, ulSize);
-            }
 
             DosClose(hFile);
@@ -1840 +2153 @@
 
     return (arc);
-}
-
-/*
- *@@ doshOpenLogFile:
- *      this opens a log file in the root directory of
- *      the boot drive; it is titled pszFilename, and
- *      the file handle is returned.
- */
-
-HFILE doshOpenLogFile(const char* pcszFilename)
-{
-    APIRET  rc;
-    CHAR    szFileName[CCHMAXPATH];
-    HFILE   hfLog;
-    ULONG   ulAction;
-    ULONG   ibActual;
-
-    sprintf(szFileName, "%c:\\%s", doshQueryBootDrive(), pcszFilename);
-    rc = DosOpen(szFileName,
-                 &hfLog,
-                 &ulAction,
-                 0,             // file size
-                 FILE_NORMAL,
-                 OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
-                 OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYWRITE,
-                 (PEAOP2)NULL);
-    if (rc == NO_ERROR)
-    {
-        DosSetFilePtr(hfLog, 0, FILE_END, &ibActual);
-        return (hfLog);
-    }
-    else
-        return (0);
-}
-
-/*
- * doshWriteToLogFile
- *      writes a string to a log file, adding a
- *      leading timestamp.
- */
-
-APIRET doshWriteToLogFile(HFILE hfLog, const char* pcsz)
-{
-    if (hfLog)
-    {
-        DATETIME dt;
-        CHAR szTemp[2000];
-        ULONG   cbWritten;
-        DosGetDateTime(&dt);
-        sprintf(szTemp,
-                "Time: %02d:%02d:%02d %s",
-                dt.hours, dt.minutes, dt.seconds,
-                pcsz);
-        return (DosWrite(hfLog, (PVOID)szTemp, strlen(szTemp), &cbWritten));
-    }
-    else return (ERROR_INVALID_HANDLE);
 }
 

trunk/src/helpers/helpers_pre.in

@@ -59 +59 @@
 $(OUTPUTDIR)\eah.obj \
 $(OUTPUTDIR)\except.obj \
+$(OUTPUTDIR)\lan.obj \
 $(OUTPUTDIR)\level.obj \
 $(OUTPUTDIR)\nls.obj \

trunk/src/helpers/linklist.c

@@ -585 +585 @@
         if (pList->ulMagic == LINKLISTMAGIC)
         {
-            pNewNode = (PLISTNODE)memdMalloc(sizeof(LISTNODE), file, line, function);
-            if (pNewNode)
+            if (pNewNode = (PLISTNODE)memdMalloc(sizeof(LISTNODE), file, line, function))
             {
                 memset(pNewNode, 0, sizeof(LISTNODE));
@@ -641 +640 @@
         if (pList->ulMagic == LINKLISTMAGIC)
         {
-            pNewNode = (PLISTNODE)malloc(sizeof(LISTNODE));
-            if (pNewNode)
+            if (pNewNode = (PLISTNODE)malloc(sizeof(LISTNODE)))
             {
                 memset(pNewNode, 0, sizeof(LISTNODE));
@@ -710 +708 @@
         if (pList->ulMagic == LINKLISTMAGIC)
         {
-            pNewNode = (PLISTNODE)malloc(sizeof(LISTNODE));
-            if (pNewNode)
+            if (pNewNode = (PLISTNODE)malloc(sizeof(LISTNODE)))
             {
                 memset(pNewNode, 0, sizeof(LISTNODE));

trunk/src/helpers/nls.c

@@ -18 +18 @@
  *
  *@@header "helpers\nls.h"
+ *@@added V0.9.16 (2001-10-11) [umoeller]
  */
 

trunk/src/helpers/semaphores.c

@@ -231 +231 @@
                )
             {
-                treeInit(&pMutex->ReaderThreadsTree);
+                treeInit(&pMutex->ReaderThreadsTree, NULL);
             }
         }
@@ -281 +281 @@
                    )
                 {
-                    ULONG cItems = pMutex->cReaderThreads;
+                    LONG cItems = pMutex->cReaderThreads;
                     TREE **papNodes = treeBuildArray(pMutex->ReaderThreadsTree,
                                                      &cItems);
@@ -424 +424 @@
 
                         treeInsert(&pMutex->ReaderThreadsTree,
+                                   NULL,
                                    (TREE*)pReader,
                                    treeCompareKeys);

trunk/src/helpers/tmsgfile.c

@@ -177 +177 @@
             ZERO(pFile);
             pFile->pszFilename = strdup(pcszMessageFile);
-            treeInit(&pFile->IDsTreeRoot);
+            treeInit(&pFile->IDsTreeRoot, NULL);
 
             xstrInitSet(&pFile->strContent, pszContent);
@@ -294 +294 @@
                     // store this thing
                     if (!treeInsert(&pFile->IDsTreeRoot,
+                                    NULL,
                                     (TREE*)pNew,
                                     treeCompareStrings))
@@ -332 +333 @@
     {
         PTMFMSGFILE pFile = *ppMsgFile;
-        ULONG   cItems;
+        LONG   cItems;
         TREE**  papNodes;
 

trunk/src/helpers/tree.c

@@ -285 +285 @@
  *      initializes the root of a tree.
  *
- */
-
-void treeInit(TREE **root)
+ *@@changed V0.9.16 (2001-10-19) [umoeller]: added plCount
+ */
+
+void treeInit(TREE **root,
+              PLONG plCount)            // out: tree item count, set to 0 (ptr can be NULL)
 {
     *root = LEAF;
+
+    if (plCount)
+        *plCount = 0;       // V0.9.16 (2001-10-19) [umoeller]
 }
 
@@ -511 +516 @@
  *      STATUS_DUPLICATE_KEY if a node with the
  *      same ulKey already exists.
+ *
+ *@@changed V0.9.16 (2001-10-19) [umoeller]: added plCount
  */
 
 int treeInsert(TREE **root,                     // in: root of the tree
+               PLONG plCount,                 // in/out: item count (ptr can be NULL)
                TREE *x,                         // in: new node to insert
                FNTREE_COMPARE *pfnCompare)      // in: comparison func
@@ -531 +539 @@
         if (0 == (iResult = pfnCompare(key, current->ulKey))) // if (compEQ(key, current->key))
             return STATUS_DUPLICATE_KEY;
+
         parent = current;
         current = (iResult < 0)    // compLT(key, current->key)
@@ -561 +570 @@
                 x);
     // lastFind = NULL;
+
+    if (plCount)
+        (*plCount)++;       // V0.9.16 (2001-10-19) [umoeller]
 
     return STATUS_OK;
@@ -740 +752 @@
  *      Returns 0 if the node was deleted or
  *      STATUS_INVALID_NODE if not.
+ *
+ *@@changed V0.9.16 (2001-10-19) [umoeller]: added plCount
  */
 
 int treeDelete(TREE **root,         // in: root of the tree
+               PLONG plCount,     // in/out: item count (ptr can be NULL)
                TREE *tree)          // in: tree node to delete
 {
@@ -820 +835 @@
                     y);
 
+    if (plCount)
+        (*plCount)--;       // V0.9.16 (2001-10-19) [umoeller]
+
     return (STATUS_OK);
-
-    /* TREE    *x,
-            *y; */
-            // *z;
-
-   /*****************************
-    *  delete node z from tree  *
-    *****************************/
-
-    // find node in tree
-    /* if (lastFind && compEQ(lastFind->key, key))
-        // if we just found node, use pointer
-        z = lastFind;
-    else {
-        z = *root;
-        while(z != LEAF)
-        {
-            int iResult = pfnCompare(key, z->key);
-            if (iResult == 0)
-            // if(compEQ(key, z->key))
-                break;
-            else
-                z = (iResult < 0) // compLT(key, z->key)
-                    ? z->left
-                    : z->right;
-        }
-        if (z == LEAF)
-            return STATUS_KEY_NOT_FOUND;
-    }
-
-    if (    z->left == LEAF
-         || z->right == LEAF
-       )
-    {
-        // y has a LEAF node as a child
-        y = z;
-    }
-    else
-    {
-        // find tree successor with a LEAF node as a child
-        y = z->right;
-        while (y->left != LEAF)
-            y = y->left;
-    }
-
-    // x is y's only child
-    if (y->left != LEAF)
-        x = y->left;
-    else
-        x = y->right;
-
-    // remove y from the parent chain
-    x->parent = y->parent;
-    if (y->parent)
-        if (y == y->parent->left)
-            y->parent->left = x;
-        else
-            y->parent->right = x;
-    else
-        *root = x;
-
-    // y is about to be deleted...
-
-    if (y != z)
-    {
-        // now, the original code simply copied the data
-        // from y to z... we can't safely do that since
-        // we don't know about the real data in the
-        // caller's TREE structure
-        z->ulKey = y->ulKey;
-        // z->rec = y->rec;         // hope this works...
-                                    // the original implementation used rec
-                                    // for the node's data
-
-        if (cbStruct > sizeof(TREE))
-        {
-            memcpy(((char*)&z) + sizeof(TREE),
-                   ((char*)&y) + sizeof(TREE),
-                   cbStruct - sizeof(TREE));
-        }
-    }
-
-    if (y->color == BLACK)
-        deleteFixup(root,
-                    x);
-
-    // free(y);
-    // lastFind = NULL;
-
-    return STATUS_OK; */
 }
 
@@ -1120 +1048 @@
 
 TREE** treeBuildArray(TREE* pRoot,
-                      unsigned long *pulCount)  // in: item count, out: array item count
+                      PLONG plCount)  // in: item count, out: array item count
 {
     TREE            **papNodes = NULL,
                     **papThis = NULL;
-    unsigned long   cb = (sizeof(TREE*) * (*pulCount)),
+    long            cb = (sizeof(TREE*) * (*plCount)),
                     cNodes = 0;
 
@@ -1140 +1068 @@
             // copy nodes to array
             while (    pNode
-                    && cNodes < (*pulCount)     // just to make sure
+                    && cNodes < (*plCount)     // just to make sure
                   )
             {
@@ -1151 +1079 @@
 
             // output count
-            *pulCount = cNodes;
+            *plCount = cNodes;
         }
     }

trunk/src/helpers/winh.c

@@ -3188 +3188 @@
 {
     HAB hab = NULLHANDLE;
-    HWND hwnd = winhCreateObjectWindow(WC_BUTTON, NULL);
-    if (hwnd)
+    HWND hwnd;
+    if (hwnd = winhCreateObjectWindow(WC_BUTTON, NULL))
     {
         hab = WinQueryAnchorBlock(hwnd);

trunk/src/helpers/wphandle.c

@@ -46 +46 @@
 
 #define INCL_WINSHELLDATA
+#define INCL_WINNLS
 #include <os2.h>
 
@@ -57 +58 @@
 
 #include "helpers\except.h"
+#include "helpers\linklist.h"
 #include "helpers\prfh.h"
 #include "helpers\standards.h"
 #include "helpers\stringh.h"
+#include "helpers\tree.h"
+#include "helpers\xstring.h"
+
+#define INCLUDE_WPHANDLE_PRIVATE
 #include "helpers\wphandle.h"
-#include "helpers\xstring.h"
 
 /*
@@ -185 +190 @@
 
 /*
+ *@@ FreeChildrenTree:
+ *      called from NukeNameTrees for recursion.
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ */
+
+VOID FreeChildrenTree(TREE **ppChildrenTree,
+                      PLONG plCount)
+{
+    LONG    cItems = *plCount;
+    TREE**  papNodes = treeBuildArray(*ppChildrenTree,
+                                      &cItems);
+    if (papNodes)
+    {
+        ULONG ul;
+        for (ul = 0; ul < cItems; ul++)
+        {
+            PNODETREENODE pNodeThis = (PNODETREENODE)papNodes[ul];
+
+            FreeChildrenTree(&pNodeThis->ChildrenTree,
+                             &pNodeThis->cChildren);
+
+            free(pNodeThis);
+        }
+
+        free(papNodes);
+        *plCount = 0;
+
+        treeInit(ppChildrenTree, plCount);
+    }
+}
+
+/*
+ *@@ NukeNameTrees:
+ *      frees all cache trees.
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ */
+
+APIRET NukeNameTrees(PHANDLESBUF pHandlesBuf)
+{
+    APIRET arc = NO_ERROR;
+
+    LONG    cItems = pHandlesBuf->cDrives;
+    TREE**  papNodes = treeBuildArray(pHandlesBuf->DrivesTree,
+                                      &cItems);
+    if (papNodes)
+    {
+        ULONG ul;
+        for (ul = 0; ul < cItems; ul++)
+        {
+            PDRIVETREENODE pNodeThis = (PDRIVETREENODE)papNodes[ul];
+
+            FreeChildrenTree(&pNodeThis->ChildrenTree,
+                             &pNodeThis->cChildren);
+
+            free(pNodeThis);
+        }
+
+        free(papNodes);
+
+        treeInit(&pHandlesBuf->DrivesTree,
+                 &pHandlesBuf->cDrives);
+    }
+
+    return (arc);
+}
+
+/*
  *@@ wphRebuildNodeHashTable:
  *
@@ -198 +272 @@
  */
 
-APIRET wphRebuildNodeHashTable(PHANDLESBUF pHandlesBuf)
+APIRET wphRebuildNodeHashTable(HHANDLES hHandles)
 {
     APIRET arc = NO_ERROR;
 
-    if (    (!pHandlesBuf)
+    PHANDLESBUF pHandlesBuf;
+
+    if (    (!(pHandlesBuf = (PHANDLESBUF)hHandles))
          || (!pHandlesBuf->pbData)
          || (!pHandlesBuf->cbData)
@@ -213 +289 @@
         PBYTE pEnd = pHandlesBuf->pbData + pHandlesBuf->cbData;
 
+        PDRIVETREENODE  pLastDriveTreeNode = NULL;
+
         memset(pHandlesBuf->NodeHashTable, 0, sizeof(pHandlesBuf->NodeHashTable));
+        NukeNameTrees(pHandlesBuf);
 
         // now set up hash table
-        while (pCur < pEnd)
+        while (    (pCur < pEnd)
+                && (!arc)
+              )
         {
             if (!memicmp(pCur, "DRIV", 4))
@@ -222 +303 @@
                 // pCur points to a DRIVE node:
                 // these never have handles, so skip this
-                PDRIV pDriv = (PDRIV)pCur;
-                pCur += sizeof(DRIV) + strlen(pDriv->szName);
+                PDRIVE pDriv = (PDRIVE)pCur;
+
+                // upper the node name for string comparisons
+                strupr(pDriv->szName);
+
+                // create a drive tree node
+                // (stored so we can append to this)
+                if (!(pLastDriveTreeNode = NEW(DRIVETREENODE)))
+                    arc = ERROR_NOT_ENOUGH_MEMORY;
+                else
+                {
+                    pLastDriveTreeNode->Tree.ulKey = (ULONG)pDriv->szName;
+                    pLastDriveTreeNode->pDriv = pDriv;
+                    treeInit(&pLastDriveTreeNode->ChildrenTree,
+                             &pLastDriveTreeNode->cChildren);
+                    if (treeInsert(&pHandlesBuf->DrivesTree,
+                                   &pHandlesBuf->cDrives,
+                                   (TREE*)pLastDriveTreeNode,
+                                   treeCompareStrings))
+                        arc = ERROR_WPH_DRIV_TREEINSERT_FAILED;
+                }
+
+                // next item
+                pCur += sizeof(DRIVE) + strlen(pDriv->szName);
             }
             else if (!memicmp(pCur, "NODE", 4))
@@ -229 +332 @@
                 // pCur points to a regular NODE: offset pointer first
                 PNODE pNode = (PNODE)pCur;
-                // store PNODE in hash table
-                pHandlesBuf->NodeHashTable[pNode->usHandle] = pNode;
+                PNODETREENODE pNew;
+
+                // upper the node name for string comparisons
+                strupr(pNode->szName);
+
+                // create a node tree node
+                if (!(pNew = NEW(NODETREENODE)))
+                    arc = ERROR_NOT_ENOUGH_MEMORY;
+                else
+                {
+                    TREE **ppTree = NULL;
+                    PLONG pcChildren = NULL;
+
+                    pNew->Tree.ulKey = (ULONG)pNode->szName;
+                    pNew->pNode = pNode;
+                    treeInit(&pNew->ChildrenTree,
+                             &pNew->cChildren);
+                    // now check where to insert this...
+                    // does it have a parent?
+                    if (pNode->usParentHandle)
+                    {
+                        PNODETREENODE pParent;
+                        if (!(pParent = pHandlesBuf->NodeHashTable[pNode->usParentHandle]))
+                            // this parent handle is invalid:
+                            arc = ERROR_WPH_INVALID_PARENT_HANDLE;
+                        else
+                        {
+                            ppTree = &pParent->ChildrenTree;
+                            pcChildren = &pParent->cChildren;
+                        }
+                    }
+                    else
+                        // null parent handle: then the parent
+                        // must be a DRIVE node
+                        if (pLastDriveTreeNode)
+                        {
+                            ppTree = &pLastDriveTreeNode->ChildrenTree;
+                            pcChildren = &pLastDriveTreeNode->cChildren;
+                        }
+                        else
+                            arc = ERROR_WPH_NODE_BEFORE_DRIV;
+
+                    if (!arc)
+                        if (treeInsert(ppTree,
+                                       pcChildren,
+                                       (TREE*)pNew,
+                                       treeCompareStrings))
+                            ; // @@todo if this fails, there are
+                            // several handles for short name!!!
+                            // arc = ERROR_WPH_NODE_TREEINSERT_FAILED;
+
+                    // store PNODE in hash table
+                    pHandlesBuf->NodeHashTable[pNode->usHandle] = pNew;
+                }
+
                 pCur += sizeof(NODE) + pNode->usNameSize;
             }
@@ -242 +398 @@
 
     if (!arc)
-        pHandlesBuf->fNodeHashTableValid = TRUE;
+        pHandlesBuf->fCacheValid = TRUE;
 
     return (arc);
@@ -279 +435 @@
                       HINI hiniSystem,    // in: HINI_SYSTEM or other INI handle
                       const char *pcszActiveHandles,
-                      PHANDLESBUF *ppHandlesBuf)
+                      HHANDLES *phHandles)
 {
     APIRET arc = NO_ERROR;
 
-    if (!ppHandlesBuf)
+    if (!phHandles)
         arc = ERROR_INVALID_PARAMETER;
     else
@@ -369 +525 @@
                     ZERO(pReturn);
 
+                    treeInit(&pReturn->DrivesTree,
+                             &pReturn->cDrives);
+
                     pReturn->pbData = pbData;
                     pReturn->cbData = cbTotal;
@@ -376 +535 @@
                                                            &pReturn->usHiwordAbstract,
                                                            &pReturn->usHiwordFileSystem)))
-                        *ppHandlesBuf = pReturn;
+                        *phHandles = (HHANDLES)pReturn;
                 }
                 else
@@ -384 +543 @@
             if (arc)
                 // error:
-                wphFreeHandles(&pReturn);
+                wphFreeHandles((HHANDLES*)&pReturn);
         }
     }
@@ -399 +558 @@
  */
 
-APIRET wphFreeHandles(PHANDLESBUF *ppHandlesBuf)
+APIRET wphFreeHandles(HHANDLES *phHandles)
 {
     APIRET arc = NO_ERROR;
 
-    if (ppHandlesBuf && *ppHandlesBuf)
+    PHANDLESBUF pHandlesBuf;
+    if (    (phHandles)
+         && (pHandlesBuf = (PHANDLESBUF)*phHandles)
+       )
     {
         PBYTE pbData;
-        if (pbData = (*ppHandlesBuf)->pbData)
+
+        NukeNameTrees(pHandlesBuf);
+
+        if (pbData = pHandlesBuf->pbData)
             free(pbData);
 
-        free(*ppHandlesBuf);
-        *ppHandlesBuf = NULL;
+        free(pHandlesBuf);
+        *phHandles = NULLHANDLE;
     }
     else
@@ -426 +591 @@
 /*
  *@@ wphSearchBufferForHandle:
- *      returns the four-digit object handle which corresponds
+ *      returns the 16-bit file-system handle which corresponds
  *      to pszFilename, searching pHandlesBuffer. Note that you
- *      must OR the return value with 0x30000 to make this
- *      a valid WPS file-system handle.
+ *      must OR the return value with the proper hiword to make
+ *      this a valid WPS file-system handle.
  *
  *      You must pass a handles buffer to this function which
@@ -436 +601 @@
  *      This gets called by the one-shot function
  *      wphQueryHandleFromPath.
- */
-
-USHORT wphSearchBufferForHandle(PBYTE pHandlesBuffer, // in: handles buffer (all BLOCK's)
-                                ULONG ulBufSize,      // in: sizeof(pHandlesBuffer)
-                                USHORT usParent,      // in: parent NODE ID;
-                                                      //     must be 0 initially
-                                PSZ pszFilename) // in: fully qlf'd filename to search for
-{
-    PDRIV pDriv;
-    PNODE pNode;
-    PBYTE pCur;                 // current
-    PBYTE p,
-          pEnd;                 // *end of buffer
-    USHORT usPartSize;
-
-    // _Pmpf(("Entering wphSearchBufferForHandle for %s", pszFilename));
-
-    // The composed BLOCKs in the handles buffer make up a tree of
-    // DRIVE and NODE structures (see wphandle.h). Each NODE stands
-    // for either a directory or a file. (We don't care about the
-    // DRIVE structures because the root directory gets a NODE also.)
-    // Each NODE contains the non-qualified file name, an object ID,
-    // and the object ID of its parent NODE.
-    // We can thus work our way through the buffer by splitting the
-    // fully qualified filename that we're searching for into the
-    // different directory names and, each time, searching for the
-    // corresponding NODE. If we have found that, we go for the next.
-    // Example for C:\OS2\E.EXE:
-    //   1) first search for the "C:" NODE
-    //   2) then find the "OS2" node which has "C" as its parent NODE
-    //      (we do this by comparing the parent object handles)
-    //   3) then find the "E.EXE" NODE the same way
-    // The "E.EXE" NODE then has the object handle we're looking for.
-
-    // So first find the length of the first filename part (which
-    // should be 2 for the drive letter, "C:")
-    p = strchr(pszFilename, '\\');
-    if (p)
-        // backslash found:
-        usPartSize = p - pszFilename;      // extract first part
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR
+ *
+ *      --  ERROR_INVALID_PARAMETER
+ *
+ *      --  ERROR_FILE_NOT_FOUND
+ *
+ *      --  ERROR_INVALID_NAME
+ *
+ *      --  ERROR_WPH_CORRUPT_HANDLES_DATA
+ *
+ *      --  ERROR_WPH_CANNOT_FIND_HANDLE: no handle exists for the
+ *          given filename.
+ *
+ *@@changed V0.9.16 (2001-10-19) [umoeller]: rewritten
+ */
+
+APIRET wphSearchBufferForHandle(HHANDLES hHandles,
+                                PCSZ pcszFile,  // in: fully qlf'd filename to search for
+                                PUSHORT pusHandle)  // out: 16-bit handle
+{
+    APIRET arc = NO_ERROR;
+
+    PHANDLESBUF pHandlesBuf;
+
+    _Pmpf((__FUNCTION__ ": entering"));
+
+    if (    (hHandles)
+         && (pHandlesBuf = (PHANDLESBUF)hHandles)
+       )
+    {
+        // rebuild cache
+        if (!pHandlesBuf->fCacheValid)
+            arc = wphRebuildNodeHashTable(hHandles);
+
+        if (!arc)
+        {
+            // We can thus work our way through the buffer by splitting the
+            // fully qualified filename that we're searching for into the
+            // different directory names and, each time, searching for the
+            // corresponding NODE. If we have found that, we go for the next.
+            // Example for C:\OS2\E.EXE:
+            //   1) first search for the "C:" NODE
+            //   2) then find the "OS2" node which has "C" as its parent NODE
+            //      (we do this by comparing the parent object handles)
+            //   3) then find the "E.EXE" NODE the same way
+            // The "E.EXE" NODE then has the object handle we're looking for.
+
+            // make a copy of the filename so we can play
+            PSZ     pszFilename = strdup(pcszFile),
+                    pEnd = NULL;
+
+            strupr(pszFilename);
+
+            // 1) OK, find the drive.
+
+            // If this is an UNC name, the DRIVE node has the form
+            // \\SERVER\RESOURCE.
+            if (    (*pszFilename == '\\')
+                 && (*(pszFilename + 1) == '\\')
+               )
+            {
+                // UNC:
+                // @@todo
+            }
+            else if (*(pszFilename + 1) == ':')
+                // extract the drive then (without \)
+                pEnd = pszFilename + 2;
+
+            if (!pEnd)
+                arc = ERROR_INVALID_NAME;
+            else
+            {
+                PDRIVETREENODE pDrive = NULL;
+                PNODETREENODE pNode;
+
+                // find the DRIVE node
+                CHAR cOld = *pEnd;
+                *pEnd = 0;
+
+                _Pmpf(("  searching for drive \"%s\"", pszFilename));
+
+                if (!(pDrive = (PDRIVETREENODE)treeFind(pHandlesBuf->DrivesTree,
+                                                        (ULONG)pszFilename,   // drive name
+                                                        treeCompareStrings)))
+                    arc = ERROR_WPH_NO_MATCHING_DRIVE_BLOCK;
+                // find the root dir, which has the same name
+                else if (!(pNode = (PNODETREENODE)treeFind(pDrive->ChildrenTree,
+                                                           (ULONG)pszFilename,
+                                                           treeCompareStrings)))
+                    arc = ERROR_WPH_NO_MATCHING_ROOT_DIR;
+                else
+                {
+                    // now we got the root dir... go for next path component
+                    while (    (pEnd)
+                            && (*pEnd = cOld)       // not null char
+                            && (!arc)
+                          )
+                    {
+                        // got another path component to search:
+                        PSZ pCurrent = pEnd + 1,
+                            pNext;
+
+                        if (pNext = strchr(pCurrent, '\\'))
+                        {
+                            cOld = *pNext;
+                            *pNext = 0;
+                        }
+                        else
+                            // done:
+                            cOld = 0;
+
+                        _Pmpf(("  searching for node \"%s\"", pCurrent));
+
+                        // find the next node
+                        if (!(pNode = (PNODETREENODE)treeFind(pNode->ChildrenTree,
+                                                              (ULONG)pCurrent,
+                                                              treeCompareStrings)))
+                            arc = ERROR_WPH_CANNOT_FIND_HANDLE;
+
+                        pEnd = pNext;
+                    }
+
+                    if (!arc && pNode)
+                        // found everything:
+                        *pusHandle = pNode->pNode->usHandle;
+                }
+            } // end while
+
+            free(pszFilename);
+        }
+    }
     else
-        usPartSize = strlen(pszFilename);
-
-    // now set the pointer for the end of the BLOCKs buffer
-    pEnd = pHandlesBuffer + ulBufSize;
-
-    // pCur is our variable pointer where we're at now; there
-    // is some offset of 4 bytes at the beginning (duh)
-    pCur = pHandlesBuffer + 4;
-
-    // _Pmpf(("  Searching for: %s, usPartSize: %d", pszFilename, usPartSize));
-
-    // go!
-    while (pCur < pEnd)
-    {
-        // the first four chars tell us whether it's
-        // a DRIVE or a NODE structure
-        if (!memicmp(pCur, "DRIV", 4))
-        {
-            // pCur points to a DRIVE node:
-            // we don't care about these, because the root
-            // directory has a real NODE too, so we just
-            // skip this
-            pDriv = (PDRIV)pCur;
-            pCur += sizeof(DRIV) + strlen(pDriv->szName);
-        }
-        else if (!memicmp(pCur, "NODE", 4))
-        {
-            // pCur points to a regular NODE: offset pointer first
-            pNode = (PNODE)pCur;
-            pCur += sizeof (NODE) + pNode->usNameSize;
-
-            // does the NODE have the same parent that we
-            // are currently searching for? This is "0"
-            // for root directories (and initially for us
-            // too)
-            if (usParent == pNode->usParentHandle)
-            {
-                // yes:
-                // _Pmpf(("  found matching parents (%lX): %s", usParent, pNode->szName));
-
-                // does the NODE have the same partname length?
-                if (pNode->usNameSize == usPartSize)
-                {
-                    // yes:
-                    // _Pmpf(("    found matching partnames sizes: %d", pNode->usNameSize));
-
-                    // do the partnames match too?
-                    if (memicmp(pszFilename, pNode->szName, usPartSize) == 0)
-                    {
-                        // OK!! proper NODE found!
-                        // _Pmpf(("      FOUND %s!!", pNode->szName));
-
-                        // now check if this was the last NODE
-                        // we were looking for
-                        if (strlen(pszFilename) == usPartSize)
-                           // yes: return ID
-                           return (pNode->usHandle);
-
-                        // else: update our status;
-                        // get next partname
-                        pszFilename += usPartSize + 1;
-                        // calc next partname length
-                        p = strchr(pszFilename, '\\');
-                        if (p)
-                            usPartSize = p - pszFilename;
-                        else
-                            usPartSize = strlen(pszFilename);
-
-                        // get next parent to search for
-                        // (which is the current handle)
-                        usParent = pNode->usHandle;
-                    }
-                }
-            }
-        }
-        else
-            // neither DRIVE nor NODE: error
-            return (0);
-
-    } // end while
+        arc = ERROR_INVALID_PARAMETER;
+
+    _Pmpf((__FUNCTION__ ": returning %d", arc));
 
     // not found: end of buffer reached
-    return (0);
+    return (arc);
 }
 
@@ -588 +770 @@
 
     PSZ         pszActiveHandles = NULL;
-    PHANDLESBUF pHandlesBuf = NULL;
+    HHANDLES    hHandles = NULLHANDLE;
 
     TRY_LOUD(excpt1)
@@ -601 +783 @@
                                      hiniSystem,
                                      pszActiveHandles,
-                                     &pHandlesBuf))
+                                     &hHandles))
                 _Pmpf((__FUNCTION__ ": wphLoadHandles returned %d", arc));
             else
@@ -610 +792 @@
 
                 // search that buffer
-                if (usObjID = wphSearchBufferForHandle(pHandlesBuf->pbData,
-                                                       pHandlesBuf->cbData,
-                                                       0,                  // usParent
-                                                       szFullPath))
+                if (!(arc = wphSearchBufferForHandle(hHandles,
+                                                     szFullPath,
+                                                     &usObjID)))
                     // found: OR 0x30000
-                    *phobj = usObjID | (pHandlesBuf->usHiwordFileSystem << 16);
+                    *phobj = usObjID | (((PHANDLESBUF)hHandles)->usHiwordFileSystem << 16);
                 else
                     arc = ERROR_FILE_NOT_FOUND;
@@ -628 +809 @@
     if (pszActiveHandles)
         free(pszActiveHandles);
-    if (pHandlesBuf)
-        wphFreeHandles(&pHandlesBuf);
+    if (hHandles)
+        wphFreeHandles(&hHandles);
 
     return (arc);
@@ -652 +833 @@
                    PNODE *ppNode)           // out: node found (ptr can be NULL)
 {
-    APIRET arc = NO_ERROR;
-    PNODE pNode;
-    if (pNode = pHandlesBuf->NodeHashTable[usHandle])
+    APIRET          arc = NO_ERROR;
+    PNODETREENODE   pTreeNode;
+    PNODE           pNode;
+    if (    (pTreeNode = pHandlesBuf->NodeHashTable[usHandle])
+         && (pNode = pTreeNode->pNode)
+       )
     {
         // handle exists:
@@ -717 +901 @@
  */
 
-APIRET wphComposePath(PHANDLESBUF pHandlesBuf,
+APIRET wphComposePath(HHANDLES hHandles,
                       USHORT usHandle,      // in: loword of handle to search for
                       PSZ pszFilename,
@@ -725 +909 @@
     APIRET arc = NO_ERROR;
 
-    TRY_LOUD(excpt1)
-    {
-        if (!pHandlesBuf->fNodeHashTableValid)
-            arc = wphRebuildNodeHashTable(pHandlesBuf);
-
-        if (!arc)
+    PHANDLESBUF pHandlesBuf;
+    if (    (hHandles)
+         && (pHandlesBuf = (PHANDLESBUF)hHandles)
+       )
+    {
+        TRY_LOUD(excpt1)
         {
-            XSTRING str;
-            xstrInit(&str, CCHMAXPATH);
-            if (!(arc = ComposeThis(pHandlesBuf,
-                                    usHandle,
-                                    &str,
-                                    ppNode)))
-                if (str.ulLength > cbFilename - 1)
-                    arc = ERROR_BUFFER_OVERFLOW;
-                else
-                    memcpy(pszFilename,
-                           str.psz,
-                           str.ulLength + 1);
+            if (!pHandlesBuf->fCacheValid)
+                arc = wphRebuildNodeHashTable(hHandles);
+
+            if (!arc)
+            {
+                XSTRING str;
+                xstrInit(&str, CCHMAXPATH);
+                if (!(arc = ComposeThis(pHandlesBuf,
+                                        usHandle,
+                                        &str,
+                                        ppNode)))
+                    if (str.ulLength > cbFilename - 1)
+                        arc = ERROR_BUFFER_OVERFLOW;
+                    else
+                        memcpy(pszFilename,
+                               str.psz,
+                               str.ulLength + 1);
+            }
         }
-    }
-    CATCH(excpt1)
-    {
-        arc = ERROR_WPH_CRASHED;
-    } END_CATCH();
+        CATCH(excpt1)
+        {
+            arc = ERROR_WPH_CRASHED;
+        } END_CATCH();
+    }
 
     return (arc);
@@ -785 +975 @@
         else
         {
-            PHANDLESBUF pHandlesBuf;
+            HHANDLES hHandles;
             if (arc = wphLoadHandles(hiniUser,
                                      hiniSystem,
                                      pszActiveHandles,
-                                     &pHandlesBuf))
+                                     &hHandles))
                 _Pmpf((__FUNCTION__ ": wphLoadHandles returned %d", arc));
             else
             {
                 // is this really a file-system object?
-                if (HIUSHORT(hObject) == pHandlesBuf->usHiwordFileSystem)
+                if (HIUSHORT(hObject) == ((PHANDLESBUF)hHandles)->usHiwordFileSystem)
                 {
                     // use loword only
@@ -800 +990 @@
 
                     memset(pszFilename, 0, cbFilename);
-                    arc = wphComposePath(pHandlesBuf,
+                    arc = wphComposePath(hHandles,
                                          usObjID,
                                          pszFilename,
@@ -809 +999 @@
                 }
 
-                wphFreeHandles(&pHandlesBuf);
+                wphFreeHandles(&hHandles);
             }
 

trunk/src/helpers/xml.c

@@ -522 +522 @@
                     // remove from parent's attributes map
                     treeDelete(&pDomNode->pParentNode->AttributesMap,
+                               NULL,
                                (TREE*)pNode);
                 else
@@ -619 +620 @@
                 // add to parent's attributes list
                 if (treeInsert(&pParentNode->AttributesMap,
+                               NULL,
                                &pNewNode->NodeBase.Tree,
                                CompareXStrings))
@@ -648 +650 @@
 
         lstInit(&pNewNode->llChildren, FALSE);
-        treeInit(&pNewNode->AttributesMap);
+        treeInit(&pNewNode->AttributesMap, NULL);
     }
 
@@ -883 +885 @@
             pNew->fHasInternalSubset = fHasInternalSubset;
 
-            treeInit(&pNew->ElementDeclsTree);
-            treeInit(&pNew->AttribDeclBasesTree);
+            treeInit(&pNew->ElementDeclsTree, NULL);
+            treeInit(&pNew->AttribDeclBasesTree, NULL);
 
             *ppNew = pNew;
@@ -929 +931 @@
             xstrcpy(&pParticle->NodeBase.strNodeName, pModel->name, 0);
             treeInsert(ppElementNamesTree,
+                       NULL,
                        &pParticle->NodeBase.Tree,
                        CompareXStrings);
@@ -1020 +1023 @@
     if (!arc)
     {
-        treeInit(&pNew->ParticleNamesTree);
+        treeInit(&pNew->ParticleNamesTree, NULL);
 
         // set up the "particle" member and recurse into sub-particles
@@ -2028 +2031 @@
                 // add this to the doctype's declarations tree
                 if (treeInsert(&pDocType->ElementDeclsTree,
+                               NULL,
                                (TREE*)pNew,
                                CompareXStrings))
@@ -2061 +2065 @@
     if (!arc)
         treeInsert(&pDecl->ValuesTree,
+                   NULL,
                    (TREE*)pNew,
                    CompareXStrings);
@@ -2153 +2158 @@
                     {
                         // initialize the subtree
-                        treeInit(&pThis->AttribDeclsTree);
+                        treeInit(&pThis->AttribDeclsTree, NULL);
 
                         treeInsert(&pDocType->AttribDeclBasesTree,
+                                   NULL,
                                    (TREE*)pThis,
                                    CompareXStrings);
@@ -2176 +2182 @@
                 if (!pDom->arcDOM)
                 {
-                    treeInit(&pNew->ValuesTree);
+                    treeInit(&pNew->ValuesTree, NULL);
 
                     // check the type... expat is too lazy to parse this for
@@ -2242 +2248 @@
 
                         if (treeInsert(&pThis->AttribDeclsTree,
+                                       NULL,
                                        (TREE*)pNew,
                                        CompareXStrings))