Changeset 122

Timestamp:

Dec 8, 2001, 11:14:27 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

Location:

trunk

Files:

• include/helpers/stringh.h (modified) (1 diff)
• src/helpers/apps.c (modified) (7 diffs)
• src/helpers/comctl.c (modified) (2 diffs)
• src/helpers/dialog.c (modified) (6 diffs)
• src/helpers/dosh.c (modified) (4 diffs)
• src/helpers/stringh.c (modified) (1 diff)

trunk/include/helpers/stringh.h

@@ -32 +32 @@
     #define STRINGH_HEADER_INCLUDED
 
+    VOID XWPENTRY strhStore(PSZ *ppszTarget, PCSZ pcszSource, PULONG pulLength);
+
     PSZ XWPENTRY strhcpy(PSZ string1, const char *string2);
 

trunk/src/helpers/apps.c

@@ -782 +782 @@
  *
  *      -- starting ".CMD" and ".BAT" files as
- *         PROGDETAILS.pszExecutable.
+ *         PROGDETAILS.pszExecutable;
+ *
+ *      -- starting apps which are not fully qualified
+ *         and therefore assumed to be on the PATH.
  *
  *      Unless it is "*", PROGDETAILS.pszExecutable must
@@ -814 +817 @@
  *      -- To start a session minimized, set SWP_MINIMIZE.
  *
- *      -- To start a VIO session auto-close disabled, set
- *         the half-documented SWP_NOAUTOCLOSE flag (0x8000)
+ *      -- To start a VIO session with auto-close disabled,
+ *         set the half-documented SWP_NOAUTOCLOSE flag (0x8000)
  *         This flag is now in the newer toolkit headers.
  *
@@ -843 +846 @@
  *          WinStartApp completely hangs the session manager
  *          if a Win-OS/2 full-screen session is started from
- *          a thread that is NOT thread1, this will fail
- *          with an error for safety (V0.9.16).
+ *          a thread that is NOT thread 1, this will now fail
+ *          with this error for safety (V0.9.16).
  *
  *      --  ERROR_INVALID_PARAMETER: pcProgDetails or
@@ -866 +869 @@
  *@@changed V0.9.16 (2001-10-19) [umoeller]: added prototype to return APIRET
  *@@changed V0.9.16 (2001-10-19) [umoeller]: added thread-1 check
+ *@@changed V0.9.16 (2001-12-06) [umoeller]: now using doshSearchPath for finding pszExecutable if not qualified
  */
 
@@ -886 +890 @@
     // all this only makes sense if this contains something...
     // besides, this crashed on string comparisons V0.9.9 (2001-01-27) [umoeller]
-    if (!ProgDetails.pszExecutable)
+    if (    (!ProgDetails.pszExecutable)
+         || (!(*(ProgDetails.pszExecutable)))
+       )
         arc = ERROR_INVALID_PARAMETER;
     else if (doshMyTID() != 1)          // V0.9.16 (2001-10-19) [umoeller]
