Changeset 136

Timestamp:

Feb 3, 2002, 11:46:54 AM (24 years ago)

Author:

umoeller

Message:

Buncha fixes.

Location:

trunk

Files:

• include/helpers/dialog.h (modified) (3 diffs)
• include/helpers/exeh.h (modified) (4 diffs)
• readme.txt (modified) (5 diffs)
• src/helpers/dialog.c (modified) (6 diffs)
• src/helpers/linklist.c (modified) (1 diff)
• src/helpers/nls.c (modified) (1 diff)
• strrpl.exe (added)

trunk/include/helpers/dialog.h

@@ -62 +62 @@
 
     #define SZL_AUTOSIZE                (-1)
+    #define SZL_LARGEST_ROW_WIDTH       (-2)
 
     #define CTL_COMMON_FONT             ((PCSZ)-1)
@@ -106 +107 @@
                 // proposed size; a number of special flags are
                 // available (per cx, cy field):
-                // -- SZL_AUTOSIZE: determine size automatically.
+                // -- SZL_AUTOSIZE (-1): determine size automatically.
                 //    Works only for statics with SS_TEXT and
                 //    SS_BITMAP.
+                // -- Any other _negative_ value is considered a
+                //    percentage of the largest row width in the
+                //    table. For example, -50 would mean 50% of
+                //    the largest row in the table. This is valid
+                //    for the CX field only.
                 // This field is IGNORED if the CONTROLDEF appears
                 // with a START_NEW_TABLE type in _DLGHITEM.
@@ -190 +196 @@
     #define COMMON_SPACING          3
 
-    #define CONTROLDEF_GROUP(pcsz, id) { WC_STATIC, pcsz, \
+    #define CONTROLDEF_GROUP(pcsz, id, cx, cy) { WC_STATIC, pcsz, \
             WS_VISIBLE | SS_GROUPBOX | DT_MNEMONIC, \
-            id, CTL_COMMON_FONT, 0, { -1, -1 }, 0 }
+            id, CTL_COMMON_FONT, 0, { cx, cy }, 0 }
 
     #define CONTROLDEF_TEXT(pcsz, id, cx, cy) { WC_STATIC, pcsz, \

trunk/include/helpers/exeh.h

@@ -1165 +1165 @@
         // returned by exehOpen):
         ULONG           ulExeFormat;
+#endif
                     #define EXEFORMAT_OLDDOS        1
                     #define EXEFORMAT_NE            2
@@ -1173 +1174 @@
                     #define EXEFORMAT_COM           7       // added V0.9.16 (2002-01-04) [umoeller]
 
+#ifndef __STRIP_DOWN_EXECUTABLE__
         BOOL            fLibrary,           // TRUE if this is a DLL
                                             // (works for NE, LX, PE)
@@ -1179 +1181 @@
 
         ULONG           ulOS;
+#endif
                 // target operating system as flagged in one of
                 // the EXE headers; one of:
@@ -1198 +1201 @@
                                 // if PE optional header was successfully read
 
+#ifndef __STRIP_DOWN_EXECUTABLE__
         // The following fields are only set after
         // an extra call to exehQueryBldLevel (NE and LX only):

trunk/readme.txt

@@ -1 +1 @@
 XWP Helpers 0.9.7 README
 (W) Ulrich M”ller, October 26, 2000
-Last updated July 5, 2001, Ulrich M”ller
+Last updated Feb 03, 2002 Ulrich M”ller
 
 
@@ -9 +9 @@
     1. LICENSE, COPYRIGHT, DISCLAIMER
     2. INTRODUCTION
-    3. CREATING CODE DOCUMENTATION
-    4. COMPILING
-    5. INCLUDING HEADER FILES
+    3. EXECUTABLE TOOLS
+    4. CREATING CODE DOCUMENTATION
+    5. COMPILING
+    6. INCLUDING HEADER FILES
 
 
@@ -96 +97 @@
 
 
-3. CREATING CODE DOCUMENTATION
+3. EXECUTABLE TOOLS
+===================
+
+    The root directory of this repository contains a few executables
+    in binary form that are used by XWorkplace and WarpIN.
+
+
+    --  FastDep.exe was written by Knut Stange Osmundsen (taken from
+        the Odin sources) and is used by the "nmake dep" facility
+        of both WarpIN and XWorkplace. This scans C source files
+        and writes dependencies for the makefiles automatically.
+
+    --  h2i.exe was written by me (the sources are in the xwphelpers
+        repository, in the "tools" directory) to translate a bunch
+        of HTML files to IPF.
+
+    --  strrpl.exe was written by me (the sources are in the warpin
+        repository, in the "tools" directory) to replace strings in
+        text files.
+
+    --  xdoc.exe was written by me (the sources are in the warpin
+        repository, in the "tools" directory) to extract documentation
+        from C source files directory. See "Creating code documentation"
+        below.
+
+
+4. CREATING CODE DOCUMENTATION
 ==============================
 
