Changeset 15

Timestamp:

Dec 11, 2000, 8:54:20 AM (25 years ago)

Author:

umoeller

Message:

Coupla bugfixes.

Location:

trunk

Files:

• include/helpers/cnrh.h (modified) (1 diff)
• include/helpers/dosh.h (modified) (1 diff)
• include/helpers/undoc.h (modified) (1 diff)
• include/helpers/xstring.h (modified) (5 diffs)
• include/setup.h (modified) (1 diff)
• src/helpers/animate.c (modified) (11 diffs)
• src/helpers/cnrh.c (modified) (2 diffs)
• src/helpers/datetime.c (modified) (3 diffs)
• src/helpers/dosh.c (modified) (2 diffs)
• src/helpers/except.c (modified) (4 diffs)
• src/helpers/helpers_post.in (modified) (1 diff)
• src/helpers/timer.c (modified) (9 diffs)
• src/helpers/winh.c (modified) (5 diffs)
• src/helpers/xstring.c (modified) (6 diffs)

trunk/include/helpers/cnrh.h

@@ -347 +347 @@
      *
      *      <B>Target emphasis:</B>
+     *
      *      For Name, Text, and Details view, per default target emphasis
      *      during d'n'd is only displayed _around_ the record core.
+     *      This allows users to drop records onto each other.
      *      If you add CA_ORDEREDTARGETEMPH, target emphasis is only
-     *      displayed _below_ the record core. If you add CA_MIXEDTARGETEMPH,
-     *      both emphasis types are possible.
+     *      displayed _between_ records (to reorder records).
+     *      If you add CA_MIXEDTARGETEMPH, both emphasis types are possible.
      *
      *      Additional flags for _all_ views:

trunk/include/helpers/dosh.h

@@ -46 +46 @@
 
     BOOL doshIsWarp4(VOID);
-
-    APIRET doshQueryAvailPhysMem(PULONG pulMem,
-                                 ULONG ulLogicalSwapDrive);
 
     PSZ doshQuerySysErrorMsg(APIRET arc);

trunk/include/helpers/undoc.h