@@ -893 +899 @@
     {
         ULONG           ulIsWinApp;
+
+        CHAR            szFQExecutable[CCHMAXPATH];
 
         XSTRING         strParamsPatched;
@@ -1010 +1018 @@
         else
         {
-            // now check if the executable is valid
-            // V0.9.16 (2001-10-19) [umoeller]
-            ULONG ulAttr;
-            _Pmpf(("  %d now, checking %s", arc, ProgDetails.pszExecutable));
-            if (!(arc = doshQueryPathAttr(ProgDetails.pszExecutable,
-                                          &ulAttr)))
-            {
-                // make sure startup dir is really a directory
-                if (ProgDetails.pszStartupDir)
+            // check if the executable is fully qualified; if so,
+            // check if the executable file exists
+            if (    (ProgDetails.pszExecutable[1] == ':')
+                 && (strchr(ProgDetails.pszExecutable, '\\'))
+               )
+            {
+                ULONG ulAttr;
+                if (!(arc = doshQueryPathAttr(ProgDetails.pszExecutable,
+                                              &ulAttr)))
                 {
-                    _Pmpf(("  checking %s", ProgDetails.pszStartupDir));
-                    if (!(arc = doshQueryPathAttr(ProgDetails.pszStartupDir,
-                                                  &ulAttr)))
-                        if (!(ulAttr & FILE_DIRECTORY))
-                            arc = ERROR_PATH_NOT_FOUND;
-                                        // @@todo
+                    // make sure startup dir is really a directory
+                    if (ProgDetails.pszStartupDir)
+                    {
+                        if (!(arc = doshQueryPathAttr(ProgDetails.pszStartupDir,
+                                                      &ulAttr)))
+                            if (!(ulAttr & FILE_DIRECTORY))
+                                arc = ERROR_PATH_NOT_FOUND;
+                    }
                 }
             }
-
-            _Pmpf(("  after checking %d", arc));
+            else
+            {
+                // _not_ fully qualified: look it up on the PATH then
+                // V0.9.16 (2001-12-06) [umoeller]
+                if (!(arc = doshSearchPath("PATH",
+                                           ProgDetails.pszExecutable,
+                                           szFQExecutable,
+                                           sizeof(szFQExecutable))))
+                    // alright, found it:
+                    ProgDetails.pszExecutable = szFQExecutable;
+            }
 
             if (!arc)

trunk/src/helpers/comctl.c

@@ -1291 +1291 @@
  *
  *@@added V0.9.1 (99-12-19) [umoeller]
+ *@@changed V0.9.16 (2001-12-08) [umoeller]: fixed empty entry field on tab key
  */
 
@@ -1373 +1374 @@
                 if (flReturned & HEFL_SETTEXT)
                     WinSetWindowText(hwndEdit, hkn.szDescription);
-                else
-                    WinSetWindowText(hwndEdit, "");
-
-                if (flReturned & HEFL_FORWARD2OWNER)
+                else if (flReturned & HEFL_FORWARD2OWNER)
                     WinPostMsg(hwndOwner,
                                WM_CHAR,
                                mp1, mp2);
+                else
+                    // fixed V0.9.16 (2001-12-06) [umoeller]:
+                    // do not clear the entry field if we had HEFL_FORWARD2OWNER
+                    WinSetWindowText(hwndEdit, "");
+
 
                 mrc = (MPARAM)TRUE; // WM_CHAR processed flag;

trunk/src/helpers/dialog.c

@@ -616 +616 @@
  *@@added V0.9.15 (2001-08-26) [umoeller]
  *@@changed V0.9.16 (2001-10-15) [umoeller]: fixed ugly group table spacings
+ *@@changed V0.9.16 (2001-12-08) [umoeller]: fixed entry field ES_MARGIN positioning
  */
 
@@ -701 +702 @@
             y -= 100;
             cy += 100;
+        }
+        // the stupid entry field resizes itself if it has
+        // the ES_MARGIN style, so correlate that too... dammit
+        // V0.9.16 (2001-12-08) [umoeller]
+        else if (    ((ULONG)pControlDef->pcszClass == 0xffff0006L)
+                  && (flStyle & ES_MARGIN)
+                )
+        {
+            LONG cxMargin = 3 * WinQuerySysValue(HWND_DESKTOP, SV_CXBORDER);
+            LONG cyMargin = 3 * WinQuerySysValue(HWND_DESKTOP, SV_CYBORDER);
+
+            x += cxMargin;
+            y += cxMargin;
         }
     }
@@ -1728 +1742 @@
  *@@changed V0.9.14 (2001-08-01) [umoeller]: fixed major memory leaks with nested tables
  *@@changed V0.9.14 (2001-08-21) [umoeller]: fixed default push button problems
+ *@@changed V0.9.16 (2001-12-06) [umoeller]: fixed bad owner if not direct desktop child
  */
 
@@ -1746 +1761 @@
     PDLGPRIVATE  pDlgData = NULL;
 
+    HWND        hwndDesktop = WinQueryDesktopWindow(NULLHANDLE, NULLHANDLE);
+                                        // works with a null HAB
+
     /*
      *  1) parse the table and create structures from it
@@ -1765 +1783 @@
             FRAMECDATA      fcData = {0};
             ULONG           flStyle = 0;
+            HWND            hwndOwnersParent;
 
             fcData.cb = sizeof(FRAMECDATA);
@@ -1780 +1799 @@
                 // V0.9.14 (2001-07-07) [umoeller]
                 hwndOwner = NULLHANDLE;
+
+            // now, make sure the owner window is child of
+            // HWND_DESKTOP... if it is not, we'll only disable
+            // some dumb child window, which is not sufficient
+            // V0.9.16 (2001-12-06) [umoeller]
+            while (    (hwndOwner)
+                    && (hwndOwnersParent = WinQueryWindow(hwndOwner, QW_PARENT))
+                    && (hwndOwnersParent != hwndDesktop)
+                  )
+                hwndOwner = hwndOwnersParent;
 
             if (!(pDlgData->hwndDlg = WinCreateWindow(HWND_DESKTOP,

trunk/src/helpers/dosh.c

@@ -1837 +1837 @@
  *@@added V0.9.16 (2001-10-19) [umoeller]
  *@@changed V0.9.16 (2001-12-02) [umoeller]: added XOPEN_BINARY \r\n support
+ *@@changed V0.9.16 (2001-12-06) [umoeller]: added check for pFile != NULL
  */
 
@@ -1844 +1845 @@
 {
     APIRET arc = NO_ERROR;
-    if (!pcsz)
+    if ((!pFile) || (!pcsz))
         arc = ERROR_INVALID_PARAMETER;
     else
@@ -1930 +1931 @@
  *      The internal string buffer is limited to 2000
  *      characters. Length checking is _not_ performed.
+ *
+ *@@added V0.9.16 (2001-10-19) [umoeller]
+ *@@changed V0.9.16 (2001-12-06) [umoeller]: added check for pFile != NULL
  */
 
@@ -1936 +1940 @@
                          ...)
 {
-    APIRET arc;
-
-    DATETIME dt;
-    CHAR szTemp[2000];
-    ULONG   ulLength;
-
-    DosGetDateTime(&dt);
-    if (ulLength = sprintf(szTemp,
-                           "%04d-%02d-%02d %02d:%02d:%02d:%02d ",
-                           dt.year, dt.month, dt.day,
-                           dt.hours, dt.minutes, dt.seconds, dt.hundredths))
-    {
-        if (!(arc = doshWrite(pFile,
-                              szTemp,
-                              ulLength)))
+    APIRET arc = NO_ERROR;
+
+    if ((!pFile) || (!pcszFormat))
+        arc = ERROR_INVALID_PARAMETER;
+    else
+    {
+        DATETIME dt;
+        CHAR szTemp[2000];
+        ULONG   ulLength;
+
+        DosGetDateTime(&dt);
+        if (ulLength = sprintf(szTemp,
+                               "%04d-%02d-%02d %02d:%02d:%02d:%02d ",
+                               dt.year, dt.month, dt.day,
+                               dt.hours, dt.minutes, dt.seconds, dt.hundredths))
         {
-            va_list arg_ptr;
-            va_start(arg_ptr, pcszFormat);
-            ulLength = vsprintf(szTemp, pcszFormat, arg_ptr);
-            va_end(arg_ptr);
-
-            if (pFile->flOpenMode & XOPEN_BINARY)
-                // if we're in binary mode, we need to add \r too
-                szTemp[ulLength++] = '\r';
-            szTemp[ulLength++] = '\n';
-
-            arc = doshWrite(pFile,
-                            (PCSZ)szTemp,
-                            ulLength);
+            if (!(arc = doshWrite(pFile,
+                                  szTemp,
+                                  ulLength)))
+            {
+                va_list arg_ptr;
+                va_start(arg_ptr, pcszFormat);
+                ulLength = vsprintf(szTemp, pcszFormat, arg_ptr);
+                va_end(arg_ptr);
+
+                if (pFile->flOpenMode & XOPEN_BINARY)
+                    // if we're in binary mode, we need to add \r too
+                    szTemp[ulLength++] = '\r';
+                szTemp[ulLength++] = '\n';
+
+                arc = doshWrite(pFile,
+                                (PCSZ)szTemp,
+                                ulLength);
+            }
         }
     }

trunk/src/helpers/stringh.c

@@ -67 +67 @@
  *      See stringh.c.
  */
+
+/*
+ *@@ strhStore:
+ *      stores a copy of the given string in the specified
+ *      buffer. Uses strdup internally.
+ *
+ *      If *ppszTarget != NULL, the previous string is freed
+ *      and set to NULL.
+ *      If pcszSource != NULL, a copy of it is stored in the
+ *      buffer.
+ *
+ *@@added V0.9.16 (2001-12-06) [umoeller]
+ */
+
+VOID strhStore(PSZ *ppszTarget,
+               PCSZ pcszSource,
+               PULONG pulLength)        // out: length of new string (ptr can be NULL)
+{
+    ULONG ulLength = 0;
+
+    if (ppszTarget)
+    {
+        if (*ppszTarget)
+            free(*ppszTarget);
+
+        if (    (pcszSource)
+             && (ulLength = strlen(pcszSource))
+           )
+        {
+            if (*ppszTarget = (PSZ)malloc(ulLength + 1))
+                memcpy(*ppszTarget, pcszSource, ulLength + 1);
+        }
+        else
+            *ppszTarget = NULL;
+    }
+
+    if (pulLength)
+        *pulLength = ulLength;
+}
 
 /*