Changeset 127

Timestamp:

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

Author:

umoeller

Message:

Tons of updates for turbo folders and replacement icons.

Location:

trunk

Files:

• include/helpers/apps.h (modified) (1 diff)
• include/helpers/comctl.h (modified) (1 diff)
• include/helpers/dosh.h (modified) (13 diffs)
• include/helpers/gpih.h (modified) (2 diffs)
• include/helpers/stringh.h (modified) (1 diff)
• include/helpers/undoc.h (modified) (1 diff)
• include/helpers/winh.h (modified) (1 diff)
• include/helpers/wphandle.h (modified) (1 diff)
• src/helpers/apps.c (modified) (19 diffs)
• src/helpers/dosh.c (modified) (14 diffs)
• src/helpers/dosh2.c (modified) (76 diffs)
• src/helpers/gpih.c (modified) (2 diffs)
• src/helpers/helpers_pre.in (modified) (1 diff)
• src/helpers/stringh.c (modified) (2 diffs)
• src/helpers/timer.c (modified) (13 diffs)
• src/helpers/wphandle.c (modified) (4 diffs)
• src/helpers/xml.c (modified) (1 diff)

trunk/include/helpers/apps.h

@@ -103 +103 @@
                                     const PROGDETAILS *pcProgDetails,
                                     ULONG ulFlags,
-                                    HAPP *phapp);
+                                    HAPP *phapp,
+                                    ULONG cbFailingName,
+                                    PSZ pszFailingName);
 
         BOOL XWPENTRY appWaitForApp(HWND hwndNotify,

trunk/include/helpers/comctl.h

@@ -411 +411 @@
                 // caused by a mouse click.
     } EMPHASISNOTIFY, *PEMPHASISNOTIFY;
+
+    /* ******************************************************************
+     *
+     *   Super Combo Box
+     *
+     ********************************************************************/
+
+    BOOL ctlComboFromEntryField(HWND hwnd,
+                                ULONG flStyle);
 
     /* ******************************************************************

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
 

trunk/include/helpers/gpih.h

@@ -270 +270 @@
     HBITMAP XWPENTRY gpihCreateBitmap2(HPS hpsMem, ULONG  cx, ULONG cy, ULONG cPlanes, ULONG cBitCount);
 
-    HBITMAP XWPENTRY gpihCreateBmpFromPS(HAB hab, HPS hpsScreen, PRECTL prcl);
-    typedef HBITMAP XWPENTRY GPIHCREATEBMPFROMPS(HAB hab, HPS hpsScreen, PRECTL prcl);
-    typedef GPIHCREATEBMPFROMPS *PGPIHCREATEBMPFROMPS;
-
     HBITMAP XWPENTRY gpihCreateHalftonedBitmap(HAB hab, HBITMAP hbmSource, LONG lColorGray);
     typedef HBITMAP XWPENTRY GPIHCREATEHALFTONEDBITMAP(HAB hab, HBITMAP hbmSource, LONG lColorGray);
@@ -344 +340 @@
     typedef GPIHDESTROYXBITMAP *PGPIHDESTROYXBITMAP;
 
+    PXBITMAP gpihCreateBmpFromPS(HAB hab,
+                                 HPS hpsScreen,
+                                 PRECTL prcl);
+
 #endif
 

trunk/include/helpers/stringh.h

@@ -166 +166 @@
     /* ******************************************************************
      *
-     *   Wildcard matching
-     *
-     ********************************************************************/
-
-    #define FNM_MATCH           0
-    #define FNM_NOMATCH         1
-    #define FNM_ERR             2
-
-    #define FNM_NOESCAPE        16
-    #define FNM_PATHNAME        32
-    #define FNM_PERIOD          64
-
-    #define FNM_STYLE_MASK      15
-
-    #define FNM_POSIX           0
-    #define FNM_OS2             1
-    #define FNM_DOS             2
-
-    #define FNM_IGNORECASE      128
-    #define FNM_PATHPREFIX      256
-
-    BOOL XWPENTRY strhMatchOS2(const char *pcszMask, const char *pcszName);
-
-    BOOL XWPENTRY strhMatchExt(const char *pcszMask,
-                               const char *pcszName,
-                               unsigned flags);
-
-    /* ******************************************************************
-     *
      *   Fast string searches
      *

trunk/include/helpers/undoc.h

@@ -113 +113 @@
     #define ID_WPMI_REFRESH                0x1F7
 
-    /*
-     * Return codes for wpConfirmObjectTitle:
-     *      only def'd in the Warp 4 Toolkit
-     *      (and partly in wpsystem.h).
-     */
-
-    #ifndef NAMECLASH_CANCEL
-        #define NAMECLASH_CANCEL    0
-    #endif
-    #ifndef NAMECLASH_NONE
-        #define NAMECLASH_NONE      1
-    #endif
-    #ifndef NAMECLASH_RENAME
-        #define NAMECLASH_RENAME    2
-    #endif
-    #ifndef NAMECLASH_REPLACE
-        #define NAMECLASH_REPLACE   8
-    #endif
 #endif
 

trunk/include/helpers/winh.h

@@ -534 +534 @@
 
     #define winhQueryLboxSelectedItem(hwndListBox, sItemStart) \