@@ -73 +73 @@
 
     /*
+     *  WPS object styles
+     *      V0.9.7 (2000-12-10) [umoeller]
+     */
+
+    #ifndef OBJSTYLE_LOCKEDINPLACE
+        #define OBJSTYLE_LOCKEDINPLACE  0x00020000
+    #endif
+
+    /*
      * Some more OS/2 default menu items:
      *

trunk/include/helpers/xstring.h

@@ -55 +55 @@
 
     void XWPENTRY xstrInitSet(PXSTRING pxstr, PSZ pszNew);
+    typedef void XWPENTRY XSTRINITSET(PXSTRING pxstr, PSZ pszNew);
+    typedef XSTRINITSET *PXSTRINITSET;
 
     void XWPENTRY xstrInitCopy(PXSTRING pxstr, const char *pcszSource);
+    typedef void XWPENTRY XSTRINITCOPY(PXSTRING pxstr, const char *pcszSource);
+    typedef XSTRINITCOPY *PXSTRINITCOPY;
 
     void XWPENTRY xstrClear(PXSTRING pxstr);
@@ -63 +67 @@
 
     PXSTRING XWPENTRY xstrCreate(ULONG ulPreAllocate);
+    typedef PXSTRING XWPENTRY XSTRCREATE(ULONG ulPreAllocate);
+    typedef XSTRCREATE *PXSTRCREATE;
 
     VOID XWPENTRY xstrFree(PXSTRING pxstr);
+    typedef VOID XWPENTRY XSTRFREE(PXSTRING pxstr);
+    typedef XSTRFREE *PXSTRFREE;
 
     ULONG XWPENTRY xstrset(PXSTRING pxstr, PSZ pszNew);
+    typedef ULONG XWPENTRY XSTRSET(PXSTRING pxstr, PSZ pszNew);
+    typedef XSTRSET *PXSTRSET;
 
     ULONG XWPENTRY xstrcpy(PXSTRING pxstr, const char *pcszSource);
+    typedef ULONG XWPENTRY XSTRCPY(PXSTRING pxstr, const char *pcszSource);
+    typedef XSTRCPY *PXSTRCPY;
 
     ULONG XWPENTRY xstrcat(PXSTRING pxstr, const char *pcszSource);
     typedef ULONG XWPENTRY XSTRCAT(PXSTRING pxstr, const char *pcszSource);
     typedef XSTRCAT *PXSTRCAT;
+
+    ULONG XWPENTRY xstrcatc(PXSTRING pxstr, CHAR c);
+    typedef ULONG XWPENTRY XSTRCATC(PXSTRING pxstr, CHAR c);
+    typedef XSTRCATC *PXSTRCATC;
 
     /*
@@ -90 +106 @@
                               const char *pcszBeginChars,
                               const char *pcszEndChars);
+    typedef PSZ XWPENTRY XSTRFINDWORD(const XSTRING *pxstr,
+                                      ULONG ulOfs,
+                                      const XSTRING *pstrFind,
+                                      size_t *pShiftTable,
+                                      PBOOL pfRepeatFind,
+                                      const char *pcszBeginChars,
+                                      const char *pcszEndChars);
+    typedef XSTRFINDWORD *PXSTRFINDWORD;
 
     ULONG XWPENTRY xstrrpl(PXSTRING pxstr,
@@ -97 +121 @@
                            size_t *pShiftTable,
                            PBOOL pfRepeatFind);
+    typedef ULONG XWPENTRY XSTRRPL(PXSTRING pxstr,
+                                   PULONG pulOfs,
+                                   const XSTRING *pstrSearch,
+                                   const XSTRING *pstrReplace,
+                                   size_t *pShiftTable,
+                                   PBOOL pfRepeatFind);
+    typedef XSTRRPL *PXSTRRPL;
 
     ULONG XWPENTRY xstrcrpl(PXSTRING pxstr,
@@ -102 +133 @@
                             const char *pcszSearch,
                             const char *pcszReplace);
+    typedef ULONG XWPENTRY XSTRCRPL(PXSTRING pxstr,
+                                    PULONG pulOfs,
+                                    const char *pcszSearch,
+                                    const char *pcszReplace);
+    typedef XSTRCRPL *PXSTRCRPL;
 #endif
 

trunk/include/setup.h

@@ -8 +8 @@
 #ifndef SETUP_HEADER_INCLUDED
     #define SETUP_HEADER_INCLUDED
+
+    // XWPEXPORT defines the standard linkage for the
+    // XWorkplace helpers.
+    #ifdef __EMX__
+        #define XWPENTRY
+    #elif defined (__IBMCPP__) || defined (__IBMC__)
+        #define XWPENTRY _Optlink
+    #endif
 
     /*************************************************************

trunk/src/helpers/animate.c

@@ -41 +41 @@
 #define INCL_DOSDEVICES
 #define INCL_DOSDEVIOCTL
+#define INCL_DOSMISC
 #define INCL_DOSERRORS
 
@@ -58 +59 @@
 #include "helpers\animate.h"
 
-#include "helpers\datetime.h"
 #include "helpers\winh.h"
 #include "helpers\gpih.h"
@@ -85 +85 @@
  *      Returns the count of animation steps that were drawn.
  *      This is dependent on the speed of the system.
+ *
+ *@@changed V0.9.7 (2000-12-08) [umoeller]: got rid of dtGetULongTime
  */
 
@@ -122 +124 @@
         // 2) since large bitmaps take more time to calculate,
         //    the animation won't appear to slow down then
-        ulInitialTime = dtGetULongTime();
+        DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                        &ulInitialTime,
+                        sizeof(ulInitialTime));
         ul = 1;
         ulSteps = 1000;
@@ -137 +141 @@
                     DBM_STRETCH);
 
-            ulNowTime = dtGetULongTime();
+            DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                            &ulNowTime,
+                            sizeof(ulNowTime));
 
             // recalculate ul: rule of three based on the
@@ -175 +181 @@
  *      been acquired using WinGetScreenPS,
  *      ulSteps should be around 40-50.
+ *
+ *@@changed V0.9.7 (2000-12-08) [umoeller]: got rid of dtGetULongTime
  */
 
@@ -195 +203 @@
     ulPhase = 1;
 
