Changeset 45

Timestamp:

Mar 10, 2001, 12:58:28 AM (24 years ago)

Author:

umoeller

Message:

Misc. changes.

Location:

trunk

Files:

• include/helpers/winh.h (modified) (1 diff)
• include/helpers/xstring.h (modified) (1 diff)
• src/helpers/dosh.c (modified) (1 diff)
• src/helpers/winh.c (modified) (1 diff)
• src/helpers/xstring.c (modified) (32 diffs)

trunk/include/helpers/winh.h

@@ -172 +172 @@
                                            SHORT sId);
 
+    BOOL XWPENTRY winhCopyMenuItem(HWND hmenuTarget,
+                                   HWND hmenuSource,
+                                   USHORT usID,
+                                   SHORT sTargetPosition);
+    typedef BOOL XWPENTRY WINHCOPYMENUITEM(HWND hmenuTarget,
+                                   HWND hmenuSource,
+                                   USHORT usID,
+                                   SHORT sTargetPosition);
+    typedef WINHCOPYMENUITEM *PWINHCOPYMENUITEM;
+
+    HWND XWPENTRY winhMergeIntoSubMenu(HWND hmenuTarget,
+                                       SHORT sTargetPosition,
+                                       const char *pcszTitle,
+                                       SHORT sID,
+                                       HWND hmenuSource);
+    typedef HWND XWPENTRY WINHMERGEINTOSUBMENU(HWND hmenuTarget,
+                                       SHORT sTargetPosition,
+                                       const char *pcszTitle,
+                                       SHORT sID,
+                                       HWND hmenuSource);
+    typedef WINHMERGEINTOSUBMENU *PWINHMERGEINTOSUBMENU;
+
     PSZ XWPENTRY winhQueryMenuItemText(HWND hwndMenu,
                                        USHORT usItemID);

trunk/include/helpers/xstring.h

@@ -48 +48 @@
         ULONG           cbAllocated;    // memory allocated in *psz
                                         // (>= ulLength + 1)
+        ULONG           ulDelta;        // allocation delta (0 = none)
+                                        // V0.9.9 (2001-03-07) [umoeller]
     } XSTRING, *PXSTRING;
 

trunk/src/helpers/dosh.c