-            (SHORT)(WinSendMsg(hwndListBox,                    \
+            SHORT1FROMMR(WinSendMsg(hwndListBox,                    \
                             LM_QUERYSELECTION,                 \
                             (MPARAM)(sItemStart),              \

trunk/include/helpers/wphandle.h

@@ -56 +56 @@
     #define ERROR_WPH_NO_MATCHING_DRIVE_BLOCK       (ERROR_WPH_FIRST +  11)
     #define ERROR_WPH_NO_MATCHING_ROOT_DIR          (ERROR_WPH_FIRST +  12)
+    #define ERROR_WPH_NOT_FILESYSTEM_HANDLE         (ERROR_WPH_FIRST +  13)
 
     /* ******************************************************************

trunk/src/helpers/apps.c

@@ -33 +33 @@
 
 #define INCL_DOSPROCESS
+#define INCL_DOSMODULEMGR
 #define INCL_DOSSESMGR
 #define INCL_DOSERRORS
 
 #define INCL_WINPROGRAMLIST     // needed for PROGDETAILS, wppgm.h
+#define INCL_WINERRORS
+#define INCL_SHLERRORS
 #include <os2.h>
 
@@ -107 +110 @@
 
 APIRET appParseEnvironment(const char *pcszEnv,
-                           PDOSENVIRONMENT pEnv)
+                           PDOSENVIRONMENT pEnv)        // out: new environment
 {
     APIRET arc = NO_ERROR;
@@ -123 +126 @@
         }
 
-        pEnv->cVars = cVars;
+        pEnv->cVars = 0;
         pEnv->papszVars = 0;
 
         if (cVars)
         {
-            PSZ *papsz = (PSZ*)malloc(sizeof(PSZ) * cVars);
-            if (!papsz)
+            ULONG cbArray = sizeof(PSZ) * cVars;
+            PSZ *papsz;
+            if (!(papsz = (PSZ*)malloc(cbArray)))
                 arc = ERROR_NOT_ENOUGH_MEMORY;
             else
             {
                 PSZ *ppszTarget = papsz;
-                memset(papsz, 0, sizeof(PSZ) * cVars);
+                memset(papsz, 0, cbArray);
                 pszVarThis = (PSZ)pcszEnv;
                 while (*pszVarThis)
                 {
-                    *ppszTarget = strdup(pszVarThis);
+                    ULONG ulThisLen;
+                    if (!(*ppszTarget = strhdup(pszVarThis, &ulThisLen)))
+                    {
+                        arc = ERROR_NOT_ENOUGH_MEMORY;
+                        break;
+                    }
+                    (pEnv->cVars)++;
                     ppszTarget++;
-                    pszVarThis += strlen(pszVarThis) + 1;
+                    pszVarThis += ulThisLen + 1;
                 }
 
@@ -156 +166 @@
  *      process environment, which is retrieved from
  *      the info blocks.
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR:
+ *
+ *      --  ERROR_INVALID_PARAMETER
+ *
+ *      --  ERROR_BAD_ENVIRONMENT: no environment found in
+ *          info blocks.
  *
  *@@added V0.9.4 (2000-07-19) [umoeller]
@@ -173 +192 @@
         if (arc == NO_ERROR)
         {
-            PSZ pszEnv = ppib->pib_pchenv;
-            if (pszEnv)
+            PSZ pszEnv;
+            if (pszEnv = ppib->pib_pchenv)
                 arc = appParseEnvironment(pszEnv, pEnv);
             else
@@ -200 +219 @@
  *@@changed V0.9.12 (2001-05-21) [umoeller]: fixed memory leak
  *@@changed V0.9.12 (2001-05-27) [umoeller]: moved from dosh2.c to apps.c
+ *@@changed V0.9.16 (2002-01-01) [umoeller]: removed extra heap allocation
  */
 
@@ -205 +225 @@
                            PSZ pszVarName)
 {
-    PSZ *ppszRet = 0;
-    if (pEnv)
-    {
-        if ((pEnv->papszVars) && (pszVarName))
-        {
-            PSZ     *ppszThis = pEnv->papszVars;
-            // PSZ     pszThis;
-            ULONG   ul = 0;
-            ULONG   ulVarNameLen = 0;
-
-            PSZ     pszSearch = NULL; // receives "VARNAME="
-            PSZ     pFirstEqual = strchr(pszVarName, '=');
-            if (pFirstEqual)
-                pszSearch = strhSubstr(pszVarName, pFirstEqual + 1);
-            else
-            {
-                ulVarNameLen = strlen(pszVarName);
-                pszSearch = (PSZ)malloc(ulVarNameLen + 2);
-                memcpy(pszSearch, pszVarName, ulVarNameLen);
-                *(pszSearch + ulVarNameLen) = '=';
-                *(pszSearch + ulVarNameLen + 1) = 0;
-            }
-
-            ulVarNameLen = strlen(pszSearch);
-
-            for (ul = 0;
-                 ul < pEnv->cVars;
-                 ul++)
-            {
-                if (strnicmp(*ppszThis, pszSearch, ulVarNameLen) == 0)
+    PSZ     *ppszRet = 0;
+
+    if (    (pEnv)
+         && (pEnv->papszVars)
+         && (pszVarName)
+       )
+    {
+        ULONG   ul = 0;
+        ULONG   ulVarNameLen = 0;
+
+        PSZ     pFirstEqual;
+        // rewrote all the following for speed V0.9.16 (2002-01-01) [umoeller]
+        if (pFirstEqual = strchr(pszVarName, '='))
+            // VAR=VALUE
+            //    ^ pFirstEqual
+            ulVarNameLen = pFirstEqual - pszVarName;
+        else
+            ulVarNameLen = strlen(pszVarName);
+
+        for (ul = 0;
+             ul < pEnv->cVars;
+             ul++)
+        {
+            PSZ pszThis = pEnv->papszVars[ul];
+            if (pFirstEqual = strchr(pszThis, '='))
+            {
+                ULONG ulLenThis = pFirstEqual - pszThis;
+                if (    (ulLenThis == ulVarNameLen)
+                     && (!memicmp(pszThis,
+                                  pszVarName,
+                                  ulVarNameLen))
+                   )
                 {
-                    ppszRet = ppszThis;
+                    ppszRet = &pEnv->papszVars[ul];
                     break;
                 }
-
-                // next environment string
-                ppszThis++;
-            }
-
-            free(pszSearch);        // was missing V0.9.12 (2001-05-21) [umoeller]
+            }
         }
     }
@@ -296 +313 @@
         else
         {
-            PSZ *ppszEnvLine = appFindEnvironmentVar(pEnv, pszNewEnv);
-            if (ppszEnvLine)
-            {
+            PSZ *ppszEnvLine;
+            if (ppszEnvLine = appFindEnvironmentVar(pEnv, pszNewEnv))
                 // was set already: replace
-                free(*ppszEnvLine);
-                *ppszEnvLine = strdup(pszNewEnv);
-                if (!(*ppszEnvLine))
-                    arc = ERROR_NOT_ENOUGH_MEMORY;
-            }
+                arc = strhStore(ppszEnvLine,
+                                pszNewEnv,
+                                NULL);
             else
             {
@@ -312 +326 @@
                 // allocate new array, with one new entry
                 // fixed V0.9.12 (2001-05-26) [umoeller], this crashed
-                PSZ *papszNew = (PSZ*)malloc(sizeof(PSZ) * (pEnv->cVars + 1));
-
-                if (!papszNew)
+                PSZ *papszNew;
+
+                if (!(papszNew = (PSZ*)malloc(sizeof(PSZ) * (pEnv->cVars + 1))))
                     arc = ERROR_NOT_ENOUGH_MEMORY;
                 else
@@ -339 +353 @@
                     }
 
-                    if (pEnv->papszVars)
-                        free(pEnv->papszVars);      // was missing V0.9.12 (2001-05-21) [umoeller]
-
+                    free(pEnv->papszVars);      // was missing V0.9.12 (2001-05-21) [umoeller]
                     pEnv->papszVars = papszNew;
                     pEnv->cVars++;
@@ -374 +386 @@
 {
     APIRET  arc = NO_ERROR;
-    if (!pEnv)
+    if (    (!pEnv)
+         || (!pEnv->papszVars)
+       )
         arc = ERROR_INVALID_PARAMETER;
     else
     {
-        if (!pEnv->papszVars)
-            arc = ERROR_INVALID_PARAMETER;
+        // count memory needed for all strings
+        ULONG   cbNeeded = 0,
+                ul = 0;
+        PSZ     *ppszThis = pEnv->papszVars;
+
+        for (ul = 0;
+             ul < pEnv->cVars;
+             ul++)
+        {
+            cbNeeded += strlen(*ppszThis) + 1; // length of string plus null terminator
+
+            // next environment string
+            ppszThis++;
+        }
+
+        cbNeeded++;     // for another null terminator
+
+        if (!(*ppszEnv = (PSZ)malloc(cbNeeded)))
+            arc = ERROR_NOT_ENOUGH_MEMORY;
         else
         {
-            // count memory needed for all strings
-            ULONG   cbNeeded = 0,
-                    ul = 0;
-            PSZ     *ppszThis = pEnv->papszVars;
-
+            PSZ     pTarget = *ppszEnv;
+            if (pulSize)
+                *pulSize = cbNeeded;
+            ppszThis = pEnv->papszVars;
+
+            // now copy each string
             for (ul = 0;
                  ul < pEnv->cVars;
                  ul++)
             {
-                cbNeeded += strlen(*ppszThis) + 1; // length of string plus null terminator
+                PSZ pSource = *ppszThis;
+
+                while ((*pTarget++ = *pSource++))
+                    ;
+
+                // *pTarget++ = 0;     // append null terminator per string
 
                 // next environment string
@@ -397 +434 @@
             }
 
-            cbNeeded++;     // for another null terminator
-
-            *ppszEnv = (PSZ)malloc(cbNeeded);
-            if (!(*ppszEnv))
-                arc = ERROR_NOT_ENOUGH_MEMORY;
-            else
-            {
-                PSZ     pTarget = *ppszEnv;
-                if (pulSize)
-                    *pulSize = cbNeeded;
-                ppszThis = pEnv->papszVars;
-
-                // now copy each string
-                for (ul = 0;
-                     ul < pEnv->cVars;
-                     ul++)
-                {
-                    PSZ pSource = *ppszThis;
-
-                    while ((*pTarget++ = *pSource++))
-                        ;
-
-                    // *pTarget++ = 0;     // append null terminator per string
-
-                    // next environment string
-                    ppszThis++;
-                }
-
-                *pTarget++ = 0;     // append second null terminator
-            }
+            *pTarget++ = 0;     // append second null terminator
         }
     }
@@ -444 +452 @@
 {
     APIRET  arc = NO_ERROR;
-    if (!pEnv)
+    if (    (!pEnv)
+         || (!pEnv->papszVars)
+       )
         arc = ERROR_INVALID_PARAMETER;
     else
     {
-        if (!pEnv->papszVars)
-            arc = ERROR_INVALID_PARAMETER;
-        else
-        {
-            PSZ     *ppszThis = pEnv->papszVars;
-            PSZ     pszThis;
-            ULONG   ul = 0;
-
-            for (ul = 0;
-                 ul < pEnv->cVars;
-                 ul++)
-            {
-                pszThis = *ppszThis;
-                free(pszThis);
-                // *ppszThis = NULL;
-                // next environment string
-                ppszThis++;
-            }
-
-            free(pEnv->papszVars);
-            pEnv->cVars = 0;
-        }
+        PSZ     *ppszThis = pEnv->papszVars;
+        PSZ     pszThis;
+        ULONG   ul = 0;
+
+        for (ul = 0;
+             ul < pEnv->cVars;
+             ul++)
+        {
+            pszThis = *ppszThis;
+            free(pszThis);
+            // *ppszThis = NULL;
+            // next environment string
+            ppszThis++;
+        }
+
+        free(pEnv->papszVars);
+        pEnv->cVars = 0;
     }
 
@@ -920 +925 @@
  *@@changed V0.9.16 (2001-10-19) [umoeller]: added thread-1 check
  *@@changed V0.9.16 (2001-12-06) [umoeller]: now using doshSearchPath for finding pszExecutable if not qualified
+ *@@changed V0.9.16 (2002-01-04) [umoeller]: removed error report if startup directory was drive letter only
+ *@@changed V0.9.16 (2002-01-04) [umoeller]: added more detailed error reports and *FailingName params
  */
 
@@ -925 +932 @@
                    const PROGDETAILS *pcProgDetails, // in: program spec (req.)
                    ULONG ulFlags,          // in: APP_RUN_* flags
-                   HAPP *phapp)            // out: application handle if NO_ERROR is returned
+                   HAPP *phapp,            // out: application handle if NO_ERROR is returned
+                   ULONG cbFailingName,
+                   PSZ pszFailingName)
 {
     APIRET          arc = NO_ERROR;
     PROGDETAILS     ProgDetails;
+
+    if (pszFailingName)
+        *pszFailingName = '\0';
 
     if (!pcProgDetails || !phapp)
@@ -1081 +1093 @@
                     if (ProgDetails.pszStartupDir)
                     {
-                        if (!(arc = doshQueryPathAttr(ProgDetails.pszStartupDir,
-                                                      &ulAttr)))
-                            if (!(ulAttr & FILE_DIRECTORY))
-                                arc = ERROR_PATH_NOT_FOUND;
+                        // it is valid to specify a startup dir of "C:"
+                        if (    (strlen(ProgDetails.pszStartupDir) > 2)
+                             && (!(arc = doshQueryPathAttr(ProgDetails.pszStartupDir,
+                                                           &ulAttr)))
+                             && (!(ulAttr & FILE_DIRECTORY))
+                           )
+                            arc = ERROR_PATH_NOT_FOUND;
                     }
                 }
@@ -1222 +1237 @@
                                   MB_YESNO | MB_MOVEABLE)
                           == MBID_YES) */
+
+                if (pszFailingName)
+                    strhncpy0(pszFailingName, ProgDetails.pszExecutable, cbFailingName);
+
                 if (!(*phapp = WinStartApp(hwndNotify,
                                                     // receives WM_APPTERMINATENOTIFY
@@ -1235 +1254 @@
                                                 // 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));
+                {
+                    // cannot start app: unfortunately WinStartApp doesn't
+                    // return meaningful codes like DosStartSession, so
+                    // try to see what happened
+                    switch (ERRORIDERROR(WinGetLastError(0)))
+                    {
+                        case PMERR_DOS_ERROR: //  (0x1200)
+                        {
+                            // this is probably the case where the module
+                            // couldn't be loaded, so try DosStartSession
+                            // to get a meaningful return code... note that
+                            // this cannot handle hwndNotify then
+                            RESULTCODES result;
+                            arc = DosExecPgm(pszFailingName,
+                                             cbFailingName,
+                                             EXEC_ASYNC,
+                                             NULL, // ProgDetails.pszParameters,
+                                             NULL, // ProgDetails.pszEnvironment,
+                                             &result,
+                                             ProgDetails.pszExecutable);
+
+                            /* ULONG sid, pid;
+                            STARTDATA   SData;
+                            SData.Length  = sizeof(STARTDATA);
+                            SData.Related = SSF_RELATED_CHILD; //INDEPENDENT;
+                            SData.FgBg    = SSF_FGBG_FORE;
+                            SData.TraceOpt = SSF_TRACEOPT_NONE;
+
+                            SData.PgmTitle = ProgDetails.pszTitle;
+                            SData.PgmName = ProgDetails.pszExecutable;
+                            SData.PgmInputs = ProgDetails.pszParameters;
+
+                            SData.TermQ = NULL;
+                            SData.Environment = ProgDetails.pszEnvironment;
+                            SData.InheritOpt = SSF_INHERTOPT_PARENT;    // ignored
+                            SData.SessionType = SSF_TYPE_DEFAULT;
+                            SData.IconFile = 0;
+                            SData.PgmHandle = 0;
+
+                            SData.PgmControl = SSF_CONTROL_VISIBLE;
+
+                            SData.InitXPos  = 30;
+                            SData.InitYPos  = 40;
+                            SData.InitXSize = 200;
+                            SData.InitYSize = 140;
+                            SData.Reserved = 0;
+                            SData.ObjectBuffer  = pszFailingName;
+                            SData.ObjectBuffLen = cbFailingName;
+
+                            arc = DosStartSession(&SData, &sid, &pid);
+                            */
+                        }
+                        break;
+
+                        case PMERR_INVALID_APPL: //  (0x1530)
+                                // Attempted to start an application whose type is not
+                                // recognized by OS/2.
+                            arc = ERROR_INVALID_EXE_SIGNATURE;
+                        break;
+
+                        case PMERR_INVALID_PARAMETERS: //  (0x1208)
+                                // An application parameter value is invalid for
+                                // its converted PM type. For  example: a 4-byte
+                                // value outside the range -32 768 to +32 767 cannot be
+                                // converted to a SHORT, and a negative number cannot
+                                // be converted to a ULONG or USHORT.
+                            arc = ERROR_INVALID_DATA;
+                        break;
+
+                        case PMERR_STARTED_IN_BACKGROUND: //  (0x1532)
+                                // The application started a new session in the
+                                // background.
+                            arc = ERROR_SMG_START_IN_BACKGROUND;
+                        break;
+
+                        case PMERR_INVALID_WINDOW: // (0x1206)
+                                // The window specified with a Window List call
+                                // is not a valid frame window.
+
+                        default:
+                            arc = ERROR_BAD_FORMAT;
+                        break;
+                    }
+                }
             }
         }
@@ -1344 +1442 @@
                           &pd,
                           0,
-                          &happ))
+                          &happ,
+                          0,
+                          NULL))
        )
     {

trunk/src/helpers/dosh.c

@@ -1640 +1640 @@
  */
 
+/*
 APIRET doshOpenExisting(PCSZ pcszFilename,   // in: file name
                         ULONG ulOpenFlags,          // in: open flags
@@ -1654 +1655 @@
                     NULL));     // EAs
 }
-
-/*
- *@@ doshWriteAt:
- *      writes cb bytes (pointed to by pbData) to the
- *      position specified by ulMethod and lOffset into
- *      the file specified by hf.
- *
- *      If ulMethod is FILE_BEGIN, lOffset specifies the
- *      offset from the beginning of the file. With
- *      FILE_CURRENT, lOffset is considered from the
- *      current file pointer, and with FILE_END, it is
- *      considered from the end of the file.
- *
- *@@added V0.9.13 (2001-06-14) [umoeller]
- */
-
-APIRET doshWriteAt(HFILE hf,        // in: OS/2 file handle
-                   LONG lOffset,    // in: offset to write at (depends on ulMethod)
-                   ULONG ulMethod,  // in: one of FILE_BEGIN, FILE_CURRENT, FILE_END
-                   ULONG cb,        // in: bytes to write
-                   PBYTE pbData)    // in: ptr to bytes to write (must be cb bytes)
-{
-    APIRET arc;
-    ULONG ulDummy;
-    if (!(arc = DosSetFilePtr(hf,
-                              lOffset,
-                              ulMethod,
-                              &ulDummy)))
-        arc = DosWrite(hf,
-                       pbData,
-                       cb,
-                       &ulDummy);
-
-    return (arc);
-}
-
-/*
- *@@ doshReadAt:
- *      reads cb bytes from the position specified by
- *      ulMethod and lOffset into the buffer pointed to
- *      by pbData, which should be cb bytes in size.
- *
- *      Use lOffset and ulMethod as with doshWriteAt.
- *
- *@@added V0.9.13 (2001-06-14) [umoeller]
- */
-
-APIRET doshReadAt(HFILE hf,        // in: OS/2 file handle
-                  LONG lOffset,    // in: offset to write at (depends on ulMethod)
-                  ULONG ulMethod,  // in: one of FILE_BEGIN, FILE_CURRENT, FILE_END
-                  PULONG pcb,      // in: bytes to read, out: bytes read
-                  PBYTE pbData)    // out: read buffer (must be cb bytes)
-{
-    APIRET arc;
-    ULONG cb = *pcb;
-    ULONG ulDummy;
-
-    *pcb = 0;
-
-    if (!(arc = DosSetFilePtr(hf,
-                              lOffset,
-                              ulMethod,
-                              &ulDummy)))
-    {
-        if (!(arc = DosRead(hf,
-                            pbData,
-                            cb,
-                            &ulDummy)))
-            *pcb = ulDummy;     // bytes read
-    }
-
-    return (arc);
-}
+*/
 
 /*
@@ -1741 +1670 @@
  +      +-------------------------+------+------------+-----------+
  +      |  XOPEN_READ_EXISTING    | read | opens      | fails     |
+ +      |                         |      | fptr = 0   |           |
+ +      +-------------------------+------+------------+-----------+
+ +      |  XOPEN_READWRITE_EXISTING r/w  | opens      | fails     |
  +      |                         |      | fptr = 0   |           |
  +      +-------------------------+------+------------+-----------+
@@ -1802 +1734 @@
             fsOpenMode |=   OPEN_SHARE_DENYWRITE
                           | OPEN_ACCESS_READONLY;
-            // _Pmpf((__FUNCTION__ ": opening XOPEN_READ_EXISTING"));
 
             // run this first, because if the file doesn't
@@ -1808 +1739 @@
             // which isn't that meaningful
             // V0.9.16 (2001-12-08) [umoeller]
+            arc = doshQueryPathSize(pcszFilename,
+                                    pcbFile);
+        break;
+
+        case XOPEN_READWRITE_EXISTING:
+            fsOpenFlags =   OPEN_ACTION_FAIL_IF_NEW
+                          | OPEN_ACTION_OPEN_IF_EXISTS;
+            fsOpenMode |=   OPEN_SHARE_DENYWRITE
+                          | OPEN_ACCESS_READWRITE;
+
             arc = doshQueryPathSize(pcszFilename,
                                     pcbFile);
@@ -1928 +1869 @@
 
 /*
+ *@@ doshReadAt:
+ *      reads cb bytes from the position specified by
+ *      lOffset into the buffer pointed to by pbData,
+ *      which should be cb bytes in size.
+ *
+ *      Note that lOffset is always considered to
+ *      be from the beginning of the file (FILE_BEGIN
+ *      method).
+ *
+ *@@added V0.9.13 (2001-06-14) [umoeller]
+ *@@changed V0.9.16 (2001-12-18) [umoeller]: now with XFILE, and always using FILE_BEGIN
+ */
+
+APIRET doshReadAt(PXFILE pFile,
+                  ULONG ulOffset,    // in: offset to read from (from beginning of file)
+                  PULONG pcb,      // in: bytes to read, out: bytes read
+                  PBYTE pbData)    // out: read buffer (must be cb bytes)
+{
+    APIRET arc;
+    ULONG cb = *pcb;
+    ULONG ulDummy;
+
+    if (!(arc = doshLockFile(pFile)))   // this checks for pFile
+    {
+        *pcb = 0;
+
+        if (!(arc = DosSetFilePtr(pFile->hf,
+                                  (LONG)ulOffset,
+                                  FILE_BEGIN,
+                                  &ulDummy)))
+        {
+            if (!(arc = DosRead(pFile->hf,
+                                pbData,
+                                cb,
+                                &ulDummy)))
+                *pcb = ulDummy;     // bytes read
+        }
+
+        doshUnlockFile(pFile);
+    }
+
+    return (arc);
+}
+
+/*
  *@@ doshWrite:
  *      writes the specified data to the file.
@@ -1937 +1923 @@
  *      writing.
  *
+ *      Note that this expects that the file
+ *      pointer is at the end of the file, or
+ *      you will get garbage.
+ *
  *@@added V0.9.16 (2001-10-19) [umoeller]
  *@@changed V0.9.16 (2001-12-02) [umoeller]: added XOPEN_BINARY \r\n support
@@ -1943 +1933 @@
 
 APIRET doshWrite(PXFILE pFile,
-                 PCSZ pcsz,
-                 ULONG cb)
+                 ULONG cb,
+                 PCSZ pbData)
 {
     APIRET arc = NO_ERROR;
-    if ((!pFile) || (!pcsz))
+    if ((!pFile) || (!pbData))
         arc = ERROR_INVALID_PARAMETER;
     else
     {
         if (!cb)
-            cb = strlen(pcsz);
+            cb = strlen(pbData);
 
         if (!cb)
@@ -1967 +1957 @@
                 // count all \n first
                 ULONG cNewLines = 0;
-                PCSZ pSource = pcsz;
+                PCSZ pSource = pbData;
                 ULONG ul;
                 for (ul = 0;
@@ -1987 +1977 @@
                     {
                         PSZ pTarget = pszNew;
-                        pSource = pcsz;
+                        pSource = pbData;
                         for (ul = 0;
                              ul < cb;
@@ -2010 +2000 @@
                                          (pszNew)
                                                 ? pszNew
-                                                : (PSZ)pcsz,
+                                                : (PSZ)pbData,
                                          cb,
                                          &cbWritten)))
@@ -2021 +2011 @@
                 free(pszNew);
         }
+    }
+
+    return (arc);
+}
+
+/*
+ *@@ doshWriteAt:
+ *      writes cb bytes (pointed to by pbData) to the
+ *      specified file at the position lOffset (from
+ *      the beginning of the file).
+ *
+ *@@added V0.9.13 (2001-06-14) [umoeller]
+ */
+
+APIRET doshWriteAt(PXFILE pFile,
+                   ULONG ulOffset,    // in: offset to write at
+                   ULONG cb,        // in: bytes to write
+                   PCSZ pbData)     // in: ptr to bytes to write (must be cb bytes)
+{
+    APIRET arc;
+    if (!(arc = doshLockFile(pFile)))   // this checks for pFile
+    {
+        ULONG cbWritten;
+        if (!(arc = DosSetFilePtr(pFile->hf,
+                                  (LONG)ulOffset,
+                                  FILE_BEGIN,
+                                  &cbWritten)))
+        {
+            if (!(arc = DosWrite(pFile->hf,
+                                 (PSZ)pbData,
+                                 cb,
+                                 &cbWritten)))
+            {
+                if (ulOffset + cbWritten > pFile->cbCurrent)
+                    pFile->cbCurrent = ulOffset + cbWritten;
+            }
+        }
+
+        doshUnlockFile(pFile);
     }
 
@@ -2059 +2088 @@
         {
             if (!(arc = doshWrite(pFile,
-                                  szTemp,
-                                  ulLength)))
+                                  ulLength,
+                                  szTemp)))
             {
                 va_list arg_ptr;
@@ -2073 +2102 @@
 
                 arc = doshWrite(pFile,
-                                (PCSZ)szTemp,
-                                ulLength);
+                                ulLength,
+                                szTemp);
             }
         }