-    do {
-        ULONG ulFromTime = dtGetULongTime();
+    do
+    {
+        ULONG ulFromTime, ulTime2;
+        DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                        &ulFromTime,
+                        sizeof(ulFromTime));
 
         if (ulPhase == 1)
@@ -225 +237 @@
             rclNow.yTop = (rclScreen.yTop) - rclNow.yBottom;
 
-            if (rclNow.yBottom > (rclNow.yTop - LAST_WIDTH) ) {
+            if (rclNow.yBottom > (rclNow.yTop - LAST_WIDTH) )
+            {
                 rclNow.yBottom = (rclScreen.yTop / 2) - LAST_WIDTH;
                 rclNow.yTop = (rclScreen.yTop / 2) + LAST_WIDTH;
@@ -262 +275 @@
 
             // done with "shrinking"?
-            if ( rclNow.xRight < ((rclScreen.xRight / 2) + LAST_WIDTH) ) {
+            if ( rclNow.xRight < ((rclScreen.xRight / 2) + LAST_WIDTH) )
                 ulPhase = 2; // exit
-            }
-
-        } else if (ulPhase == 2) {
+        }
+        else if (ulPhase == 2)
+        {
             // Phase 2: draw a horizontal white line about
             // where the last rclNow was. This is only
@@ -290 +303 @@
             ul = 0;
 
-        } else if (ulPhase == 3) {
+        }
+        else if (ulPhase == 3)
+        {
             // Phase 3: make the white line shorter with
             // every iteration by drawing black rectangles
@@ -324 +339 @@
 
             ul++;
-            if (ul > LAST_STEPS) {
+            if (ul > LAST_STEPS)
                 ulPhase = 99;
-            }
         }
 
         ul++;
 
-        while (dtGetULongTime() < ulFromTime + WAIT_TIME) {
-            // PSZ p = NULL; // keep compiler happy
-        }
+        DosSleep(WAIT_TIME);
+
+        /* do
+        {
+            DosSleep(0);
+            DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                            &ulTime2,
+                            sizeof(ulTime2));
+        }  while (ulTime2 < ulFromTime + WAIT_TIME); */
     } while (ulPhase != 99);
 

trunk/src/helpers/cnrh.c

@@ -1644 +1644 @@
  *
  *      --  the container sends CN_INITDRAG ("real" d'n'd desired by user);
+ *
  *      --  the container sends us CN_PICKUP (Alt+MB2 pressed);
+ *
  *      --  the user has selected "Pickup" from a record core's
  *          context menu (ID_XSMI_FILETYPES_PICKUP command).
@@ -1674 +1676 @@
  *      --  ulItemID will be set to the preccDrag so that the target
  *          window can access the dragged record.
+ *
  *      --  hstrSourceName == hstrTargetName gets the RECORDCORE.pszIcon.
  *
  *      The drag icon will be a default system file icon.
+ *
+ *      Preconditions:
+ *
+ *      --  pszIcon must be set in the RECORDCORE. This is used for
+ *          the item source name. This must not be NULL.
  */
 

trunk/src/helpers/datetime.c

@@ -41 +41 @@
     // as unsigned char
 
+#define INCL_DOSMISC
 #include <os2.h>
 
@@ -73 +74 @@
  *      time in milliseconds.
  *
- *      Even though this does handle date information (i.e.
- *      will still return an increasing number when the
- *      clock switches from 23:59:59:9999 to 0:00:00:0000),
- *      this will not work forver after the first call.
- *      Here's the calculation:
- *
- +          1000 ms per second
- +            * 60 secs per minute
- +                * 60 minutes per hour
- +                    * 24 hours per day
- +                      = 86'400'000       after 23:59:59:9999
- *
  *      A ULONG can hold a max value of 4'294'967'295.
  *      So this overflows after 49.71... days.
  *
- *@@changed V0.9.7 (2000-12-05) [umoeller]: now handling date also
+ *@@V0.9.7 (2000-12-08) [umoeller]: replaced, now using DosQuerySysInfo(QSV_MS_COUNT)
  */
 
 ULONG dtGetULongTime(VOID)
 {
-    DATETIME    dt;
-    ULONG       ulTime,
-                ulDateScalarPassed = 1;
-    DosGetDateTime(&dt);
-    ulTime = (10*(dt.hundredths + 100*(dt.seconds + 60*(dt.minutes + 60*(dt.hours)))));
+    ULONG ulTimeNow;
+    DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                    &ulTimeNow,
+                    sizeof(ulTimeNow));
+    return (ulTimeNow);
+
+    /* DATETIME    dt;
+    ULONG       ulHours,
+                ulDaysPassed = 0;
 
     if (G_ulDateScalarFirstCalled == 0)
@@ -112 +105 @@
                                               dt.month,
                                               dt.day);
-        // calculate days passed since first call;
-        // this should be 1 if the date hasn't changed
-        ulDateScalarPassed = (G_ulDateScalarFirstCalled - ulDateScalarNow) + 1;
+        ulDaysPassed = (ulDateScalarNow - G_ulDateScalarFirstCalled);
+        _Pmpf((__FUNCTION__ ": days passed = %d", ulDaysPassed));
     }
 
-    return (ulTime * ulDateScalarPassed);
+    DosGetDateTime(&dt);
+    ulHours = dt.hours;     // this is UCHAR in DATETIME
+    // get the hours; for every day passed, add 24 hours...
+    ulHours += (24 * ulDaysPassed);
+            // 0 if we're still on the first date
+
+    return (10*(dt.hundredths + 100*(dt.seconds + 60*(dt.minutes + 60*(ulHours))))); */
 }
 