@@ -1922 +1922 @@
     {
         // try additional things then
-        PSZ psz2 = malloc(strlen(pcszCommand) + 20);
+        PSZ psz2 = (PSZ)malloc(strlen(pcszCommand) + 20);
         if (psz2)
         {

trunk/src/helpers/winh.c

@@ -272 +272 @@
 
 /*
+ *@@ winhCopyMenuItem:
+ *      copies a menu item from hmenuSource to hmenuTarget.
+ *
+ *      This creates a full duplicate. If usID specifies
+ *      a submenu, the entire submenu is copied as well
+ *      (this will then recurse).
+ *
+ *      NOTE: Copying submenus will work only if each item
+ *      in the submenu has a unique menu ID. This is due
+ *      to the dumb implementation of menus in PM where
+ *      it is impossible to query menu items without
+ *      knowing their ID.
+ *
+ *@@added V0.9.9 (2001-03-09) [umoeller]
+ */
+
+BOOL winhCopyMenuItem(HWND hmenuTarget,
+                      HWND hmenuSource,
+                      USHORT usID,
+                      SHORT sTargetPosition)    // in: position to insert at or MIT_END
+{
+    BOOL brc = FALSE;
+    MENUITEM mi = {0};
+    if (WinSendMsg(hmenuSource,
+                   MM_QUERYITEM,
+                   MPFROM2SHORT(usID,
+                                FALSE),
+                   (MPARAM)&mi))
+    {
+        // found in source:
+        // is it a separator?
+        if (mi.afStyle & MIS_SEPARATOR)
+            winhInsertMenuSeparator(hmenuTarget,
+                                    sTargetPosition,
+                                    usID);
+        else
+        {
+            // no separator:
+            // get item text
+            PSZ pszSource = winhQueryMenuItemText(hmenuSource,
+                                                  usID);
+            if (pszSource)
+            {
+                if (    (mi.afStyle & MIS_SUBMENU)
+                     && (mi.hwndSubMenu)
+                   )
+                {
+                    // this is the top of a submenu:
+                    HWND hwndSubMenu = winhInsertSubmenu(hmenuTarget,
+                                                         sTargetPosition,
+                                                         mi.id,
+                                                         pszSource,
+                                                         mi.afStyle,
+                                                         0,
+                                                         NULL,
+                                                         0,
+                                                         0);
+                    if (hwndSubMenu)
+                    {
+                        // now copy all the items in the submenu
+                        SHORT cMenuItems = (SHORT)WinSendMsg(mi.hwndSubMenu,
+                                                             MM_QUERYITEMCOUNT,
+                                                             0, 0);
+                        // loop through all entries in the original submenu
+                        ULONG i;
+                        for (i = 0;
+                             i < cMenuItems;
+                             i++)
+                        {
+                            CHAR szItemText[100];
+                            SHORT id = (SHORT)WinSendMsg(mi.hwndSubMenu,
+                                                         MM_ITEMIDFROMPOSITION,
+                                                         MPFROMSHORT(i),
+                                                         0);
+                            // recurse
+                            winhCopyMenuItem(hwndSubMenu,
+                                             mi.hwndSubMenu,
+                                             id,
+                                             MIT_END);
+                        }
+
+                        // now check... was the original submenu
+                        // "conditional cascade"?
+                        if (WinQueryWindowULong(mi.hwndSubMenu,
+                                                QWL_STYLE)
+                                & MS_CONDITIONALCASCADE)
+                            // yes:
+                        {
+                            // get the original default item
+                            SHORT sDefID = (SHORT)WinSendMsg(mi.hwndSubMenu,
+                                                             MM_QUERYDEFAULTITEMID,
+                                                             0, 0);
+                            // set "conditional cascade style" on target too
+                            WinSetWindowBits(hwndSubMenu,
+                                             QWL_STYLE,
+                                             MS_CONDITIONALCASCADE,
+                                             MS_CONDITIONALCASCADE);
+                            // and set default item id
+                            WinSendMsg(hwndSubMenu,
+                                       MM_SETDEFAULTITEMID,
+                                       (MPARAM)sDefID,
+                                       0);
+                        }
+                    } // end if (hwndSubmenu)
+                } // end if (    (mi.afStyle & MIS_SUBMENU)
+                else
+                {
+                    // no submenu:
+                    // just copy that item
+                    SHORT s;
+                    mi.iPosition = sTargetPosition;
+                    s = (SHORT)WinSendMsg(hmenuTarget,
+                                          MM_INSERTITEM,
+                                          MPFROMP(&mi),
+                                          MPFROMP(pszSource));
+                    if (s != MIT_MEMERROR && s != MIT_ERROR)
+                        brc = TRUE;
+                }
+
+                free(pszSource);
+            } // end if (pszSource)
+        } // end else if (mi.afStyle & MIS_SEPARATOR)
+    } // end if (WinSendMsg(hmenuSource, MM_QUERYITEM,...
+
+    return (brc);
+}
+
+/*
+ *@@ winhMergeIntoSubMenu:
+ *      creates a new submenu in hmenuTarget with the
+ *      specified title at the specified position
+ *      and copies the entire contents of hmenuSource
+ *      into that.
+ *
+ *      Returns the window handle of the new submenu
+ *      or NULLHANDLE on errors.
+ *
+ *      NOTE: Copying submenus will work only if each item
+ *      in the submenu has a unique menu ID. This is due
+ *      to the dumb implementation of menus in PM where
+ *      it is impossible to query menu items without
+ *      knowing their ID.
+ *
+ *@@added V0.9.9 (2001-03-09) [umoeller]
+ */
+
+HWND winhMergeIntoSubMenu(HWND hmenuTarget,         // in: menu where to create submenu
+                          SHORT sTargetPosition,    // in: position to insert at or MIT_END
+                          const char *pcszTitle,    // in: title of new submenu
+                          SHORT sID,                // in: ID of new submenu
+                          HWND hmenuSource)         // in: menu to merge
+{
+    HWND hwndNewSubmenu = WinCreateMenu(hmenuTarget, NULL);
+    if (hwndNewSubmenu)
+    {
+        MENUITEM mi = {0};
+        SHORT src = 0;
+        SHORT s = 0;
+        mi.iPosition = MIT_END;
+        mi.afStyle = MIS_TEXT | MIS_SUBMENU;
+        mi.id = 2000;
+        mi.hwndSubMenu = hwndNewSubmenu;
+
+        WinSetWindowUShort(hwndNewSubmenu, QWS_ID, sID);
+
+        // insert new submenu into hmenuTarget
+        src = SHORT1FROMMR(WinSendMsg(hmenuTarget,
+                                      MM_INSERTITEM,
+                                      (MPARAM)&mi,
+                                      (MPARAM)pcszTitle));
+        if (    (src != MIT_MEMERROR)
+            &&  (src != MIT_ERROR)
+           )
+        {
+            int i;
+            SHORT cMenuItems = (SHORT)WinSendMsg(hmenuSource,
+                                                 MM_QUERYITEMCOUNT,
+                                                 0, 0);
+
+            // loop through all entries in the original menu
+            for (i = 0; i < cMenuItems; i++)
+            {
+                SHORT id = (SHORT)WinSendMsg(hmenuSource,
+                                             MM_ITEMIDFROMPOSITION,
+                                             MPFROMSHORT(i),
+                                             0);
+                winhCopyMenuItem(hwndNewSubmenu,
+                                 hmenuSource,
+                                 id,
+                                 MIT_END);
+            }
+        }
+        else
+        {
+            // error:
+            WinDestroyWindow(hwndNewSubmenu);
+            hwndNewSubmenu = NULLHANDLE;
+        }
+    }
+
+    return (hwndNewSubmenu);
+}
+
+/*
  *@@ winhQueryMenuItemText:
  *      this returns a menu item text as a PSZ

trunk/src/helpers/xstring.c

@@ -125 +125 @@
  *
  *      If (ulPreAllocate != 0), memory is pre-allocated
- *      for the string, but the string will be empty.
+ *      for the string, but the string will be empty
+ *      (its first byte is set to '\0'). In addition,
+ *      pxstr->ulDelta will be set to 10% of ulPreAllocate.
+ *
  *      This is useful if you plan to add more stuff to
  *      the string later so we don't have to reallocate
@@ -135 +138 @@
  *
  *@@added V0.9.6 (2000-11-01) [umoeller]
+ *@@changed V0.9.9 (2001-03-09) [umoeller]: added ulDelta
  */
 
@@ -147 +151 @@
                 // ulLength is still zero
         *(pxstr->psz) = 0;
-    }
+
+        pxstr->ulDelta = ulPreAllocate * 10 / 100;
+    }
+    // else: pxstr->ulDelta is still 0
 }
 