trunk/src/helpers/dosh2.c

@@ -65 +65 @@
 #include "helpers\dosh.h"
 #include "helpers\ensure.h"
+#include "helpers\nls.h"
 #include "helpers\standards.h"
 #include "helpers\stringh.h"
@@ -441 +442 @@
  *@@changed V0.9.16 (2001-12-08) [umoeller]: fLibrary was never set, works for LX and NE now
  *@@changed V0.9.16 (2001-12-08) [umoeller]: some speed optimizations, changed some return codes
+ *@@changed V0.9.16 (2002-01-04) [umoeller]: added fixes for COM, BAT, CMD extensions
  */
 
@@ -446 +448 @@
                     PEXECUTABLE* ppExec)
 {
-    APIRET  arc = NO_ERROR;
-
-    ULONG   ulAction = 0;
-    HFILE   hFile;
+    APIRET      arc = NO_ERROR;
+
     PEXECUTABLE pExec = NULL;
+
+    PXFILE      pFile = NULL;
+    ULONG       cbFile = 0;
+    PCSZ        pExt;
+    BOOL        fOpenFile = FALSE;
 
     if (!ppExec)
@@ -460 +465 @@
     memset(pExec, 0, sizeof(EXECUTABLE));
 
-    if (!(arc = DosOpen((PSZ)pcszExecutable,
-                        &hFile,
-                        &ulAction,                      // out: action taken
-                        0,                              // in: new file (ignored for read-mode)
-                        0,                              // in: new file attribs (ignored)
-                        // open-flags
-                        OPEN_ACTION_FAIL_IF_NEW
-                           | OPEN_ACTION_OPEN_IF_EXISTS,
-                        // open-mode
-                        OPEN_FLAGS_FAIL_ON_ERROR        // report errors to caller
-                           | OPEN_FLAGS_SEQUENTIAL
-                           | OPEN_FLAGS_NOINHERIT
-                           // | OPEN_SHARE_DENYNONE
-                           | OPEN_SHARE_DENYWRITE       // changed V0.9.16 (2001-12-08) [umoeller]
-                           | OPEN_ACCESS_READONLY,      // read-only mode
-                        NULL)))                         // no EAs
+    // check some of the default extensions
+    // V0.9.16 (2002-01-04) [umoeller]
+    if (pExt = doshGetExtension(pcszExecutable))
+    {
+        if (!stricmp(pExt, "COM"))
+        {
+            // I am not willing to find out more about the
+            // .COM executable format, so for this one case,
+            // let OS/2 determine what we have here
+            ULONG ulDosAppType = 0;
+            if (!(arc = DosQueryAppType((PSZ)pcszExecutable, &ulDosAppType)))
+            {
+                if (ulDosAppType & FAPPTYP_DOS)           // 0x20
+                    pExec->ulOS = EXEOS_DOS3;
+                else
+                    pExec->ulOS = EXEOS_OS2;
+
+                pExec->ulExeFormat = EXEFORMAT_COM;
+            }
+        }
+        else if (!stricmp(pExt, "BAT"))
+        {
+            pExec->ulOS = EXEOS_DOS3;
+            pExec->ulExeFormat = EXEFORMAT_TEXT_BATCH;
+        }
+        else if (!stricmp(pExt, "CMD"))
+        {
+            pExec->ulOS = EXEOS_OS2;
+            pExec->ulExeFormat = EXEFORMAT_TEXT_CMD;
+        }
+        else
+            fOpenFile = TRUE;
+    }
+
+    if (    (fOpenFile)
+         && (!(arc = doshOpen((PSZ)pcszExecutable,
+                              XOPEN_READ_EXISTING,
+                              &cbFile,
+                              &pFile)))
+       )
     {
         // file opened successfully:
+        pExec->pFile = pFile;
 
         // read old DOS EXE header
@@ -485 +515 @@
         {
             pExec->cbDosExeHeader = sizeof(DOSEXEHEADER);
-            if (!(arc = doshReadAt(hFile,
+            if (!(arc = doshReadAt(pFile,
                                    0,
-                                   FILE_BEGIN,
                                    &pExec->cbDosExeHeader,      // in/out
                                    (PBYTE)pExec->pDosExeHeader)))
@@ -554 +583 @@
                     if (!(pbHeader = (PBYTE)malloc(cbRead)))
                         arc = ERROR_NOT_ENOUGH_MEMORY;
-                    else if (!(arc = doshReadAt(hFile,
+                    else if (!(arc = doshReadAt(pFile,
                                                 ulNewHeaderOfs,
-                                                FILE_BEGIN,
                                                 &cbRead,
                                                 pbHeader)))
@@ -626 +654 @@
                                 // plus an extended header, so check what
                                 // we've got
-                                ULONG cbPE =   24
-                                             + ((PPEHEADER)pbHeader)->usHeaderSize;
+                                ULONG cbPE =   sizeof(PEHEADER); // 24
+                                   //           + ((PPEHEADER)pbHeader)->usHeaderSize;
                                 pExec->pPEHeader = (PPEHEADER)realloc(pbHeader,
                                                                       cbPE);
@@ -635 +663 @@
                                 pExec->f32Bits = TRUE;
 
+                                /*
                                 // we have the first 24 bytes already, so
-                                // go for the next chunk
-                                if (cbRead = pExec->pPEHeader->usHeaderSize)
+                                // go for the next chunk, if this is more
+                                // than we have in PEHEADER
+                                if (    (cbRead < cbPE)
+                                     && (cbRead = pExec->pPEHeader->usHeaderSize)
+                                   )
                                 {
+                                    _Pmpf(("  usHdrSize %d, sizeof(PEHEADER) %d, cbRead %d, cbPE %d --> reading extended header",
+                                           pExec->pPEHeader->usHeaderSize,
+                                           sizeof(PEHEADER),
+                                           cbRead,
+                                           cbPE));
                                     if (!(arc = doshReadAt(hFile,
                                                            ulNewHeaderOfs + 24,
@@ -647 +684 @@
                                     }
                                     else
+                                    {
                                         arc = ERROR_BAD_EXE_FORMAT;
+                                        FREE(pExec->pPEHeader);
+                                    }
                                 }
+                                else
+                                    _Pmpf(("  already got extended header"));
+                                */
                             }
                         }
                         else
+                        {
                             // strange type:
                             arc = ERROR_INVALID_EXE_SIGNATURE;
-
-                        if (pbCheckOS)
+                            FREE(pbHeader);
+                        }
+
+                        if ((!arc) && (pbCheckOS))
                         {
                             // BYTE to check for operating system
@@ -681 +727 @@
                             }
                         }
-                    }
-                }
-            } // end if (!(arc = DosSetFilePtr(hFile,
-        } // end if pExec->pDosExeHeader = (PDOSEXEHEADER)malloc(sizeof(DOSEXEHEADER));
-
-        // store exec's HFILE
-        pExec->hfExe = hFile;
+                    } // end if (!(arc = doshReadAt(hFile,
+                } // end if (fLoadNewHeader)
+            } // end if (!(arc = doshReadAt(hFile,
+        } // end else if (!(pExec->pDosExeHeader = (PDOSEXEHEADER)malloc(sizeof(DOSEXEHEADER))))
+
     } // end if (!(arc = DosOpen((PSZ)pcszExecutable,
 