trunk/src/helpers/dosh.c

@@ -178 +178 @@
 
     return (s_brc);
-}
-
-/*
- *@@ doshQueryAvailPhysMem:
- *      returns the amount of physical memory which
- *      is presently available (before the swapper
- *      would have to be expanded).
- *
- *      This number is calculated by getting the
- *      total available memory (QSV_TOTRESMEM)
- *      and subtracting the free space on the
- *      drive with the swap file from it.
- *
- *      As a result, you also need to specify
- *      the logical drive on which the swapper
- *      resides (3 = C, 4 = D, and so on).
- *
- *@@added V0.9.7 (2000-12-01) [umoeller]
- */
-
-APIRET doshQueryAvailPhysMem(PULONG pulMem,
-                             ULONG ulLogicalSwapDrive)
-{
-    APIRET arc = DosQuerySysInfo(QSV_TOTAVAILMEM,
-                                 QSV_TOTAVAILMEM,
-                                 pulMem,
-                                 sizeof(*pulMem));
-    if (arc == NO_ERROR)
-    {
-        double dFree = 0;
-        arc = doshQueryDiskFree(ulLogicalSwapDrive,
-                                &dFree);
-        *pulMem -= (ULONG)dFree;
-    }
-
-    return (arc);
 }
 
@@ -895 +859 @@
  *
  *@@added V0.9.6 (2000-10-16) [umoeller]
+ *@@changed V0.9.7 (2000-12-10) [umoeller]: fixed "F:filename.ext" case
  */
 
 PSZ doshGetExtension(const char *pcszFilename)
 {
-    PSZ pszExtension = 0;
+    PSZ pReturn = NULL;
 
     if (pcszFilename)
     {
         // find filename
-        PSZ p2 = strrchr(pcszFilename + 2, '\\'),
-                    // works on "C:\blah" or "\\unc\blah"
-            p3 = NULL;
-
-        if (!p2)
-            // no backslash found: then this is not qualified...
-            // use start of filename
-            p2 = (PSZ)pcszFilename;
+        const char *p2 = strrchr(pcszFilename + 2, '\\'),
+                            // works on "C:\blah" or "\\unc\blah"
+                   *pStartOfName = NULL,
+                   *pExtension = NULL;
+
+        if (p2)
+            pStartOfName = p2 + 1;
+        else
+        {
+            // no backslash found:
+            // maybe only a drive letter was specified:
+            if (*(pcszFilename + 1) == ':')
+                // yes:
+                pStartOfName = pcszFilename + 2;
+            else
+                // then this is not qualified at all...
+                // use start of filename
+                pStartOfName = (PSZ)pcszFilename;
+        }
 
         // find last dot in filename
-        p3 = strrchr(p2 + 1, '.');
-        if (p3)
-            pszExtension = p3 + 1;
-    }
-
-    return (pszExtension);
+        pExtension = strrchr(pStartOfName, '.');
+        if (pExtension)
+            pReturn = (PSZ)pExtension + 1;
+    }
+
+    return (pReturn);
 }
 

trunk/src/helpers/except.c

@@ -516 +516 @@
     {
         case XCPT_ACCESS_VIOLATION:
-        {
             fprintf(file, "\nXCPT_ACCESS_VIOLATION: ");
             if (pReportRec->ExceptionInfo[0] & XCPT_READ_ACCESS)
@@ -538 +537 @@
                     "             confusion with administering memory or error conditions \n"
                     "             were not properly checked for.\n");
-            break;
-        }
+        break;
 
         case XCPT_INTEGER_DIVIDE_BY_ZERO:
-        {
             fprintf(file, "\nXCPT_INTEGER_DIVIDE_BY_ZERO.\n");
             fprintf(file,
                     "Explanation: An attempt was made to divide an integer value by zero,\n"
                     "             which is not defined.\n");
-            break;
-        }
+        break;
 
         case XCPT_ILLEGAL_INSTRUCTION:
-        {
             fprintf(file, "\nXCPT_ILLEGAL_INSTRUCTION.\n");
             fprintf(file,
                     "Explanation: An attempt was made to execute an instruction that\n"
                     "             is not defined on this machine's architecture.\n");
-            break;
-        }
+        break;
 
         case XCPT_PRIVILEGED_INSTRUCTION:
-        {
             fprintf(file, "\nXCPT_PRIVILEGED_INSTRUCTION.\n");
             fprintf(file,
@@ -566 +559 @@
                     "             is not permitted in the current machine mode or that\n"
                     "             XFolder had no permission to execute.\n");
-            break;
-        }
+        break;
 
         case XCPT_INTEGER_OVERFLOW:
@@ -575 +567 @@
                     "             significant bit. This is a sign of an attempt to store\n"
                     "             a value which does not fit into an integer variable.\n");
+        break;
 
         default:
             fprintf(file, "\nUnknown OS/2 exception number %d.\n", pReportRec->ExceptionNum);
             fprintf(file, "Look this up in the OS/2 header files.\n");
+        break;
     }
 

trunk/src/helpers/helpers_post.in

@@ -45 +45 @@
 $(OUTPUTDIR)\animate.obj:   $(@B).c $(HLPINC)\$(@B).h \
                $(PROJECTINC)\setup.h \
-               $(HLPINC)\datetime.h $(HLPINC)\winh.h $(HLPINC)\gpih.h \
+               $(HLPINC)\winh.h $(HLPINC)\gpih.h \
 
 $(OUTPUTDIR)\cnrh.obj:     $(@B).c $(HLPINC)\$(@B).h \

trunk/src/helpers/timer.c

@@ -71 +71 @@
 #define INCL_DOSPROCESS
 #define INCL_DOSSEMAPHORES
+#define INCL_DOSMISC
 #define INCL_DOSERRORS
 #include <os2.h>
@@ -190 +191 @@
  *      is stopped thru tmrStopTimer, which then
  *      sets the thread's fExit flag to TRUE.
+ *
+ *@@changed V0.9.7 (2000-12-08) [umoeller]: got rid of dtGetULongTime
  */
 
@@ -244 +247 @@
                     {
                         PXTIMER pTimer = (PXTIMER)pTimerNode->pItemData;
-                        ULONG ulTimeNow = dtGetULongTime();
+                        ULONG ulTimeNow;
+                        DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                                        &ulTimeNow, sizeof(ulTimeNow));
 
                         if (pTimer->ulNextFire < ulTimeNow)
@@ -357 +362 @@
  *
  *      -- The caller must call LockTimers() first.
- *
- *@@added V0.9.7 (2000-12-04) [umoeller]
  */
 
@@ -385 +388 @@
  *
  *      The timer is _not_ stopped automatically
- *      when the widget is destroyed.
- *
- *@@added V0.9.7 (2000-12-04) [umoeller]
+ *      when the window is destroyed.
+ *
+ *@@changed V0.9.7 (2000-12-08) [umoeller]: got rid of dtGetULongTime
  */
 
@@ -432 +435 @@
                 {
                     // exists already: reset only
-                    pTimer->ulNextFire = dtGetULongTime() + ulTimeout;
+                    ULONG ulTimeNow;
+                    DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                                    &ulTimeNow, sizeof(ulTimeNow));
+                    pTimer->ulNextFire = ulTimeNow + ulTimeout;
                     usrc = pTimer->usTimerID;
                 }
@@ -441 +447 @@
                     if (pTimer)
                     {
+                        ULONG ulTimeNow;
+                        DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                                        &ulTimeNow, sizeof(ulTimeNow));
                         pTimer->usTimerID = usTimerID;
                         pTimer->hwndTarget = hwnd;
                         pTimer->ulTimeout = ulTimeout;
