Changeset 253

Timestamp:

Jul 4, 2003, 4:12:24 PM (22 years ago)

Author:

umoeller

Message:

Misc fixes, plus those from jsmall

Location:

trunk

Files:

• include/helpers/call_file_dlg.c (modified) (2 diffs)
• include/helpers/dosh.h (modified) (1 diff)
• src/cppbase/bs_config.cpp (modified) (2 diffs)
• src/helpers/dosh.c (modified) (3 diffs)

trunk/include/helpers/call_file_dlg.c

@@ -21 +21 @@
  *
  *@@added V0.9.19 (2002-04-24) [umoeller]
+ *@@changed V1.0.2 (2003-03-07) [umoeller]: HWND_DESKTOP owner causes focus problems, fixed
  */
 
@@ -166 +167 @@
                     memset((PBYTE)pfdShared, 0, cbShared);
 
+                    // fix HWND_DESKTOP owner V1.0.2 (2003-03-07) [umoeller]
+                    if (hwndOwner == HWND_DESKTOP)
+                        hwndOwner = NULLHANDLE;
+
                     // copy owner window
                     pfdShared->hwndOwner = hwndOwner;

trunk/include/helpers/dosh.h

@@ -731 +731 @@
     APIRET doshQuickStartSession(PCSZ pcszPath,
                                  PCSZ pcszParams,
+                                 USHORT usSessionType,
                                  BOOL fForeground,
                                  USHORT usPgmCtl,

trunk/src/cppbase/bs_config.cpp

@@ -85 +85 @@
     // as unsigned char
 
+#define INCL_DOSSESMGR
 #define INCL_DOSSEMAPHORES
 #define INCL_DOSERRORS
@@ -2292 +2293 @@
     if (_arc = doshQuickStartSession("cmd.exe",
                                      (PSZ)strParams.c_str(),
+                                     SSF_TYPE_DEFAULT,            // session type
                                      FALSE,   // foreground
                                      0,       // auto-close, visible

trunk/src/helpers/dosh.c

@@ -4610 +4610 @@
  *@@changed V0.9.14 (2001-08-03) [umoeller]: fixed potential queue leak
  *@@changed V0.9.14 (2001-08-03) [umoeller]: fixed memory leak in wait mode; added pusReturn to prototype
- */
-
-APIRET doshQuickStartSession(PCSZ pcszPath,       // in: program to start
-                             PCSZ pcszParams,     // in: parameters for program
-                             BOOL fForeground,  // in: if TRUE, session will be in foreground
-                             USHORT usPgmCtl,   // in: STARTDATA.PgmControl
-                             BOOL fWait,        // in: wait for termination?
-                             PULONG pulSID,     // out: session ID (req.)
-                             PPID ppid,         // out: process ID (req.)
-                             PUSHORT pusReturn) // out: in wait mode, session's return code (ptr can be NULL)
+ *@@changed V1.0.2  (2003-02-04) [jsmall  ]: inserted new 3rd parameter for session type
+ *@@changed V1.0.2  (2003-02-04) [jsmall  ]: changed code so when fWait = FALSE then session is started as independent, not as a child
+ */
+
+APIRET doshQuickStartSession(PCSZ pcszPath,         // in: program to start
+                             PCSZ pcszParams,       // in: parameters for program
+                             USHORT usSessionType,  // in: session type
+                             BOOL fForeground,      // in: if TRUE, session will be in foreground
+                             USHORT usPgmCtl,       // in: STARTDATA.PgmControl
+                             BOOL fWait,            // in: wait for termination?
+                             PULONG pulSID,         // out: session ID (req.)
+                             PPID ppid,             // out: process ID (req.)
+                             PUSHORT pusReturn)     // out: in wait mode, session's return code (ptr can be NULL)
 {
     APIRET      arc = NO_ERROR;
@@ -4641 +4644 @@
 
         SData.Length  = sizeof(STARTDATA);
-        SData.Related = SSF_RELATED_CHILD; //INDEPENDENT;
+//      SData.Related = SSF_RELATED_CHILD; //INDEPENDENT;
+        SData.Related = (fWait) ? SSF_RELATED_CHILD : SSF_RELATED_INDEPENDENT;
+                // V1.0.2 (2003-02-04) [jsmall]
         SData.FgBg    = (fForeground) ? SSF_FGBG_FORE : SSF_FGBG_BACK;
                 // V0.9.3 (2000-05-03) [umoeller]
@@ -4653 +4658 @@
         SData.Environment = 0;
         SData.InheritOpt = SSF_INHERTOPT_PARENT;
-        SData.SessionType = SSF_TYPE_DEFAULT;
+//      SData.SessionType = SSF_TYPE_DEFAULT;
+        SData.SessionType = usSessionType;    // V1.0.2 (2003-02-04)  [jsmall]
         SData.IconFile = 0;
         SData.PgmHandle = 0;