Changeset 300 for branches

Timestamp:

Oct 17, 2005, 9:05:11 PM (20 years ago)

Author:

pr

Message:

Bart's fixes for bug 31

Location:

branches/branch-1-0

Files:

• include/helpers/dosh.h (modified) (1 diff)
• include/helpers/syssound.h (modified) (1 diff)
• src/helpers/dosh.c (modified) (3 diffs)
• src/helpers/syssound.c (modified) (2 diffs)

branches/branch-1-0/include/helpers/dosh.h

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

branches/branch-1-0/include/helpers/syssound.h

@@ -37 +37 @@
      *
      ********************************************************************/
+
+    /* Undocumented WinAlarm Values to reflect changes to sound settings right away */
+    #define WA_TEST                997
+    #define WA_ENABLESOUNDS        998
+    #define WA_APPLYVOLUMETOALL    999
+    #define WA_FILECHANGED        1000
 
     /* keys for accessing sounds in MMPM.INI */

branches/branch-1-0/src/helpers/dosh.c

@@ -4308 +4308 @@
  *@@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
+ *@@changed V1.0.4  (2005-10-16) [jsmall  ]: inserted new 3rd parameter for session type
+ *@@changed V1.0.4  (2005-10-16) [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
@@ -4339 +4342 @@
 
         SData.Length  = sizeof(STARTDATA);
-        SData.Related = SSF_RELATED_CHILD; //INDEPENDENT;
+        SData.Related = (fWait) ? SSF_RELATED_CHILD : SSF_RELATED_INDEPENDENT;
+                // V1.0.4 (2005-10-16) [jsmall]
         SData.FgBg    = (fForeground) ? SSF_FGBG_FORE : SSF_FGBG_BACK;
                 // V0.9.3 (2000-05-03) [umoeller]
@@ -4351 +4355 @@
         SData.Environment = 0;
         SData.InheritOpt = SSF_INHERTOPT_PARENT;
-        SData.SessionType = SSF_TYPE_DEFAULT;
+        SData.SessionType = usSessionType;    // V1.0.4 (2005-10-16)  [jsmall]
         SData.IconFile = 0;
         SData.PgmHandle = 0;

branches/branch-1-0/src/helpers/syssound.c

@@ -380 +380 @@
             // this is done by calling WinAlarm with 1000+index!
             // sick stuff..
-            WinAlarm(HWND_DESKTOP, usIndex+1000); // V0.9.6 (2000-10-16) [umoeller]
+            WinAlarm(HWND_DESKTOP, WA_FILECHANGED + usIndex); // V0.9.6 (2000-10-16) [umoeller]
 
     return brc;
@@ -701 +701 @@
                                 // notify MMPM/2 of the change... see sndWriteSoundData
                                 // V0.9.6 (2000-10-16) [umoeller]
-                                WinAlarm(HWND_DESKTOP, usIndex+1000);
+                                WinAlarm(HWND_DESKTOP, WA_FILECHANGED + usIndex);
                         }
                     }