-                        pTimer->ulNextFire = dtGetULongTime() + ulTimeout;
+                        pTimer->ulNextFire = ulTimeNow + ulTimeout;
 
                         lstAppendItem(&G_llTimers,
@@ -476 +485 @@
  *
  *      Returns TRUE if the timer was stopped.
- *
- *@@added V0.9.7 (2000-12-04) [umoeller]
  */
 
@@ -523 +530 @@
  *      that you should call during WM_DESTROY of
  *      a window that has started timers.
- *
- *@@added V0.9.7 (2000-12-04) [umoeller]
  */
 

trunk/src/helpers/winh.c

@@ -2480 +2480 @@
  *          object.
  *
+ *      Even though this isn't clearly said in PMREF,
+ *      PROGDETAILS.swpInitial is important:
+ *
+ *      -- To start a session minimized, set SWP_MINIMIZE.
+ *
+ *      -- To start a VIO session without auto-close, set
+ *         the half-documented SWP_NOAUTOCLOSE flag (0x8000)
+ *         This flag is now in the newer toolkit headers.
+ *
  *      Since this calls WinStartApp in turn, this
  *      requires a message queue on the calling thread.
  *
  *@@added V0.9.6 (2000-10-16) [umoeller]
+ *@@changed V0.9.7 (2000-12-10) [umoeller]: PROGDETAILS.swpInitial no longer zeroed... this broke VIOs
  */
 
@@ -2500 +2510 @@
     ProgDetails.Length = sizeof(PROGDETAILS);
     ProgDetails.progt.fbVisible = SHE_VISIBLE;
-    ProgDetails.pszEnvironment = 0; // "WORKPLACE\0\0";
-    memset(&ProgDetails.swpInitial, 0, sizeof(SWP));
+    ProgDetails.pszEnvironment = 0;
+
+    // memset(&ProgDetails.swpInitial, 0, sizeof(SWP));
+            // this wasn't a good idea... WPProgram stores stuff
+            // in here, such as the "minimize on startup" -> SWP_MINIMIZE
 
     // duplicate parameters...
@@ -2513 +2526 @@
 
     // program type fixups
-    switch (ProgDetails.progt.progc)
+    switch (ProgDetails.progt.progc)        // that's a ULONG
     {
         case ((ULONG)-1):       // we get that sometimes...
@@ -2524 +2537 @@
     switch (ProgDetails.progt.progc)
     {
-        case PROG_31_ENH:
-        case PROG_31_ENHSEAMLESSCOMMON:
-        case PROG_31_ENHSEAMLESSVDM:
+        case PROG_31_ENHSEAMLESSVDM:        // 17
+        case PROG_31_ENHSEAMLESSCOMMON:     // 18
+        case PROG_31_ENH:                   // 19
             fIsWindowsApp = TRUE;
             fIsWindowsEnhApp = TRUE;
         break;
 
-        case PROG_WINDOW_AUTO:
-#ifdef PROG_30_STD
-        case PROG_30_STD:
+#ifndef PROG_30_STD
+    #define PROG_30_STD (PROGCATEGORY)11
 #endif
-        case PROG_31_STD:
-        case PROG_WINDOW_REAL:
-#ifdef PROG_30_STDSEAMLESSVDM
-        case PROG_30_STDSEAMLESSVDM:
+
+#ifndef PROG_30_STDSEAMLESSVDM
+    #define PROG_30_STDSEAMLESSVDM (PROGCATEGORY)13
 #endif
-        case PROG_31_STDSEAMLESSVDM:
-        case PROG_30_STDSEAMLESSCOMMON:
-        case PROG_31_STDSEAMLESSCOMMON:
+
+        case PROG_WINDOW_REAL:              // 10
+        case PROG_30_STD:                   // 11
+        case PROG_WINDOW_AUTO:              // 12
+        case PROG_30_STDSEAMLESSVDM:        // 13
+        case PROG_30_STDSEAMLESSCOMMON:     // 14
+        case PROG_31_STDSEAMLESSVDM:        // 15
+        case PROG_31_STDSEAMLESSCOMMON:     // 16
+        case PROG_31_STD:                   // 20
             fIsWindowsApp = TRUE;
         break;
@@ -2705 +2722 @@
                             // do not use SAF_STARTCHILDAPP, or the
                             // app will be terminated automatically
+                            // when the WPS terminates!
 
     // _Pmpf((__FUNCTION__ ": got happ 0x%lX", happ));

trunk/src/helpers/xstring.c

@@ -186 +186 @@
  *      this can be used instead of xstrInit if you
  *      want to initialize an XSTRING with a copy
- *      of an existing string.
+ *      of an existing string. This is a shortcut
+ *      for xstrInit() and then xstrcpy().
  *
  *      As opposed to xstrInitSet, this does create
@@ -382 +383 @@
  *
  *      Returns the length of the new string (excluding the null
- *      terminator), or null upon errors.
+ *      terminator) if the string was changed, or 0 if nothing
+ *      happened.
+ *
+ *      Note: To append a single character, xstrcatc is faster
+ *      than xstrcat.
  *
  *      Example:
@@ -391 +396 @@
  +          xstrcat(&str, "blup");
  *
- *      After this, psz points to a new string containing
+ *      After this, str.psz points to a new string containing
  *      "blahblup".
  *
@@ -399 +404 @@
  *@@changed V0.9.3 (2000-05-11) [umoeller]: returned 0 if pszString was initially empty; fixed
  *@@changed V0.9.6 (2000-11-01) [umoeller]: rewritten
+ *@@changed V0.9.7 (2000-12-10) [umoeller]: return value was wrong
  */
 
@@ -452 +458 @@
             // in all cases, set new length
             pxstr->ulLength += ulSourceLength;
-            ulrc = ulSourceLength;
+            ulrc = pxstr->ulLength;     // V0.9.7 (2000-12-10) [umoeller]
 
         } // end if (ulSourceLength)
@@ -458 +464 @@
         // do nothing
     }