@@ -112 +139 @@
 
 
-4. COMPILING
+5. COMPILING
 ============
 
@@ -157 +184 @@
 
 
-5. INCLUDING HEADER FILES
+6. INCLUDING HEADER FILES
 =========================
 

trunk/src/helpers/dialog.c

@@ -317 +317 @@
         {
             RECTL rcl = {0, 0, 0, 0};
-            if (pControlDef->szlControlProposed.cx != -1)
+            if (pControlDef->szlControlProposed.cx > 0)
                 rcl.xRight = pControlDef->szlControlProposed.cx;   // V0.9.12 (2001-05-31) [umoeller]
             else
                 rcl.xRight = winhQueryScreenCX() * 2 / 3;
-            if (pControlDef->szlControlProposed.cy != -1)
+            if (pControlDef->szlControlProposed.cy > 0)
                 rcl.yTop = pControlDef->szlControlProposed.cy;   // V0.9.12 (2001-05-31) [umoeller]
             else
@@ -451 +451 @@
  *@@changed V0.9.16 (2001-10-15) [umoeller]: fixed ugly group table spacings
  *@@changed V0.9.16 (2001-10-15) [umoeller]: added APIRET
+ *@@changed V0.9.16 (2002-02-02) [umoeller]: added support for explicit group size
  */
 
@@ -476 +477 @@
             if (pTableDef->pCtlDef)
             {
-                // yes: make this wider
+                // yes:
+
+                // check if maybe an explicit size was specified
+                // for the group; if that is larger than what
+                // we've calculated above, use it instead
+                if (pTableDef->pCtlDef->szlControlProposed.cx > pColumnDef->cpControl.cx)
+                        // should be -1 for auto-size
+                    pColumnDef->cpControl.cx = pTableDef->pCtlDef->szlControlProposed.cx;
+
+                if (pTableDef->pCtlDef->szlControlProposed.cy > pColumnDef->cpControl.cy)
+                        // should be -1 for auto-size
+                    pColumnDef->cpControl.cy = pTableDef->pCtlDef->szlControlProposed.cy;
+
+                // in any case, make this wider
                 ulXSpacing =    2 * PM_GROUP_SPACING_X;
                 ulYSpacing =    // 3 * PM_GROUP_SPACING_X;
@@ -490 +504 @@
         SIZEL       szlAuto;
 
-        if (    (pszl->cx == -1)
-             || (pszl->cy == -1)
+        if (    (pszl->cx < -1)
+             && (pszl->cx >= -100)
            )
+        {
+            // other negative CX value:
+            // this is then a percentage of the row width... ignore for now
+            // V0.9.16 (2002-02-02) [umoeller]
+            szlAuto.cx = 0;
+            szlAuto.cy = 0;
+        }
+        else if (    (pszl->cx == -1)
+                  || (pszl->cy == -1)
+                )
         {
             arc = CalcAutoSize(pControlDef,
@@ -501 +525 @@
         if (!arc)
         {
-            if (pszl->cx == -1)
+            if (pszl->cx < 0)
                 pColumnDef->cpControl.cx = szlAuto.cx;
             else
                 pColumnDef->cpControl.cx = pszl->cx;
 
-            if (pszl->cy == -1)
+            if (pszl->cy < 0)
                 pColumnDef->cpControl.cy = szlAuto.cy;
             else
@@ -1098 +1122 @@
             if (ProcessMode == PROCESS_CALC_SIZES)
             {
+                // all sizes have now been computed:
                 pszlClient->cx += pTableDefThis->cpTable.cx;
                 pszlClient->cy += pTableDefThis->cpTable.cy;

trunk/src/helpers/linklist.c

@@ -961 +961 @@
  *      sort function pfnSort, which works similar to those of the
  *      container sorts, i.e. it must be declared as a
- +          SHORT fnSort(void* pItem1, void* pItem1, void* pStorage)
+ +          SHORT fnSort(void* pItem1, void* pItem2, void* pStorage)
  *
  *      These sort functions need to return the following:

trunk/src/helpers/nls.c

@@ -459 +459 @@
  *
  *      This uses DosMapCase with the default system country
- *      code and the process's codepage.
+ *      code and the process's codepage. WARNING: DosMapCase
+ *      is a 16-bit API and therefore quite slow. Use this
+ *      with care.
  *
  *@@added V0.9.16 (2001-10-25) [umoeller]