@@ -170 +177 @@
  *
  *@@added V0.9.6 (2000-11-01) [umoeller]
+ *@@changed V0.9.9 (2001-03-09) [umoeller]: added ulDelta
  */
 
@@ -175 +183 @@
                  PSZ pszNew)
 {
-    pxstr->psz = pszNew;
     if (!pszNew)
     {
-        pxstr->cbAllocated = 0;
-        pxstr->ulLength = 0;
+        memset(pxstr, 0, sizeof(XSTRING));
     }
     else
     {
+        pxstr->psz = pszNew;
         pxstr->ulLength = strlen(pszNew);
         pxstr->cbAllocated = pxstr->ulLength + 1;
+        pxstr->ulDelta = pxstr->ulLength  * 10 / 100;
     }
 }
@@ -209 +217 @@
  *@@added V0.9.6 (2000-11-01) [umoeller]
  *@@changed V0.9.7 (2000-12-31) [umoeller]: added ulExtraAllocate
+ *@@changed V0.9.9 (2001-03-09) [umoeller]: added ulDelta
  */
 
@@ -229 +238 @@
                 pxstr->psz = (PSZ)malloc(pxstr->cbAllocated);
                 strcpy(pxstr->psz, pcszSource);
+
+                pxstr->ulDelta = pxstr->cbAllocated * 10 / 100;
             }
         }