+
+    return (ulrc);
+}
+
+/*
+ *@@ xstrcatc:
+ *      this is similar to xstrcat, except that this is
+ *      for a single character. This is a bit faster than
+ *      xstrcat.
+ *
+ *      If "c" is \0, nothing happens.
+ *
+ *      If pxstr is empty, this behaves just like xstrcpy.
+ *
+ *      Returns the length of the new string (excluding the null
+ *      terminator) if the string was changed, or 0 if nothing
+ *      happened.
+ *
+ *      Example:
+ *
+ +          XSTRING str;
+ +          xstrInit(&str, 0);
+ +          xstrcpy(&str, "blu");
+ +          xstrcatc(&str, 'p');
+ *
+ *      After this, str.psz points to a new string containing
+ *      "blup".
+ *
+ *@@added V0.9.7 (2000-12-10) [umoeller]
+ */
+
+ULONG xstrcatc(PXSTRING pxstr,     // in/out: string
+               CHAR c)             // in: character to append, can be \0
+{
+    ULONG   ulrc = 0;
+
+    if ((pxstr) && (c))
+    {
+        // ULONG   ulSourceLength = 1;
+        // 1) memory management
+        ULONG   cbNeeded = pxstr->ulLength  // existing length, without null terminator
+                           + 1      // new character
+                           + 1;     // null terminator
+        if (cbNeeded > pxstr->cbAllocated)
+        {
+            // we need more memory than we have previously
+            // allocated:
+            if (pxstr->cbAllocated)
+                // appendee already had memory:
+                // reallocate
+                pxstr->psz = (PSZ)realloc(pxstr->psz,
+                                          cbNeeded);
+            else
+                // appendee has no memory:
+                pxstr->psz = (PSZ)malloc(cbNeeded);
+
+            pxstr->cbAllocated = cbNeeded;
+                    // ulLength is unchanged yet
+        }
+        // else: we have enough memory, both if appendee
+        //       is empty or not empty
+
+        // now we have:
+        // -- if appendee (pxstr) had enough memory, no problem
+        // -- if appendee (pxstr) needed more memory
+        //      -- and was not empty: pxstr->psz now points to a
+        //         reallocated copy of the old string
+        //      -- and was empty: pxstr->psz now points to a
+        //         new (unitialized) buffer
+
+        // 2) append character:
+        pxstr->psz[pxstr->ulLength] = c;
+        pxstr->psz[pxstr->ulLength + 1] = '\0';
+
+        // in all cases, set new length
+        pxstr->ulLength++;
+        ulrc = pxstr->ulLength;
+
+    } // end if ((pxstr) && (c))
 
     return (ulrc);