@@ -941 +985 @@
     else
     {
+        PXFILE      pFile = pExec->pFile;
+
         ULONG       ulNRNTOfs = 0;
 
@@ -978 +1024 @@
             // move EXE file pointer to offset of non-resident name table
             // (from LX header)
-            if (!(arc = DosSetFilePtr(pExec->hfExe,     // file is still open
+            if (!(arc = DosSetFilePtr(pFile->hf,     // file is still open
                                       ulNRNTOfs,      // ofs determined above
                                       FILE_BEGIN,
@@ -990 +1036 @@
                 else
                 {
-                    if (!(arc = DosRead(pExec->hfExe,
+                    if (!(arc = DosRead(pFile->hf,
                                         pszNameTable,
                                         2000,
@@ -1069 +1115 @@
         PFSYSMODULE paModules = NULL;
         int i;
+        HFILE hfExe = pExec->pFile->hf;
 
         ULONG ulNewHeaderOfs = 0;       // V0.9.12 (2001-05-03) [umoeller]
@@ -1092 +1139 @@
                 memset(paModules, 0, cb);   // V0.9.9 (2001-04-03) [umoeller]
 
-                ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                ENSURE_SAFE(DosSetFilePtr(hfExe,
                                           pExec->pLXHeader->ulImportModTblOfs
                                             + ulNewHeaderOfs, // V0.9.12 (2001-05-03) [umoeller]
@@ -1103 +1150 @@
 
                     // reading the length of the module name
-                    ENSURE_SAFE(DosRead(pExec->hfExe, &bLen, 1, &ulDummy));
+                    ENSURE_SAFE(DosRead(hfExe, &bLen, 1, &ulDummy));
 
                     // reading the module name
-                    ENSURE_SAFE(DosRead(pExec->hfExe,
+                    ENSURE_SAFE(DosRead(hfExe,
                                         paModules[i].achModuleName,
                                         bLen,
@@ -1143 +1190 @@
                     // then we read the name in the import table
 
-                    ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE_SAFE(DosSetFilePtr(hfExe,
                                               pExec->pNEHeader->usModRefTblOfs
                                                 + ulNewHeaderOfs // V0.9.12 (2001-05-03) [umoeller]
@@ -1150 +1197 @@
                                               &ulDummy));
 
-                    ENSURE_SAFE(DosRead(pExec->hfExe, &usOfs, 2, &ulDummy));
-
-                    ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE_SAFE(DosRead(hfExe, &usOfs, 2, &ulDummy));
+
+                    ENSURE_SAFE(DosSetFilePtr(hfExe,
                                               pExec->pNEHeader->usImportTblOfs
                                                 + ulNewHeaderOfs // V0.9.12 (2001-05-03) [umoeller]
@@ -1159 +1206 @@
                                               &ulDummy));
 
-                    ENSURE_SAFE(DosRead(pExec->hfExe, &bLen, 1, &ulDummy));
-
-                    ENSURE_SAFE(DosRead(pExec->hfExe,
+                    ENSURE_SAFE(DosRead(hfExe, &bLen, 1, &ulDummy));
+
+                    ENSURE_SAFE(DosRead(hfExe,
                                         paModules[i].achModuleName,
                                         bLen,
@@ -1224 +1271 @@
 
     ULONG ulNewHeaderOfs = 0; // V0.9.12 (2001-05-03) [umoeller]
+    HFILE hfExe = pExec->pFile->hf;
 
     if (pExec->pDosExeHeader)
@@ -1229 +1277 @@
         ulNewHeaderOfs = pExec->pDosExeHeader->ulNewHeaderOfs;
 
-    ENSURE(DosSetFilePtr(pExec->hfExe,
+    ENSURE(DosSetFilePtr(hfExe,
                          pExec->pLXHeader->ulEntryTblOfs
                            + ulNewHeaderOfs, // V0.9.12 (2001-05-03) [umoeller]
@@ -1241 +1289 @@
                bFlag;
 
-        ENSURE(DosRead(pExec->hfExe, &bCnt, 1, &ulDummy));
+        ENSURE(DosRead(hfExe, &bCnt, 1, &ulDummy));
 
         if (bCnt == 0)
@@ -1247 +1295 @@
             break;
 
-        ENSURE(DosRead(pExec->hfExe, &bType, 1, &ulDummy));
+        ENSURE(DosRead(hfExe, &bType, 1, &ulDummy));
 
         switch (bType & 0x7F)
@@ -1269 +1317 @@
 
             case 1:
-                ENSURE(DosSetFilePtr(pExec->hfExe,
+                ENSURE(DosSetFilePtr(hfExe,
                                      sizeof(USHORT),
                                      FILE_CURRENT,
@@ -1276 +1324 @@
                 for (i = 0; i < bCnt; i ++)
                 {
-                    ENSURE(DosRead(pExec->hfExe, &bFlag, 1, &ulDummy));
+                    ENSURE(DosRead(hfExe, &bFlag, 1, &ulDummy));
 
                     if (bFlag & 0x01)
@@ -1291 +1339 @@
                     usOrdinal++;
 
-                    ENSURE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE(DosSetFilePtr(hfExe,
                                          sizeof(USHORT),
                                          FILE_CURRENT,
@@ -1308 +1356 @@
 
             case 2:
-                ENSURE(DosSetFilePtr(pExec->hfExe,
+                ENSURE(DosSetFilePtr(hfExe,
                                      sizeof(USHORT),
                                      FILE_CURRENT,
@@ -1315 +1363 @@
                 for (i = 0; i < bCnt; i ++)
                 {
-                    ENSURE(DosRead(pExec->hfExe, &bFlag, 1, &ulDummy));
+                    ENSURE(DosRead(hfExe, &bFlag, 1, &ulDummy));
 
                     if (bFlag & 0x01)
@@ -1330 +1378 @@
                     usOrdinal++;
 
-                    ENSURE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE(DosSetFilePtr(hfExe,
                                          sizeof(USHORT) + sizeof(USHORT),
                                          FILE_CURRENT,
@@ -1347 +1395 @@
 
             case 3:
-                ENSURE(DosSetFilePtr(pExec->hfExe,
+                ENSURE(DosSetFilePtr(hfExe,
                                      sizeof(USHORT),
                                      FILE_CURRENT,
@@ -1354 +1402 @@
                 for (i = 0; i < bCnt; i ++)
                 {
-                    ENSURE(DosRead(pExec->hfExe, &bFlag, 1, &ulDummy));
+                    ENSURE(DosRead(hfExe, &bFlag, 1, &ulDummy));
 
                     if (bFlag & 0x01)
@@ -1369 +1417 @@
                     usOrdinal++;
 
-                    ENSURE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE(DosSetFilePtr(hfExe,
                                          sizeof(ULONG),
                                          FILE_CURRENT,
@@ -1385 +1433 @@
 
             case 4:
-                ENSURE(DosSetFilePtr(pExec->hfExe,
+                ENSURE(DosSetFilePtr(hfExe,
                                      sizeof(USHORT),
                                      FILE_CURRENT,
@@ -1392 +1440 @@
                 for (i = 0; i < bCnt; i ++)
                 {
-                    ENSURE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE(DosSetFilePtr(hfExe,
                                          sizeof(BYTE) + sizeof(USHORT) + sizeof(ULONG),
                                          FILE_CURRENT,
@@ -1464 +1512 @@
 
     ULONG ulNewHeaderOfs = 0;
+    HFILE hfExe = pExec->pFile->hf;
 
     if (pExec->pDosExeHeader)
@@ -1469 +1518 @@
         ulNewHeaderOfs = pExec->pDosExeHeader->ulNewHeaderOfs;
 
-    ENSURE(DosSetFilePtr(pExec->hfExe,
+    ENSURE(DosSetFilePtr(hfExe,
                          pExec->pNEHeader->usEntryTblOfs
                            + ulNewHeaderOfs, // V0.9.12 (2001-05-03) [umoeller]
@@ -1481 +1530 @@
              bFlag;
 
-        ENSURE(DosRead(pExec->hfExe, &bCnt, 1, &ulDummy));
+        ENSURE(DosRead(hfExe, &bCnt, 1, &ulDummy));
 
         if (bCnt == 0)
@@ -1487 +1536 @@
             break;
 
-        ENSURE(DosRead(pExec->hfExe, &bType, 1, &ulDummy));
+        ENSURE(DosRead(hfExe, &bType, 1, &ulDummy));
 
         if (bType)
@@ -1493 +1542 @@
             for (i = 0; i < bCnt; i++)
             {
-                ENSURE(DosRead(pExec->hfExe,
+                ENSURE(DosRead(hfExe,
                                &bFlag,
                                1,
@@ -1514 +1563 @@
                 {
                     // moveable segment
-                    ENSURE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE(DosSetFilePtr(hfExe,
                                          5,
                                          FILE_CURRENT,
@@ -1522 +1571 @@
                 {
                     // fixed segment or constant (0xFE)
-                    ENSURE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE(DosSetFilePtr(hfExe,
                                          2,
                                          FILE_CURRENT,
@@ -1585 +1634 @@
     USHORT        usOrdinal;
     PFSYSFUNCTION pFunction;
+    HFILE hfExe = pExec->pFile->hf;
 
     while (TRUE)
@@ -1592 +1642 @@
         // int    i;
 
-        ENSURE(DosRead(pExec->hfExe, &bLen, 1, &ulDummy));
+        ENSURE(DosRead(hfExe, &bLen, 1, &ulDummy));
 
         if (bLen == 0)
@@ -1598 +1648 @@
             break;
 
-        ENSURE(DosRead(pExec->hfExe, &achName, bLen, &ulDummy));
+        ENSURE(DosRead(hfExe, &achName, bLen, &ulDummy));
         achName[bLen] = 0;
 
-        ENSURE(DosRead(pExec->hfExe, &usOrdinal, sizeof(USHORT), &ulDummy));
+        ENSURE(DosRead(hfExe, &usOrdinal, sizeof(USHORT), &ulDummy));
 
         if ((pFunction = (PFSYSFUNCTION)bsearch(&usOrdinal,
@@ -1668 +1718 @@
         ULONG ulDummy;
 
+        HFILE hfExe = pExec->pFile->hf;
         ULONG ulNewHeaderOfs = 0; // V0.9.12 (2001-05-03) [umoeller]
 
@@ -1702 +1753 @@
                 // we now scan the resident name table entries
 
-                ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                ENSURE_SAFE(DosSetFilePtr(hfExe,
                                           pExec->pLXHeader->ulResdNameTblOfs
                                             + ulNewHeaderOfs, // V0.9.12 (2001-05-03) [umoeller]
@@ -1713 +1764 @@
                 // whose offset is _from the begining of the file_
 
-                ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                ENSURE_SAFE(DosSetFilePtr(hfExe,
                                           pExec->pLXHeader->ulNonResdNameTblOfs,
                                           FILE_BEGIN,
@@ -1750 +1801 @@
                 // we now scan the resident name table entries
 
-                ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                ENSURE_SAFE(DosSetFilePtr(hfExe,
                                           pExec->pNEHeader->usResdNameTblOfs
                                             + ulNewHeaderOfs, // V0.9.12 (2001-05-03) [umoeller]
@@ -1761 +1812 @@
                 // whose offset is _from the begining of the file_
 
-                ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                ENSURE_SAFE(DosSetFilePtr(hfExe,
                                           pExec->pNEHeader->ulNonResdTblOfs,
                                           FILE_BEGIN,
@@ -1842 +1893 @@
         PFSYSRESOURCE   paResources = NULL;
 
+        HFILE hfExe = pExec->pFile->hf;
         ULONG           ulNewHeaderOfs = 0; // V0.9.12 (2001-05-03) [umoeller]
 
@@ -1886 +1938 @@
                 memset(paResources, 0, cb); // V0.9.9 (2001-04-03) [umoeller]
 
-                ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                ENSURE_SAFE(DosSetFilePtr(hfExe,
                                           pLXHeader->ulResTblOfs
                                             + ulNewHeaderOfs, // V0.9.12 (2001-05-03) [umoeller]
@@ -1894 +1946 @@
                 for (i = 0; i < cResources; i++)
                 {
-                    ENSURE_SAFE(DosRead(pExec->hfExe, &rs, 14, &ulDummy));
+                    ENSURE_SAFE(DosRead(hfExe, &rs, 14, &ulDummy));
 
                     paResources[i].ulID = rs.name;
@@ -1912 +1964 @@
                                           * (paResources[i].ulFlag - 1));
 
-                    ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE_SAFE(DosSetFilePtr(hfExe,
                                               ulOfsThis,
                                               FILE_BEGIN,
                                               &ulDummy));
 
-                    ENSURE_SAFE(DosRead(pExec->hfExe, &ot, sizeof(ot), &ulDummy));
+                    ENSURE_SAFE(DosRead(hfExe, &ot, sizeof(ot), &ulDummy));
 
                     paResources[i].ulFlag  = ((ot.o32_flags & OBJWRITE)
@@ -1968 +2020 @@
                     // we first read the resources IDs and types
 
-                    ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE_SAFE(DosSetFilePtr(hfExe,
                                               pNEHeader->usResTblOfs
                                                 + ulNewHeaderOfs, // V0.9.12 (2001-05-03) [umoeller]
@@ -1976 +2028 @@
                     for (i = 0; i < cResources; i++)
                     {
-                        ENSURE_SAFE(DosRead(pExec->hfExe, &rti, sizeof(rti), &ulDummy));
+                        ENSURE_SAFE(DosRead(hfExe, &rti, sizeof(rti), &ulDummy));
 
                         paResources[i].ulID = rti.name;
@@ -1986 +2038 @@
                     for (i = 0; i < cResources; i++)
                     {
-                        ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                        ENSURE_SAFE(DosSetFilePtr(hfExe,
                                                   ulNewHeaderOfs // V0.9.12 (2001-05-03) [umoeller]
                                                     + pNEHeader->usSegTblOfs
@@ -1996 +2048 @@
                                                     &ulDummy));
 
-                        ENSURE_SAFE(DosRead(pExec->hfExe, &ns, sizeof(ns), &ulDummy));
+                        ENSURE_SAFE(DosRead(hfExe, &ns, sizeof(ns), &ulDummy));
 
                         paResources[i].ulSize = ns.ns_cbseg;
@@ -2013 +2065 @@
                 ULONG  ulDummy;
 
-                ENSURE(DosSetFilePtr(pExec->hfExe,
+                ENSURE(DosSetFilePtr(hfExe,
                                      pNEHeader->usResTblOfs
                                        + ulNewHeaderOfs, // V0.9.12 (2001-05-03) [umoeller]
@@ -2019 +2071 @@
                                      &ulDummy));
 
-                ENSURE(DosRead(pExec->hfExe,
+                ENSURE(DosRead(hfExe,
                                &usAlignShift,
                                sizeof(usAlignShift),
@@ -2029 +2081 @@
                     USHORT usCount;
 
-                    ENSURE(DosRead(pExec->hfExe,
+                    ENSURE(DosRead(hfExe,
                                    &usTypeID,
                                    sizeof(usTypeID),
@@ -2037 +2089 @@
                         break;
 
-                    ENSURE(DosRead(pExec->hfExe,
+                    ENSURE(DosRead(hfExe,
                                    &usCount,
                                    sizeof(usCount),
                                    &ulDummy));
 
-                    ENSURE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE(DosSetFilePtr(hfExe,
                                          sizeof(ULONG),
                                          FILE_CURRENT,
@@ -2050 +2102 @@
 
                     // first pass, skip NAMEINFO table
-                    ENSURE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE(DosSetFilePtr(hfExe,
                                          usCount*6*sizeof(USHORT),
                                          FILE_CURRENT,
@@ -2067 +2119 @@
                     memset(paResources, 0, cb);
 
-                    ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                    ENSURE_SAFE(DosSetFilePtr(hfExe,
                                               pNEHeader->usResTblOfs
                                                 + ulNewHeaderOfs,
@@ -2073 +2125 @@
                                               &ulDummy));
 
-                    ENSURE_SAFE(DosRead(pExec->hfExe,
+                    ENSURE_SAFE(DosRead(hfExe,
                                         &usAlignShift,
                                         sizeof(usAlignShift),
@@ -2084 +2136 @@
                         int i;
 
-                        ENSURE_SAFE(DosRead(pExec->hfExe,
+                        ENSURE_SAFE(DosRead(hfExe,
                                             &usTypeID,
                                             sizeof(usTypeID),
@@ -2092 +2144 @@
                             break;
 
-                        ENSURE_SAFE(DosRead(pExec->hfExe,
+                        ENSURE_SAFE(DosRead(hfExe,
                                             &usCount,
                                             sizeof(usCount),
                                             &ulDummy));
 
-                        ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                        ENSURE_SAFE(DosSetFilePtr(hfExe,
                                                   sizeof(ULONG),
                                                   FILE_CURRENT,
@@ -2109 +2161 @@
                                    usID;
 
-                            ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                            ENSURE_SAFE(DosSetFilePtr(hfExe,
                                                       sizeof(USHORT),
                                                       FILE_CURRENT,
                                                       &ulDummy));
 
-                            ENSURE_SAFE(DosRead(pExec->hfExe,
+                            ENSURE_SAFE(DosRead(hfExe,
                                                 &usLength,
                                                 sizeof(USHORT),
                                                 &ulDummy));
-                            ENSURE_SAFE(DosRead(pExec->hfExe,
+                            ENSURE_SAFE(DosRead(hfExe,
                                                 &usFlags,
                                                 sizeof(USHORT),
                                                 &ulDummy));
-                            ENSURE_SAFE(DosRead(pExec->hfExe,
+                            ENSURE_SAFE(DosRead(hfExe,
                                                 &usID,
                                                 sizeof(USHORT),
                                                 &ulDummy));
 
-                            ENSURE_SAFE(DosSetFilePtr(pExec->hfExe,
+                            ENSURE_SAFE(DosSetFilePtr(hfExe,
                                                       2*sizeof(USHORT),
                                                       FILE_CURRENT,
@@ -2234 +2286 @@
     else
     {
+        PXFILE pFile = pExec->pFile;
         ULONG ulNewHeaderOfs = 0;
         ULONG cb;
@@ -2246 +2299 @@
                                         (PBYTE*)&pExec->pRsTbl,
                                         &cb)))
-             && (!(arc = doshReadAt(pExec->hfExe,
+             && (!(arc = doshReadAt(pFile,
                                     pLXHeader->ulResTblOfs
                                       + ulNewHeaderOfs,
-                                    FILE_BEGIN,
                                     &cb,
                                     (PBYTE)pExec->pRsTbl)))
@@ -2259 +2311 @@
                                             (PBYTE*)&pExec->pObjTbl,
                                             &cb)))
-                 && (!(arc = doshReadAt(pExec->hfExe,
+                 && (!(arc = doshReadAt(pFile,
                                         pLXHeader->ulObjTblOfs
                                           + ulNewHeaderOfs,
-                                        FILE_BEGIN,
                                         &cb,
                                         (PBYTE)pExec->pObjTbl)))
@@ -2272 +2323 @@
                                                 (PBYTE*)&pExec->pObjPageTbl,
                                                 &cb)))
-                     && (!(arc = doshReadAt(pExec->hfExe,
+                     && (!(arc = doshReadAt(pFile,
                                             pLXHeader->ulObjPageTblOfs
                                               + ulNewHeaderOfs,
-                                            FILE_BEGIN,
                                             &cb,
                                             (PBYTE)pExec->pObjPageTbl)))
@@ -2341 +2391 @@
     else
     {
+        PXFILE pFile = pExec->pFile;
         ULONG ulNewHeaderOfs = 0;
         ULONG cb;
@@ -2353 +2404 @@
                                         (PBYTE*)&pExec->paOS2NEResTblEntry,
                                         &cb)))
-             && (!(arc = doshReadAt(pExec->hfExe,
+             && (!(arc = doshReadAt(pFile,
                                     pNEHeader->usResTblOfs
                                       + ulNewHeaderOfs,
-                                    FILE_BEGIN,
                                     &cb,
                                     (PBYTE)pExec->paOS2NEResTblEntry)))
@@ -2366 +2416 @@
                                             (PBYTE*)&pExec->paOS2NESegments,
                                             &cb)))
-                 && (!(arc = doshReadAt(pExec->hfExe,
+                 && (!(arc = doshReadAt(pFile,
                                         pNEHeader->usResTblOfs
                                           + ulNewHeaderOfs
                                           - cb, // pNEHeader->usResSegmCount * sizeof(struct new_seg)
-                                        FILE_BEGIN,
                                         &cb,
                                         (PBYTE)pExec->paOS2NESegments)))
@@ -2461 +2510 @@
         }
 
-        if (pExec->hfExe)
-            arc = DosClose(pExec->hfExe);
+        doshClose(&pExec->pFile);
 
         free(pExec);
@@ -4113 +4161 @@
     }
 }
+
+/*
+ *@@category: Helpers\Control program helpers\Wildcard matching
+ *      See doshMatch.
+ */
+
+/* ******************************************************************
+ *
+ *   Wildcard matching
+ *
+ ********************************************************************/
+
+/*
+ * PerformMatch:
+ *      compares a single path component. The input strings must
+ *      not have slashes or backslashes in them.
+ *
+ *      fHasDot must be true if pName contains at least one dot.
+ *
+ *      Note that this function is recursive.
+ */
+
+BOOL PerformMatch(PCSZ pMask,
+                  PCSZ pName,
+                  int fHasDot)
+{
+    while (TRUE)
+    {
+        // go thru the pMask char by char
+        switch (*pMask)
+        {
+            case 0:
+                // if we've reached the end of the mask,
+                // we better have the end of the name too
+                if (*pName == 0)
+                    return TRUE;
+                return FALSE;
+
+            case '?':
+                // a question mark matches one single character;
+                // it does _not_ match a dot;
+                // at the end of the component, it also matches
+                // no characters
+                if (    (*pName != '.')
+                     && (*pName != 0)
+                   )
+                    ++pName;
+                ++pMask;
+            break;
+
+            case '*':
+                // asterisk matches zero or more characters
+
+                // skip extra asterisks
+                do
+                {
+                    ++pMask;
+                } while (*pMask == '*');
+
+                // pMask points to after '*';
+                // pName is unchanged... so for each pName
+                // that follows, check if it matches
+                while (TRUE)
+                {
+                    if (PerformMatch(pMask, pName, fHasDot))
+                        // the remainder matched:
+                        // then everything matches
+                        return TRUE;
+
+                    if (*pName == 0)
+                        return FALSE;
+
+                    // didn't match: try next pName
+                    ++pName;
+                }
+
+            case '.':
+                // a dot matches a dot only, even if the name doesn't
+                // have one at the end
+                ++pMask;
+                if (*pName == '.')
+                    ++pName;
+                else if (    (fHasDot)
+                          || (*pName != 0)
+                        )
+                    return FALSE;
+            break;
+
+            default:
+                if (*pMask++ != *pName++)
+                    return FALSE;
+            break;
+        }
+    }
+}
+
+/*
+ *@@ doshMatch:
+ *      this matches '*' and '?' wildcards, similar to what
+ *      DosEditName does. It returns TRUE if the given name
+ *      matches the given mask.
+ *
+ *      However, this does not require a file to be present, but
+ *      works on strings only.
+ *
+ *      This accepts both short and fully qualified masks and
+ *      names, but the following rules apply:
+ *
+ *      --  Either both the mask and the name must be fully
+ *          qualified, or both must not. Otherwise the match fails.
+ *
+ *      --  If fully qualified, only the last component may contain
+ *          wildcards.
+ *
+ *      --  This compares without respect to case always.
+ *
+ *      --  As opposed to the WPS, this handles multiple dots in
+ *          filenames correctly. For example, the WPS will not
+ *          match "*.ZIP" against "whatever-0.9.3.zip", but this
+ *          one will.
+ *
+ *      This replaces strhMatchOS2 which has been removed with
+ *      V0.9.16 and is a lot faster than the old code, which has
+ *      been completely rewritten.
+ *
+ *@@added V0.9.16 (2002-01-01) [umoeller]
+ */
+
+BOOL doshMatch(const char *pcszMask,     // in: mask (e.g. "*.txt")
+               const char *pcszName)     // in: string to check (e.g. "test.txt")
+{
+    BOOL    brc = FALSE;
+
+    int     iMaskDrive = -1,
+            iNameDrive = -1;
+
+    ULONG   cbMask = strlen(pcszMask),
+            cbName = strlen(pcszName);
+    PSZ     pszMask = (PSZ)_alloca(cbMask + 1),
+            pszName = (PSZ)_alloca(cbName + 1);
+
+    PCSZ    pLastMaskComponent,
+            pLastNameComponent;
+
+    ULONG   cbMaskPath = 0,
+            cbNamePath = 0;
+
+    CHAR    c;
+
+    memcpy(pszMask, pcszMask, cbMask + 1);
+    nlsUpper(pszMask, cbMask);
+    memcpy(pszName, pcszName, cbName + 1);
+    nlsUpper(pszName, cbName);
+
+    if (pLastMaskComponent = strrchr(pszMask, '\\'))
+    {
+        // length of path component
+        cbMaskPath = pLastMaskComponent - pszMask;
+        pLastMaskComponent++;
+    }
+    else
+        pLastMaskComponent = pszMask;
+
+    if (pLastNameComponent = strrchr(pszName, '\\'))
+    {
+        // length of path component
+        cbNamePath = pLastNameComponent - pszName;
+        pLastNameComponent++;
+    }
+    else
+        pLastNameComponent = pszName;
+
+    // compare paths; if the lengths are different
+    // or memcmp fails, we can't match
+    if (    (cbMaskPath == cbNamePath)      // can both be null
+         && (    (cbMaskPath == 0)
+              || (!memcmp(pszMask, pszName, cbMaskPath))
+            )
+       )
+    {
+        // alright, paths match:
+        brc = PerformMatch(pLastMaskComponent,
+                           pLastNameComponent,
+                           // has dot?
+                           (strchr(pLastNameComponent, '.') != NULL));
+
+    }
+
+    return brc;
+}
+
+

trunk/src/helpers/gpih.c

@@ -1555 +1555 @@
 
 /*
- *@@ gpihCreateBmpFromPS:
- *      this creates a new bitmap and copies a screen rectangle
- *      into it. Consider this a "screen capture" function.
- *
- *      The new bitmap (which is returned) is compatible with the
- *      device associated with hpsScreen. This function calls
- *      gpihCreateMemPS and gpihCreateBitmap to have it created.
- *      The memory PS is only temporary and freed again.
- *
- *      This returns the handle of the new bitmap,
- *      which can then be used for WinDrawBitmap and such, or
- *      NULLHANDLE upon errors.
- *
- *@@changed V0.9.12 (2001-05-20) [umoeller]: fixed excessive mem PS size
- */
-
-HBITMAP gpihCreateBmpFromPS(HAB hab,        // in: anchor block
-                            HPS hpsScreen,  // in: screen PS to copy from
-                            PRECTL prcl)    // in: rectangle to copy
-{
-
-    /* To copy an image from a display screen to a bit map:
-      1. Associate the memory device context with a presentation space.
-      2. Create a bit map.
-      3. Select the bit map into the memory device context by calling GpiSetBitmap.
-      4. Determine the location (in device coordinates) of the image.
-      5. Call GpiBitBlt and copy the image to the bit map. */
-
-    HDC hdcMem;
-    HPS hpsMem;
-    HBITMAP hbm = NULLHANDLE;
-    POINTL aptl[3];
-
-    SIZEL szlPage = {prcl->xRight - prcl->xLeft,
-                     prcl->yTop - prcl->yBottom};       // fixed V0.9.12 (2001-05-20) [umoeller]
-    if (gpihCreateMemPS(hab,
-                        &szlPage,
-                        &hdcMem,
-                        &hpsMem))
-    {
-        if ((hbm = gpihCreateBitmap(hpsMem,
-                                    szlPage.cx,
-                                    szlPage.cy)))
-        {
-            // Associate the bit map and the memory presentation space.
-            if (GpiSetBitmap(hpsMem, hbm)
-                    != HBM_ERROR)
-            {
-                // Copy the screen to the bit map.
-                aptl[0].x = 0;              // lower-left corner of destination rectangle
-                aptl[0].y = 0;
-                aptl[1].x = prcl->xRight;   // upper-right corner for both
-                aptl[1].y = prcl->yTop;
-                aptl[2].x = prcl->xLeft;    // lower-left corner of source rectangle
-                aptl[2].y = prcl->yBottom;
-
-                if (GpiBitBlt(hpsMem,
-                              hpsScreen,
-                              sizeof(aptl) / sizeof(POINTL), // Number of points in aptl
-                              aptl,
-                              ROP_SRCCOPY,
-                              BBO_IGNORE)
-                        == GPI_ERROR)
-                {
-                    // error during bitblt:
-                    GpiDeleteBitmap(hbm);
-                    hbm = NULLHANDLE; // for return code
-                }
-            }
-            else
-            {
-                // error selecting bitmap for hpsMem:
-                GpiDeleteBitmap(hbm);
-                hbm = NULLHANDLE; // for return code
-            }
-        }
-
-        GpiDestroyPS(hpsMem);
-        DevCloseDC(hdcMem);
-    } // end if (hdcMem = DevOpenDC())
-
-    return (hbm);
-}
-
-/*
  *@@ gpihCreateHalftonedBitmap:
  *      this creates a half-toned copy of the
@@ -2246 +2161 @@
 }
 
-
+/*
+ *@@ gpihCreateBmpFromPS:
+ *      this creates a new bitmap and copies a screen rectangle
+ *      into it. Consider this a "screen capture" function.
+ *
+ *      The new bitmap (which is returned) is compatible with the
+ *      device associated with hpsScreen. This function calls
+ *      gpihCreateMemPS and gpihCreateBitmap to have it created.
+ *      The memory PS is only temporary and freed again.
+ *
+ *      This returns the handle of the new bitmap,
+ *      which can then be used for WinDrawBitmap and such, or
+ *      NULLHANDLE upon errors.
+ *
+ *@@changed V0.9.12 (2001-05-20) [umoeller]: fixed excessive mem PS size
+ *@@changed V0.9.16 (2001-01-04) [umoeller]: now creating XBITMAP
+ */
+
+PXBITMAP gpihCreateBmpFromPS(HAB hab,        // in: anchor block
+                             HPS hpsScreen,  // in: screen PS to copy from
+                             PRECTL prcl)    // in: rectangle to copy
+{
+
+    /* To copy an image from a display screen to a bit map:
+      1. Associate the memory device context with a presentation space.
+      2. Create a bit map.
+      3. Select the bit map into the memory device context by calling GpiSetBitmap.
+      4. Determine the location (in device coordinates) of the image.
+      5. Call GpiBitBlt and copy the image to the bit map. */
+
+    PXBITMAP pBmp;
+
+    if (pBmp = gpihCreateXBitmap(hab,
+                                 prcl->xRight - prcl->xLeft,
+                                 prcl->yTop - prcl->yBottom))
+    {
+        POINTL aptl[3];
+        // Copy the screen to the bit map.
+        aptl[0].x = 0;              // lower-left corner of destination rectangle
+        aptl[0].y = 0;
+        aptl[1].x = prcl->xRight;   // upper-right corner for both
+        aptl[1].y = prcl->yTop;
+        aptl[2].x = prcl->xLeft;    // lower-left corner of source rectangle
+        aptl[2].y = prcl->yBottom;
+
+        if (GpiBitBlt(pBmp->hpsMem,
+                      hpsScreen,
+                      sizeof(aptl) / sizeof(POINTL), // Number of points in aptl
+                      aptl,
+                      ROP_SRCCOPY,
+                      BBO_IGNORE)
+                == GPI_ERROR)
+        {
+            // error during bitblt:
+            gpihDestroyXBitmap(&pBmp);
+        }
+    }
+
+    return (pBmp);
+}
+

trunk/src/helpers/helpers_pre.in

@@ -80 +80 @@
 $(OUTPUTDIR)\cctl_chart.obj \
 $(OUTPUTDIR)\cctl_checkcnr.obj \
+$(OUTPUTDIR)\cctl_combo.obj \
 $(OUTPUTDIR)\cctl_progbar.obj \
 $(OUTPUTDIR)\cctl_splitwin.obj \

trunk/src/helpers/stringh.c

@@ -152 +152 @@
             *ppszTarget = NULL;
     }
+    else
+        return (ERROR_INVALID_PARAMETER);
 
     if (pulLength)
@@ -1659 +1661 @@
 /* ******************************************************************
  *
- *   Wildcard matching
- *
- ********************************************************************/
-
-/*
- *  The following code has been taken from "fnmatch.zip".
- *
- *      (c) 1994-1996 by Eberhard Mattes.
- */
-
-/* In OS/2 and DOS styles, both / and \ separate components of a path.
- * This macro returns true iff C is a separator. */
-
-#define IS_OS2_COMP_SEP(C)  ((C) == '/' || (C) == '\\')
-
-
-/* This macro returns true if C is at the end of a component of a
- * path. */
-
-#define IS_OS2_COMP_END(C)  ((C) == 0 || IS_OS2_COMP_SEP (C))
-
-/*
- * skip_comp_os2:
- *      Return a pointer to the next component of the path SRC, for OS/2
- *      and DOS styles.  When the end of the string is reached, a pointer
- *      to the terminating null character is returned.
- *
- *      (c) 1994-1996 by Eberhard Mattes.
- */
-
-static const unsigned char* skip_comp_os2(const unsigned char *src)
-{
-    /* Skip characters until hitting a separator or the end of the
-     * string. */
-
-    while (!IS_OS2_COMP_END(*src))
-        ++src;
-
-    /* Skip the separator if we hit a separator. */
-
-    if (*src != 0)
-        ++src;
-    return src;
-}
-
-/*
- * has_colon:
- *      returns true iff the path P contains a colon.
- *
- *      (c) 1994-1996 by Eberhard Mattes.
- */
-
-static int has_colon(const unsigned char *p)
-{
-    while (*p != 0)
-        if (*p == ':')
-            return 1;
-        else
-            ++p;
-    return 0;
-}
-
-/*
- * match_comp_os2:
- *      compares a single component (directory name or file name)
- *      of the paths, for OS/2 and DOS styles. MASK and NAME point
- *      into a component of the wildcard and the name to be checked,
- *      respectively. Comparing stops at the next separator.
- *      The FLAGS argument is the same as that of fnmatch().
- *
- *      HAS_DOT is true if a dot is in the current component of NAME.
- *      The number of dots is not restricted, even in DOS style.
- *
- *      Returns FNM_MATCH iff MASK and NAME match.
- *
- *      Note that this function is recursive.
- *
- *      (c) 1994-1996 by Eberhard Mattes.
- */
-
-static int match_comp_os2(const unsigned char *mask,
-                          const unsigned char *name,
-                          unsigned flags,
-                          int has_dot)
-{
-    int             rc;
-
-    for (;;)
-        switch (*mask)
-        {
-            case 0:
-
-                /* There must be no extra characters at the end of NAME when
-                 * reaching the end of MASK unless _FNM_PATHPREFIX is set:
-                 * in that case, NAME may point to a separator. */
-
-                if (*name == 0)
-                    return FNM_MATCH;
-                if ((flags & FNM_PATHPREFIX) && IS_OS2_COMP_SEP(*name))
-                    return FNM_MATCH;
-                return FNM_NOMATCH;
-
-            case '/':
-            case '\\':
-
-                /* Separators match separators. */
-
-                if (IS_OS2_COMP_SEP(*name))
-                    return FNM_MATCH;
-
-                /* If _FNM_PATHPREFIX is set, a trailing separator in MASK
-                 * is ignored at the end of NAME. */
-
-                if ((flags & FNM_PATHPREFIX) && mask[1] == 0 && *name == 0)
-                    return FNM_MATCH;
-
-                /* Stop comparing at the separator. */
-
-                return FNM_NOMATCH;
-
-            case '?':
-
-                /* A question mark matches one character.  It does not match
-                 * a dot.  At the end of the component (and before a dot),
-                 * it also matches zero characters. */
-
-                if (*name != '.' && !IS_OS2_COMP_END(*name))
-                    ++name;
-                ++mask;
-                break;
-
-            case '*':
-
-                /* An asterisk matches zero or more characters.  In DOS
-                 * mode, dots are not matched. */
-
-                do
-                {
-                    ++mask;
-                }
-                while (*mask == '*');
-                for (;;)
-                {
-                    rc = match_comp_os2(mask, name, flags, has_dot);
-                    if (rc != FNM_NOMATCH)
-                        return rc;
-                    if (IS_OS2_COMP_END(*name))
-                        return FNM_NOMATCH;
-                    if (*name == '.' && (flags & FNM_STYLE_MASK) == FNM_DOS)
-                        return FNM_NOMATCH;
-                    ++name;
-                }
-
-            case '.':
-
-                /* A dot matches a dot.  It also matches the implicit dot at
-                 * the end of a dot-less NAME. */
-
-                ++mask;
-                if (*name == '.')
-                    ++name;
-                else if (has_dot || !IS_OS2_COMP_END(*name))
-                    return FNM_NOMATCH;
-                break;
-
-            default:
-
-                /* All other characters match themselves. */
-
-                if (flags & FNM_IGNORECASE)
-                {
-                    if (tolower(*mask) != tolower(*name))
-                        return FNM_NOMATCH;
-                }
-                else
-                {
-                    if (*mask != *name)
-                        return FNM_NOMATCH;
-                }
-                ++mask;
-                ++name;
-                break;
-        }
-}
-
-/*
- * match_comp:
- *      compares a single component (directory name or file
- *      name) of the paths, for all styles which need
- *      component-by-component matching. MASK and NAME point
- *      to the start of a component of the wildcard and the
- *      name to be checked, respectively.  Comparing stops at
- *      the next separator. The FLAGS argument is the same as
- *      that of fnmatch().
- *
- *      Return FNM_MATCH iff MASK and NAME match.
- *
- *      (c) 1994-1996 by Eberhard Mattes.
- */
-
-static int match_comp(const unsigned char *mask,
-                      const unsigned char *name,
-                      unsigned flags)
-{
-    const unsigned char *s;
-
-    switch (flags & FNM_STYLE_MASK)
-    {
-        case FNM_OS2:
-        case FNM_DOS:
-
-            /* For OS/2 and DOS styles, we add an implicit dot at the end of
-             * the component if the component doesn't include a dot. */
-
-            s = name;
-            while (!IS_OS2_COMP_END(*s) && *s != '.')
-                ++s;
-            return match_comp_os2(mask, name, flags, *s == '.');
-
-        default:
-            return FNM_ERR;
-    }
-}
-
-/* In Unix styles, / separates components of a path.  This macro
- * returns true iff C is a separator. */
-
-#define IS_UNIX_COMP_SEP(C)  ((C) == '/')
-
-
-/* This macro returns true if C is at the end of a component of a
- * path. */
-
-#define IS_UNIX_COMP_END(C)  ((C) == 0 || IS_UNIX_COMP_SEP (C))
-
-/*
- * match_unix:
- *      matches complete paths for Unix styles.
- *
- *      The FLAGS argument is the same as that of fnmatch().
- *      COMP points to the start of the current component in
- *      NAME.  Return FNM_MATCH iff MASK and NAME match.  The
- *      backslash character is used for escaping ? and * unless
- *      FNM_NOESCAPE is set.
- *
- *      (c) 1994-1996 by Eberhard Mattes.
- */
-
-static int match_unix(const unsigned char *mask,
-                      const unsigned char *name,
-                      unsigned flags,
-                      const unsigned char *comp)
-{
-    unsigned char   c1, c2;
-    char            invert, matched;
-    const unsigned char *start;
-    int             rc;
-
-    for (;;)
-        switch (*mask)
-        {
-            case 0:
-
-                /* There must be no extra characters at the end of NAME when
-                 * reaching the end of MASK unless _FNM_PATHPREFIX is set:
-                 * in that case, NAME may point to a separator. */
-
-                if (*name == 0)
-                    return FNM_MATCH;
-                if ((flags & FNM_PATHPREFIX) && IS_UNIX_COMP_SEP(*name))
-                    return FNM_MATCH;
-                return FNM_NOMATCH;
-
-            case '?':
-
-                /* A question mark matches one character.  It does not match
-                 * the component separator if FNM_PATHNAME is set.  It does
-                 * not match a dot at the start of a component if FNM_PERIOD
-                 * is set. */
-
-                if (*name == 0)
-                    return FNM_NOMATCH;
-                if ((flags & FNM_PATHNAME) && IS_UNIX_COMP_SEP(*name))
-                    return FNM_NOMATCH;
-                if (*name == '.' && (flags & FNM_PERIOD) && name == comp)
-                    return FNM_NOMATCH;
-                ++mask;
-                ++name;
-                break;
-
-            case '*':
-
-                /* An asterisk matches zero or more characters.  It does not
-                 * match the component separator if FNM_PATHNAME is set.  It
-                 * does not match a dot at the start of a component if
-                 * FNM_PERIOD is set. */
-
-                if (*name == '.' && (flags & FNM_PERIOD) && name == comp)
-                    return FNM_NOMATCH;
-                do
-                {
-                    ++mask;
-                }
-                while (*mask == '*');
-                for (;;)
-                {
-                    rc = match_unix(mask, name, flags, comp);
-                    if (rc != FNM_NOMATCH)
-                        return rc;
-                    if (*name == 0)
-                        return FNM_NOMATCH;
-                    if ((flags & FNM_PATHNAME) && IS_UNIX_COMP_SEP(*name))
-                        return FNM_NOMATCH;
-                    ++name;
-                }
-
-            case '/':
-
-                /* Separators match only separators.  If _FNM_PATHPREFIX is
-                 * set, a trailing separator in MASK is ignored at the end
-                 * of NAME. */
-
-                if (!(IS_UNIX_COMP_SEP(*name)
-                      || ((flags & FNM_PATHPREFIX) && *name == 0
-                      && (mask[1] == 0
-                          || (!(flags & FNM_NOESCAPE) && mask[1] == '\\'
-                  && mask[2] == 0)))))
-                    return FNM_NOMATCH;
-
-                ++mask;
-                if (*name != 0)
-                    ++name;
-
-                /* This is the beginning of a new component if FNM_PATHNAME
-                 * is set. */
-
-                if (flags & FNM_PATHNAME)
-                    comp = name;
-                break;
-
-            case '[':
-
-                /* A set of characters.  Always case-sensitive. */
-
-                if (*name == 0)
-                    return FNM_NOMATCH;
-                if ((flags & FNM_PATHNAME) && IS_UNIX_COMP_SEP(*name))
-                    return FNM_NOMATCH;
-                if (*name == '.' && (flags & FNM_PERIOD) && name == comp)
-                    return FNM_NOMATCH;
-
-                invert = 0;
-                matched = 0;
-                ++mask;
-
-                /* If the first character is a ! or ^, the set matches all
-                 * characters not listed in the set. */
-
-                if (*mask == '!' || *mask == '^')
-                {
-                    ++mask;
-                    invert = 1;
-                }
-
-                /* Loop over all the characters of the set.  The loop ends
-                 * if the end of the string is reached or if a ] is
-                 * encountered unless it directly follows the initial [ or
-                 * [-. */
-
-                start = mask;
-                while (!(*mask == 0 || (*mask == ']' && mask != start)))
-                {
-                    /* Get the next character which is optionally preceded
-                     * by a backslash. */
-
-                    c1 = *mask++;
-                    if (!(flags & FNM_NOESCAPE) && c1 == '\\')
-                    {
-                        if (*mask == 0)
-                            break;
-                        c1 = *mask++;
-                    }
-
-                    /* Ranges of characters are written as a-z.  Don't
-                     * forget to check for the end of the string and to
-                     * handle the backslash.  If the character after - is a
-                     * ], it isn't a range. */
-
-                    if (*mask == '-' && mask[1] != ']')
-                    {
-                        ++mask; /* Skip the - character */
-                        if (!(flags & FNM_NOESCAPE) && *mask == '\\')
-                            ++mask;
-                        if (*mask == 0)
-                            break;
-                        c2 = *mask++;
-                    }
-                    else
-                        c2 = c1;
-
-                    /* Now check whether this character or range matches NAME. */
-
-                    if (c1 <= *name && *name <= c2)
-                        matched = 1;
-                }
-
-                /* If the end of the string is reached before a ] is found,
-                 * back up to the [ and compare it to NAME. */
-
-                if (*mask == 0)
-                {
-                    if (*name != '[')
-                        return FNM_NOMATCH;
-                    ++name;
-                    mask = start;
-                    if (invert)
-                        --mask;
-                }
-                else
-                {
-                    if (invert)
-                        matched = !matched;
-                    if (!matched)
-                        return FNM_NOMATCH;
-                    ++mask;     /* Skip the ] character */
-                    if (*name != 0)
-                        ++name;
-                }
-                break;
-
-            case '\\':
-                ++mask;
-                if (flags & FNM_NOESCAPE)
-                {
-                    if (*name != '\\')
-                        return FNM_NOMATCH;
-                    ++name;
-                }
-                else if (*mask == '*' || *mask == '?')
-                {
-                    if (*mask != *name)
-                        return FNM_NOMATCH;
-                    ++mask;
-                    ++name;
-                }
-                break;
-
-            default:
-
-                /* All other characters match themselves. */
-
-                if (flags & FNM_IGNORECASE)
-                {
-                    if (tolower(*mask) != tolower(*name))
-                        return FNM_NOMATCH;
-                }
-                else
-                {
-                    if (*mask != *name)
-                        return FNM_NOMATCH;
-                }
-                ++mask;
-                ++name;
-                break;
-        }
-}
-
-/*
- * _fnmatch_unsigned:
- *      Check whether the path name NAME matches the wildcard MASK.
- *
- *      Return:
- *      --   0 (FNM_MATCH) if it matches,
- *      --   _FNM_NOMATCH if it doesn't,
- *      --   FNM_ERR on error.
- *
- *      The operation of this function is controlled by FLAGS.
- *      This is an internal function, with unsigned arguments.
- *
- *      (c) 1994-1996 by Eberhard Mattes.
- */
-
-static int _fnmatch_unsigned(const unsigned char *mask,
-                             const unsigned char *name,
-                             unsigned flags)
-{
-    int     m_drive,
-            n_drive,
-            rc;
-
-    /* Match and skip the drive name if present. */
-
-    m_drive = ((isalpha(mask[0]) && mask[1] == ':') ? mask[0] : -1);
-    n_drive = ((isalpha(name[0]) && name[1] == ':') ? name[0] : -1);
-
-    if (m_drive != n_drive)
-    {
-        if (m_drive == -1 || n_drive == -1)
-            return FNM_NOMATCH;
-        if (!(flags & FNM_IGNORECASE))
-            return FNM_NOMATCH;
-        if (tolower(m_drive) != tolower(n_drive))
-            return FNM_NOMATCH;
-    }
-
-    if (m_drive != -1)
-        mask += 2;
-    if (n_drive != -1)
-        name += 2;
-
-    /* Colons are not allowed in path names, except for the drive name,
-     * which was skipped above. */
-
-    if (has_colon(mask) || has_colon(name))
-        return FNM_ERR;
-
-    /* The name "\\server\path" should not be matched by mask
-     * "\*\server\path".  Ditto for /. */
-
-    switch (flags & FNM_STYLE_MASK)
-    {
-        case FNM_OS2:
-        case FNM_DOS:
-
-            if (IS_OS2_COMP_SEP(name[0]) && IS_OS2_COMP_SEP(name[1]))
-            {
-                if (!(IS_OS2_COMP_SEP(mask[0]) && IS_OS2_COMP_SEP(mask[1])))
-                    return FNM_NOMATCH;
-                name += 2;
-                mask += 2;
-            }
-            break;
-
-        case FNM_POSIX:
-
-            if (name[0] == '/' && name[1] == '/')
-            {
-                int             i;
-
-                name += 2;
-                for (i = 0; i < 2; ++i)
-                    if (mask[0] == '/')
-                        ++mask;
-                    else if (mask[0] == '\\' && mask[1] == '/')
-                        mask += 2;
-                    else
-                        return FNM_NOMATCH;
-            }
-
-            /* In Unix styles, treating ? and * w.r.t. components is simple.
-             * No need to do matching component by component. */
-
-            return match_unix(mask, name, flags, name);
-    }
-
-    /* Now compare all the components of the path name, one by one.
-     * Note that the path separator must not be enclosed in brackets. */
-
-    while (*mask != 0 || *name != 0)
-    {
-
-        /* If _FNM_PATHPREFIX is set, the names match if the end of MASK
-         * is reached even if there are components left in NAME. */
-
-        if (*mask == 0 && (flags & FNM_PATHPREFIX))
-            return FNM_MATCH;
-
-        /* Compare a single component of the path name. */
-
-        rc = match_comp(mask, name, flags);
-        if (rc != FNM_MATCH)
-            return rc;
-
-        /* Skip to the next component or to the end of the path name. */
-
-        mask = skip_comp_os2(mask);
-        name = skip_comp_os2(name);
-    }
-
-    /* If we reached the ends of both strings, the names match. */
-
-    if (*mask == 0 && *name == 0)
-        return FNM_MATCH;
-
-    /* The names do not match. */
-
-    return FNM_NOMATCH;
-}
-
-/*
- *@@ strhMatchOS2:
- *      this matches wildcards, similar to what DosEditName does.
- *      However, this does not require a file to be present, but
- *      works on strings only.
- */
-
-BOOL strhMatchOS2(const char *pcszMask,     // in: mask (e.g. "*.txt")
-                  const char *pcszName)     // in: string to check (e.g. "test.txt")
-{
-    return ((BOOL)(_fnmatch_unsigned((const unsigned char *)pcszMask,
-                                     (const unsigned char *)pcszName,
-                                     FNM_OS2 | FNM_IGNORECASE)
-                   == FNM_MATCH)
-           );
-}
-
-/*
- *@@ strhMatchExt:
- *      like strhMatchOS2, but this takes all the flags
- *      for input.
- *
- *@@added V0.9.15 (2001-09-14) [umoeller]
- */
-
-BOOL strhMatchExt(const char *pcszMask,     // in: mask (e.g. "*.txt")
-                  const char *pcszName,     // in: string to check (e.g. "test.txt")
-                  unsigned flags)           // in: FNM_* flags
-{
-    return ((BOOL)(_fnmatch_unsigned((const unsigned char *)pcszMask,
-                                     (const unsigned char *)pcszName,
-                                     flags)
-                   == FNM_MATCH)
-           );
-}
-
-/* ******************************************************************
- *
  *   Fast string searches
  *

trunk/src/helpers/timer.c

@@ -12 +12 @@
  *      to those XTimers which have elapsed.
  *
- *      So to use XTimers, do the following:
- *
- *      1.  Create a timer set with tmrCreateSet. Specify
- *          an owner window and the timer ID of the master
- *          PM timer.
- *
- *      2.  You can then start and stop XTimers for windows
- *          on the same thread by calling tmrStartXTimer and
- *          tmrStopXTimer, respectively.
- *
- *      3.  In the window proc of the owner window, respond
- *          to WM_TIMER for the master PM timer by calling
- *          tmrTimerTick. This will call the window procs
- *          of those windows with WM_TIMER messages directly
- *          whose XTimers have elapsed.
- *
  *      The main advantage of the XTimers is that these
  *      are not a limited resource (as opposed to PM timers).
@@ -34 +18 @@
  *      be queried with WinQuerySysValue(SV_CTIMERS).
  *
+ *      XTimers are used excessively by the default widgets
+ *      of XWorkplace's XCenter.
+ *
  *      There are a few limitations with the XTimers though:
- *
- *      --  If you start a timer with a timeout < 100 ms,
- *          the first WM_TIMER might not appear before
- *          100 ms have elapsed. This may or be not the
- *          case, depending on whether other timers are
- *          running.
  *
  *      --  tmrTimerTick (which you must call when the
@@ -62 +43 @@
  *          side, always call tmrStopAllTimers when WM_DESTROY
  *          comes into a window which has used timers.
+ *
+ *      So to use XTimers, do the following:
+ *
+ *      1.  Create a timer set with tmrCreateSet. Specify
+ *          an owner window and the timer ID of the master
+ *          PM timer.
+ *
+ *      2.  You can then start and stop XTimers for windows
+ *          on the same thread by calling tmrStartXTimer and
+ *          tmrStopXTimer, respectively.
+ *
+ *      3.  In the window proc of the owner window, respond
+ *          to WM_TIMER for the master PM timer by calling
+ *          tmrTimerTick. This will call the window procs
+ *          of those windows with WM_TIMER messages directly
+ *          whose XTimers have elapsed.
  *
  *      Function prefixes:
@@ -195 +192 @@
                   USHORT usTimerID)         // in: timer ID
 {
-    if (pSet && pSet->pvllXTimers)
-    {
-        PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
+    PLINKLIST pllXTimers;
+    if (    (pSet)
+         && (pllXTimers = (PLINKLIST)pSet->pvllXTimers)
+       )
+    {
         PLISTNODE pNode = lstQueryFirstNode(pllXTimers);
         while (pNode)
@@ -227 +226 @@
                  PXTIMER pTimer)        // in: timer to remove.
 {
-    if (pSet && pSet->pvllXTimers)
-    {
-        PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
+    PLINKLIST pllXTimers;
+    if (    (pSet)
+         && (pllXTimers = (PLINKLIST)pSet->pvllXTimers)
+       )
+    {
         lstRemoveItem(pllXTimers,
                       pTimer);       // auto-free!
@@ -409 +410 @@
         if (pSet)
         {
-            PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
-            if (pllXTimers)
+            PLINKLIST pllXTimers;
+            if (pllXTimers = (PLINKLIST)pSet->pvllXTimers)
             {
                 PLISTNODE pTimerNode = lstQueryFirstNode(pllXTimers);
@@ -424 +425 @@
                 pSet->pvllXTimers = NULL;
             }
+
+            if (pSet->idPMTimerRunning)
+            {
+                WinStopTimer(pSet->hab,
+                             pSet->hwndOwner,
+                             pSet->idPMTimer);
+                pSet->idPMTimerRunning = 0;
+            }
+
+            free(pSet);
         }
-
-        if (pSet->idPMTimerRunning)
-        {
-            WinStopTimer(pSet->hab,
-                         pSet->hwndOwner,
-                         pSet->idPMTimer);
-            pSet->idPMTimerRunning = 0;
-        }
-
-        free(pSet);
 
         UnlockTimers();
@@ -456 +457 @@
  *@@changed V0.9.14 (2001-08-01) [umoeller]: fixed mem overwrite which might have caused crashes if this got called during tmrTimerTick
  *@@changed V0.9.14 (2001-08-03) [umoeller]: fixed "half frequency" regression caused by frequency optimizations
+ *@@changed V0.9.16 (2001-12-18) [umoeller]: now using WinDispatchMsg to avoid crashes during win destruction
  */
 
@@ -462 +464 @@
     if (LockTimers())
     {
-        if (pSet)
-        {
-            PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
-            if (pllXTimers)
+        PLINKLIST pllXTimers;
+        if (    (pSet)
+             && (pllXTimers = (PLINKLIST)pSet->pvllXTimers)
+           )
+        {
+            // go thru all XTimers and see which one
+            // has elapsed; for all of these, post WM_TIMER
+            // to the target window proc
+            PLISTNODE pTimerNode = lstQueryFirstNode(pllXTimers);
+
+            if (!pTimerNode)
             {
-                // go thru all XTimers and see which one
-                // has elapsed; for all of these, post WM_TIMER
-                // to the target window proc
-                PLISTNODE pTimerNode = lstQueryFirstNode(pllXTimers);
-
-                if (!pTimerNode)
+                // no timers left:
+                if (pSet->idPMTimerRunning)
                 {
-                    // no timers left:
-                    if (pSet->idPMTimerRunning)
+                    // but PM timer running:
+                    // stop it
+                    WinStopTimer(pSet->hab,
+                                 pSet->hwndOwner,
+                                 pSet->idPMTimer);
+                    pSet->idPMTimerRunning = 0;
+                }
+
+                pSet->ulPMTimeout = 0;
+            }
+            else
+            {
+                // we have timers:
+                BOOL    fFoundInvalid = FALSE;
+
+                // get current time
+                ULONG   ulTimeNow = 0;
+                DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                                &ulTimeNow, sizeof(ulTimeNow));
+
+                #ifdef DEBUG_XTIMERS
+                    _Pmpf((__FUNCTION__ ": ulTimeNow = %d", ulTimeNow));
+                #endif
+
+                while (pTimerNode)
+                {
+                    // get next node first because the
+                    // list can get modified while processing
+                    // V0.9.12 (2001-05-24) [umoeller]
+                    PLISTNODE pNext = pTimerNode->pNext;
+
+                    PXTIMER pTimer = (PXTIMER)pTimerNode->pItemData;
+
+                    #ifdef DEBUG_XTIMERS
+                        _Pmpf(("   timer %d: ulNextFire = %d",
+                                lstIndexFromItem(pllXTimers, pTimer),
+                                pTimer->ulNextFire));
+                    #endif
+
+                    if (    (pTimer)
+                         // && (pTimer->ulNextFire < ulTimeNow)
+                            // V0.9.14 (2001-08-01) [umoeller]
+                            // use <= because otherwise we'll get
+                            // only half the frequency...
+                            // we get here frequently where the
+                            // two values are EXACTLY equal due
+                            // to the above optimization (DosQuerySysInfo
+                            // called once only for the entire loop)
+                         && (pTimer->ulNextFire <= ulTimeNow)
+                       )
                     {
-                        // but PM timer running:
-                        // stop it
-                        WinStopTimer(pSet->hab,
-                                     pSet->hwndOwner,
-                                     pSet->idPMTimer);
-                        pSet->idPMTimerRunning = 0;
-                    }
-
-                    pSet->ulPMTimeout = 0;
-                }
-                else
-                {
-                    // we have timers:
-                    BOOL    fFoundInvalid = FALSE;
-
-                    // get current time
-                    ULONG   ulTimeNow = 0;
-                    DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
-                                    &ulTimeNow, sizeof(ulTimeNow));
-
-                    #ifdef DEBUG_XTIMERS
-                        _Pmpf((__FUNCTION__ ": ulTimeNow = %d", ulTimeNow));
-                    #endif
-
-                    while (pTimerNode)
-                    {
-                        // get next node first because the
-                        // list can get modified while processing
-                        // V0.9.12 (2001-05-24) [umoeller]
-                        PLISTNODE pNext = pTimerNode->pNext;
-
-                        PXTIMER pTimer = (PXTIMER)pTimerNode->pItemData;
+                        // this timer has elapsed:
+                        // fire!
 
                         #ifdef DEBUG_XTIMERS
-                            _Pmpf(("   timer %d: ulNextFire = %d",
-                                    lstIndexFromItem(pllXTimers, pTimer),
-                                    pTimer->ulNextFire));
+                            _Pmpf(("   --> fire!"));
                         #endif
 
-                        if (    (pTimer)
-                             // && (pTimer->ulNextFire < ulTimeNow)
-                                // V0.9.14 (2001-08-01) [umoeller]
-                                // use <= because otherwise we'll get
-                                // only half the frequency...
-                                // we get here frequently where the
-                                // two values are EXACTLY equal due
-                                // to the above optimization (DosQuerySysInfo
-                                // called once only for the entire loop)
-                             && (pTimer->ulNextFire <= ulTimeNow)
-                           )
+                        if (WinIsWindow(pSet->hab,
+                                        pTimer->hwndTarget))
                         {
-                            // this timer has elapsed:
-                            // fire!
-
-                            #ifdef DEBUG_XTIMERS
-                                _Pmpf(("   --> fire!"));
-                            #endif
-
-                            if (WinIsWindow(pSet->hab,
-                                            pTimer->hwndTarget))
-                            {
-                                // window still valid:
-                                // get the window's window proc
-                                QMSG qmsg;
-                                /* PFNWP pfnwp = (PFNWP)WinQueryWindowPtr(pTimer->hwndTarget,
-                                                                       QWP_PFNWP); */
-
-                                // moved this up V0.9.14 (2001-08-01) [umoeller]
-                                pTimer->ulNextFire = ulTimeNow + pTimer->ulTimeout;
-
-                                // call the window proc DIRECTLY
-                                qmsg.hwnd = pTimer->hwndTarget;
-                                qmsg.msg = WM_TIMER;
-                                qmsg.mp1 = (MPARAM)pTimer->usTimerID;
-                                qmsg.mp2 = (MPARAM)0;
-                                qmsg.time = 0;
-                                qmsg.ptl.x = 0;
-                                qmsg.ptl.y = 0;
-                                qmsg.reserved = 0;
-                                WinDispatchMsg(pSet->hab,
-                                               &qmsg);
-                                /* pfnwp(pTimer->hwndTarget,
-                                      WM_TIMER,
-                                      (MPARAM)pTimer->usTimerID,
-                                      0); */
-                                    // V0.9.12 (2001-05-24) [umoeller]
-                                    // if the winproc chooses to start or
-                                    // stop a timer, pNext still points
-                                    // to a valid node...
-                                    // -- if a timer is removed, that's OK
-                                    // -- if a timer is added, it is added to
-                                    //    the list, so we'll see it in this loop
-
-                                // V0.9.14 (2001-08-01) [umoeller]
-
-                                // DO NOT REFERENCE pTimer AFTER THIS CODE;
-                                // tmrTimerTick might have removed the timer,
-                                // and since the list is auto-free, pTimer
-                                // might have been freed!!
-                            }
-                            else
-                            {
-                                // window has been destroyed:
-                                lstRemoveNode(pllXTimers,
-                                              pTimerNode);
-                                    // pNext is still valid
-
-                                fFoundInvalid = TRUE;
-                            }
-
-                        } // end if (pTimer->ulNextFire < ulTimeNow)
-
-                        // next timer
-                        pTimerNode = pNext; // V0.9.12 (2001-05-24) [umoeller]
-                    } // end while (pTimerNode)
-
-                    // destroy invalid timers, if any
-                    if (fFoundInvalid)
-                        AdjustPMTimer(pSet);
-
-                } // end else if (!pTimerNode)
-            } // end if (pllXTimers)
-        } // end if (pSet)
+                            // window still valid:
+                            // get the window's window proc
+                            QMSG qmsg;
+                            /* PFNWP pfnwp = (PFNWP)WinQueryWindowPtr(pTimer->hwndTarget,
+                                                                   QWP_PFNWP); */
+
+                            // moved this up V0.9.14 (2001-08-01) [umoeller]
+                            pTimer->ulNextFire = ulTimeNow + pTimer->ulTimeout;
+
+                            // call the window proc DIRECTLY
+                            // V0.9.16 (2001-12-18) [umoeller]:
+                            // now using WinDispatchMsg to avoid crashes
+                            // while hwndTarget is being destroyed
+                            qmsg.hwnd = pTimer->hwndTarget;
+                            qmsg.msg = WM_TIMER;
+                            qmsg.mp1 = (MPARAM)pTimer->usTimerID;
+                            qmsg.mp2 = (MPARAM)0;
+                            qmsg.time = 0;
+                            qmsg.ptl.x = 0;
+                            qmsg.ptl.y = 0;
+                            qmsg.reserved = 0;
+                            WinDispatchMsg(pSet->hab,
+                                           &qmsg);
+
+                            /* pfnwp(pTimer->hwndTarget,
+                                  WM_TIMER,
+                                  (MPARAM)pTimer->usTimerID,
+                                  0); */
+                                // V0.9.12 (2001-05-24) [umoeller]
+                                // if the winproc chooses to start or
+                                // stop a timer, pNext still points
+                                // to a valid node...
+                                // -- if a timer is removed, that's OK
+                                // -- if a timer is added, it is added to
+                                //    the list, so we'll see it in this loop
+
+                            // V0.9.14 (2001-08-01) [umoeller]
+
+                            // DO NOT REFERENCE pTimer AFTER THIS CODE;
+                            // the winproc might have removed the timer,
+                            // and since the list is auto-free, pTimer
+                            // might have been freed!!
+                        }
+                        else
+                        {
+                            // window has been destroyed:
+                            lstRemoveNode(pllXTimers,
+                                          pTimerNode);
+                                // pNext is still valid
+
+                            fFoundInvalid = TRUE;
+                        }
+
+                    } // end if (pTimer->ulNextFire < ulTimeNow)
+
+                    // next timer
+                    pTimerNode = pNext; // V0.9.12 (2001-05-24) [umoeller]
+                } // end while (pTimerNode)
+
+                // destroy invalid timers, if any
+                if (fFoundInvalid)
+                    AdjustPMTimer(pSet);
+
+            } // end else if (!pTimerNode)
+        } // end if (pllXTimers)
 
         UnlockTimers();
@@ -614 +619 @@
  *      XTimers is not limited.
  *
- *      Returns a new timer or resets an existing
- *      timer (if usTimerID is already used with
- *      hwnd). Use tmrStopXTimer to stop the timer.
+ *      Returns the ID of a new timer or resets an
+ *      existing timer (if usTimerID is already used
+ *      with hwnd). Use tmrStopXTimer to stop the timer.
+ *
+ *      Returns 0 if an error occured. It is thus
+ *      invalid to specify a timer ID of 0.
  *
  *      The timer is _not_ stopped automatically
@@ -644 +652 @@
 USHORT XWPENTRY tmrStartXTimer(PXTIMERSET pSet, // in: timer set (from tmrCreateSet)
                                HWND hwnd,       // in: target window for XTimer
-                               USHORT usTimerID, // in: timer ID for XTimer's WM_TIMER
+                               USHORT usTimerID, // in: timer ID for XTimer's WM_TIMER (must be > 0)
                                ULONG ulTimeout) // in: XTimer's timeout
 {
@@ -653 +661 @@
     if (LockTimers())
     {
-        if (pSet)
-        {
-            PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
-
-            if ((pllXTimers) && (hwnd) && (ulTimeout))
+        PLINKLIST pllXTimers;
+        if (    (pSet)
+             && (pllXTimers = (PLINKLIST)pSet->pvllXTimers)
+             && (hwnd)
+             && (ulTimeout)
+             && (usTimerID)     // V0.9.16 (2001-12-18) [umoeller]
+           )
+        {
+            PXTIMER pTimer;
+            ULONG ulTimeNow;
+
+            // fix the timeout... we allow only multiples of
+            // 25, and it must be at least 25 (otherwise our
+            // internal master timer calculations will fail)
+            // V0.9.14 (2001-07-07) [umoeller]
+            if (ulTimeout < 25)
+                ulTimeout = 25;
+            else
+                ulTimeout = (ulTimeout + 10) / 25 * 25;
+
+            DosQuerySysInfo(QSV_MS_COUNT,
+                            QSV_MS_COUNT,
+                            &ulTimeNow,
+                            sizeof(ulTimeNow));
+
+            // check if this timer exists already
+            if (pTimer = FindTimer(pSet,
+                                   hwnd,
+                                   usTimerID))
             {
-                PXTIMER pTimer;
-
-                // fix the timeout... we allow only multiples of
-                // 25, and it must be at least 25 (otherwise our
-                // internal master timer calculations will fail)
-                // V0.9.14 (2001-07-07) [umoeller]
-                if (ulTimeout < 25)
-                    ulTimeout = 25;
-                else
-                    ulTimeout = (ulTimeout + 10) / 25 * 25;
-
-                // check if this timer exists already
-                if (pTimer = FindTimer(pSet,
-                                       hwnd,
-                                       usTimerID))
+                // exists already: reset only
+                pTimer->ulNextFire = ulTimeNow + ulTimeout;
+                usrc = usTimerID;
+            }
+            else
+            {
+                // new timer needed:
+                if (pTimer = NEW(XTIMER))
                 {
-                    // exists already: reset only
-                    ULONG ulTimeNow;
-                    DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
-                                    &ulTimeNow, sizeof(ulTimeNow));
+                    pTimer->usTimerID = usTimerID;
+                    pTimer->hwndTarget = hwnd;
+                    pTimer->ulTimeout = ulTimeout;
                     pTimer->ulNextFire = ulTimeNow + ulTimeout;
+
+                    lstAppendItem(pllXTimers,
+                                  pTimer);
                     usrc = usTimerID;
                 }
-                else
-                {
-                    // new timer needed:
-                    if (pTimer = NEW(XTIMER))
-                    {
-                        ULONG ulTimeNow;
-                        DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
-                                        &ulTimeNow, sizeof(ulTimeNow));
-                        pTimer->usTimerID = usTimerID;
-                        pTimer->hwndTarget = hwnd;
-                        pTimer->ulTimeout = ulTimeout;
-                        pTimer->ulNextFire = ulTimeNow + ulTimeout;
-
-                        lstAppendItem(pllXTimers,
-                                      pTimer);
-                        usrc = usTimerID;
-                    }
-                }
-
-                if (usrc)
-                    // timer created or reset:
-                    AdjustPMTimer(pSet);
-
-            } // if ((hwnd) && (ulTimeout))
-        }
+            }
+
+            if (usrc)
+                // timer created or reset:
+                AdjustPMTimer(pSet);
+
+        } // if ((hwnd) && (ulTimeout))
 
         UnlockTimers();
@@ -733 +742 @@
     if (LockTimers())
     {
-        if (pSet && pSet->pvllXTimers)
-        {
-            // PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
-
-            PXTIMER pTimer = FindTimer(pSet,
-                                       hwnd,
-                                       usTimerID);
-            if (pTimer)
-            {
-                RemoveTimer(pSet, pTimer);
-                // recalculate
-                AdjustPMTimer(pSet);
-                brc = TRUE;
-            }
+        PXTIMER pTimer;
+        if (pTimer = FindTimer(pSet,
+                               hwnd,
+                               usTimerID))
+                // FindTimer checks the params
+        {
+            RemoveTimer(pSet, pTimer);
+            // recalculate
+            AdjustPMTimer(pSet);
+            brc = TRUE;
         }
 

trunk/src/helpers/wphandle.c

@@ -949 +949 @@
  *      filename for hObject.
  *      This is a one-shot function, using wphQueryActiveHandles,
- *      wphReadAllBlocks, and wphFindPartName.
+ *      wphLoadHandles, and wphComposePath.
+ *      As a result, this function is _very_ expensive.
  *
  *      Returns:
@@ -956 +957 @@
  *
  *      --  ERROR_INVALID_HANDLE: hObject is invalid.
+ *
+ *      --  ERROR_WPH_NOT_FILESYSTEM_HANDLE: hObject's hiword is wrong.
  *
  *@@changed V0.9.16 (2001-10-02) [umoeller]: rewritten
@@ -983 +986 @@
             else
             {
+                USHORT usHiwordFileSystem = ((PHANDLESBUF)hHandles)->usHiwordFileSystem;
+
                 // is this really a file-system object?
-                if (HIUSHORT(hObject) == ((PHANDLESBUF)hHandles)->usHiwordFileSystem)
+                if (HIUSHORT(hObject) == usHiwordFileSystem)
                 {
                     // use loword only
@@ -998 +1003 @@
                     // _Pmpf((__FUNCTION__ ": wphFindPartName returned %d", arc));
                 }
+                else
+                    arc = ERROR_WPH_NOT_FILESYSTEM_HANDLE;
 
                 wphFreeHandles(&hHandles);

trunk/src/helpers/xml.c

@@ -1135 +1135 @@
                     {
                         // the element is allowed at all: now check for the
-                        // lists case...
+                        // lists case... @@todo
                         switch (ulDeclType)
                         {