@@ -265 +276 @@
  *      this function does nothing.
  *
+ *      pxstr->ulDelta has no effect here.
+ *
  *      The XSTRING must be initialized before the
  *      call.
@@ -271 +284 @@
  *
  *@@added V0.9.7 (2001-01-07) [umoeller]
+ *@@changed V0.9.9 (2001-03-09) [umoeller]: now using ulDelta
  */
 
@@ -282 +296 @@
         // we need more memory than we have previously
         // allocated:
-        if (pxstr->cbAllocated)
-            // appendee already had memory:
-            // reallocate
-            pxstr->psz = (PSZ)realloc(pxstr->psz,
-                                      cbNeeded);
+        ULONG cbAllocate;
+        if (pxstr->ulDelta)
+        {
+            // delta specified: allocate in chunks of that
+            // V0.9.9 (2001-03-07) [umoeller]
+            ULONG cbExtra = cbNeeded - pxstr->cbAllocated;
+            cbExtra = (   (cbExtra + pxstr->ulDelta)
+                        / pxstr->ulDelta
+                      )
+                      * pxstr->ulDelta;
+                    // if we need 3 extra bytes and ulDelta is 10,
+                    // this gives us 10 extra bytes
+                    // if we need 3 extra bytes and ulDelta is 1000,
+                    // this gives us 1000 extra bytes
+            cbAllocate = pxstr->cbAllocated + cbExtra;
+        }
         else
-        {
-            // appendee has no memory:
-            pxstr->psz = (PSZ)malloc(cbNeeded);
-            *(pxstr->psz) = 0;
-        }
-
-        pxstr->cbAllocated = cbNeeded;
+            // no delta specified:
+            cbAllocate = cbNeeded;
+        // V0.9.9 (2001-03-05) [umoeller]: use realloc;
+        // this gives the C runtime a chance to expand the
+        // existing block
+        pxstr->psz = (PSZ)realloc(pxstr->psz, cbAllocate);
+                    // if pxstr->psz is NULL, realloc behaves like malloc
+        pxstr->cbAllocated = cbAllocate;
                 // ulLength is unchanged
     }
+    // else: we have enough memory
 
     return (pxstr->cbAllocated);
@@ -369 +396 @@
         pxstr->ulLength = strlen(pszNew);
         pxstr->cbAllocated = pxstr->ulLength + 1;
+
+        pxstr->ulDelta = pxstr->cbAllocated * 10 / 100;
     }
     // else null string: cbAllocated and ulLength are 0 already
@@ -382 +411 @@
  *      If pxstr contains something, its contents are destroyed.
  *
- *      With ulSourceLength, specify the length of pcszSource.
- *      If you specify 0, this function will run strlen(pcszSource)
- *      itself.
- *
- *      If you already know the length of pcszSource, you can
- *      speed this function up a bit this way.
- *
- *      You are required to specify ulSourceLength if you only want
- *      to copy a substring, or pcszSource is not zero-terminated.
+ *      With ulSourceLength, specify the length of pcszSource
+ *      or 0.
+ *
+ *      --  If you specify 0, this function will run
+ *          strlen(pcszSource) and copy the entire source
+ *          string.
+ *
+ *      --  If you already know the length of pcszSource, you
+ *          can speed this function up by specifying the
+ *          length.
+ *
+ *      --  You are required to specify ulSourceLength if you
+ *          only want to copy a substring, or if pcszSource is
+ *          not zero-terminated.
  *
  *      Returns the length of the new string (excluding the null
@@ -413 +447 @@
  *@@changed V0.9.9 (2001-02-14) [umoeller]: fixed NULL target crash
  *@@changed V0.9.9 (2001-02-16) [umoeller]: now supporting non-zero-terminated pcszSource
+ *@@changed V0.9.9 (2001-03-09) [umoeller]: now using xstrReserve
  */
 
@@ -419 +454 @@
               ULONG ulSourceLength)         // in: length of pcszSource or 0
 {
-    // xstrClear(pxstr);        NOOOO! this frees the string, we want to keep the memory
-
     if (!pxstr)
         return (0);         // V0.9.9 (2001-02-14) [umoeller]
@@ -437 +470 @@
     {
         // we do have a source string:
-        ULONG cbNeeded = ulSourceLength + 1;
-        if (cbNeeded > pxstr->cbAllocated)
-        {
-            // we need more memory than we have previously
-            // allocated:
-            /* if (pxstr->psz)
-                free(pxstr->psz); // V0.9.9 (2001-01-28) [lafaix]
-            pxstr->cbAllocated = cbNeeded;
-            pxstr->psz = (PSZ)malloc(cbNeeded); */
-
-            // V0.9.9 (2001-03-05) [umoeller]: use realloc;
-            // this gives the C runtime a chance to expand the
-            // existing block
-            pxstr->psz = (PSZ)realloc(pxstr->psz, cbNeeded);
-                        // if pxstr->psz is NULL, realloc behaves like malloc
-            pxstr->cbAllocated = cbNeeded;
-        }
-        // else: we have enough memory
+        xstrReserve(pxstr,
+                    // required memory:
+                    ulSourceLength + 1);
 
         memcpy(pxstr->psz,
@@ -544 +562 @@
  *@@changed V0.9.7 (2001-01-15) [umoeller]: added ulSourceLength
  *@@changed V0.9.9 (2001-02-16) [umoeller]: now supporting non-zero-terminated pcszSource
+ *@@changed V0.9.9 (2001-03-09) [umoeller]: now using xstrReserve
  */
 
@@ -564 +583 @@
 
                 // 1) memory management
-                ULONG   cbNeeded = pxstr->ulLength + ulSourceLength + 1;
-                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
+                xstrReserve(pxstr,
+                            // required memory:
+                            pxstr->ulLength + ulSourceLength + 1);
 
                 // 2) append source string:
@@ -645 +640 @@
  *
  *@@added V0.9.7 (2000-12-10) [umoeller]
+ *@@changed V0.9.9 (2001-03-09) [umoeller]: now using xstrReserve
  */
 
@@ -656 +652 @@
         // 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
-
+        xstrReserve(pxstr,
+                    // required memory:
+                    pxstr->ulLength  // existing length, without null terminator
+                            + 1      // new character
+                            + 1);    // null terminator
         // 2) append character:
         pxstr->psz[pxstr->ulLength] = c;
@@ -691 +662 @@
 
         // in all cases, set new length
-        pxstr->ulLength++;
+        (pxstr->ulLength)++;
         ulrc = pxstr->ulLength;
 
@@ -712 +683 @@
         return (0);
 
-    return (xstrcat(pxstr, pcstrSource->psz, pcstrSource->ulLength));
+    return (xstrcat(pxstr,
+                    pcstrSource->psz,
+                    pcstrSource->ulLength));
 }
 
@@ -753 +726 @@
  *@@changed V0.9.9 (2001-01-29) [lafaix]: fixed unnecessary allocation when pxstr was big enough
  *@@changed V0.9.9 (2001-02-14) [umoeller]: fixed NULL target crash
+ *@@changed V0.9.9 (2001-03-09) [umoeller]: now using xstrReserve
  */
 
@@ -772 +746 @@
                     // can be 0!
 
-        // length of new string
+        // size of new buffer:
         ULONG   cbNeeded = pxstr->ulLength
                          + cReplaceLen
@@ -778 +752 @@
                          + 1;                  // null terminator
         // offset where pszSearch was found
-                // ulFirstReplOfs = pFound - pxstr->psz; now ulFirstReplOfs
         PSZ     pFound = pxstr->psz + ulFirstReplOfs;
 
         // now check if we have enough memory...
-        if (pxstr->cbAllocated < cbNeeded)
+        if (cbNeeded > pxstr->cbAllocated)
         {
-            // no, we need more memory:
+            // we need more memory than we have previously
+            // allocated:
+            // reallocate using ulDelta V0.9.9 (2001-03-07) [umoeller]
+            ULONG cbAllocate;
+            PSZ pszNew;
+            if (pxstr->ulDelta)
+            {
+                // delta specified: allocate in chunks of that
+                // V0.9.9 (2001-03-07) [umoeller]
+                ULONG cbExtra = cbNeeded - pxstr->cbAllocated;
+                cbExtra = (   (cbExtra + pxstr->ulDelta)
+                            / pxstr->ulDelta
+                          )
+                          * pxstr->ulDelta;
+                        // if we need 3 extra bytes and ulDelta is 10,
+                        // this gives us 10 extra bytes
+                        // if we need 3 extra bytes and ulDelta is 1000,
+                        // this gives us 1000 extra bytes
+                cbAllocate = pxstr->cbAllocated + cbExtra;
+            }
+            else
+                // no delta specified:
+                cbAllocate = cbNeeded;
             // allocate new buffer
-            PSZ pszNew = (PSZ)malloc(cbNeeded);
+            pszNew = (PSZ)malloc(cbAllocate);
+            // end V0.9.9 (2001-03-07) [umoeller]
 
             if (ulFirstReplOfs)
@@ -824 +820 @@
             pxstr->psz = pszNew;
             pxstr->ulLength = cbNeeded - 1;
-            pxstr->cbAllocated = cbNeeded;
+            pxstr->cbAllocated = cbAllocate; // V0.9.9 (2001-03-07) [umoeller]
         } // end if (pxstr->cbAllocated < cbNeeded)
         else
@@ -1355 +1351 @@
     ULONG   ulOfs = 0;
 
-    xstrInit(&str, 100);
+    xstrInit(&str, 0);
     xstrInit(&strFind, 0);
     xstrInit(&strReplace, 0);
+
+    str.ulDelta = 50;
 
     xstrcpy(&str, "Test string 1. Test string 2. Test string 3. !", 0);
@@ -1363 +1361 @@
     xstrcpy(&strReplace, "Dummy", 0);
 
-    printf("Old string is: \"%s\" (%d/%d)\n", str.psz, str.ulLength, str.cbAllocated);
+    printf("Old string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
 
     printf("Replacing \"%s\" with \"%s\".\n", strFind.psz, strReplace.psz);
@@ -1376 +1374 @@
         ;
 
-    printf("New string is: \"%s\" (%d/%d)\n", str.psz, str.ulLength, str.cbAllocated);
+    printf("New string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
+
+    printf("Appending \"blah\".\n");
+    xstrcat(&str, "blah", 0);
+    printf("New string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
 
     xstrcpy(&strFind, strReplace.psz, 0);
@@ -1392 +1394 @@
         ;
 
-    printf("New string is: \"%s\" (%d/%d)\n", str.psz, str.ulLength, str.cbAllocated);
+    printf("New string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
 
     xstrcpy(&strFind, " ", 0);
@@ -1408 +1410 @@
         ;
 
-    printf("New string is: \"%s\" (%d/%d)\n", str.psz, str.ulLength, str.cbAllocated);
+    printf("New string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
 
     xstrcpy(&strFind, ".", 0);
@@ -1424 +1426 @@
         ;
 
-    printf("New string is: \"%s\" (%d/%d)\n", str.psz, str.ulLength, str.cbAllocated);
-
-    printf("Reserving extra mem.\n");
-
-    xstrReserve(&str, 6000);
-    printf("New string is: \"%s\" (%d/%d)\n", str.psz, str.ulLength, str.cbAllocated);
+    printf("New string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
 
     xstrcpy(&strFind, "..........", 0);
@@ -1445 +1442 @@
         ;
 
-    printf("New string is: \"%s\" (%d/%d)\n", str.psz, str.ulLength, str.cbAllocated);
+    printf("New string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
 
     printf("Encoding @* chars.\n");
     xstrEncode(&str, "@*");
-    printf("New string is: \"%s\" (%d/%d)\n", str.psz, str.ulLength, str.cbAllocated);
+    printf("New string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
 
     printf("Decoding @* chars.\n");
     xstrDecode(&str);
-    printf("New string is: \"%s\" (%d/%d)\n", str.psz, str.ulLength, str.cbAllocated);
+    printf("New string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
 
     return (0);
-}
-
-*/
+} */
+
+