Changeset 828

Timestamp:

Sep 3, 2007, 4:02:12 AM (18 years ago)

Author:

Gregg Young

Message:

Add DosQuerySysState as option for getting process info for kill process and Datamin

Location:

trunk/dll

Files:

• datamin.c (modified) (3 diffs)
• fm3dlg.h (modified) (1 diff)
• fm3dll.def (modified) (1 diff)
• fm3dll.h (modified) (1 diff)
• fm3res.dlg (modified) (1 diff)
• init.c (modified) (1 diff)
• killproc.c (modified) (7 diffs)

trunk/dll/datamin.c

@@ -20 +20 @@
   30 Mar 07 GKY Remove GetPString for window class names
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  02 Sep 07 GKY Replaced DosQProcStatus with DosQuerySysState to fix trap in thunk code
 
 ***********************************************************************/
@@ -796 +797 @@
   case UM_SETUP5:                       // Process status
     {
-      CHAR s[134], tm[38], szQty[38];
-
-      if (fUseQProcStat && !noqproc) {
+     CHAR s[134], tm[38], szQty[38];
+
+     if (fUseQProcStat && !noqproc) {
 
         PROCESSINFO *ppi;
@@ -837 +838 @@
         }
       }
+      else if (fUseQSysState && !noqproc) {
+
+        QSPREC *ppi;
+        QSPTRREC *pbh = NULL;
+        QSLREC *pmi;
+        ULONG numprocs = 0, numthreads = 0;
+        APIRET rc;
+
+        rc = DosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
+                         PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+        if (rc)
+          Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,
+                    GetPString(IDS_OUTOFMEMORY));
+        else { //2 Sep 07 GKY 0x05 = process & Mod data only
+          if (DosQuerySysState(QS_PROCESS | QS_MTE, 0, 0, 0, pbh, USHRT_MAX))
+            noqproc = TRUE;
+          else {
+            ppi = pbh->pProcRec;
+            while (ppi->RecType == 1) {
+              pmi = pbh->pLibRec;
+              while (pmi && ppi->hMte != pmi->hmte)
+                pmi = pmi->pNextRec;
+              if (pmi) {
+                numprocs++;
+                numthreads += ppi->cTCB;
+              }
+              ppi = (QSPREC *) (ppi->pThrdRec + ppi->cTCB);
+            }
+            commafmt(szQty, sizeof(szQty), numprocs);
+            commafmt(tm, sizeof(tm), numthreads);
+            sprintf(s,
+                    " %s%s  %s%s",
+                    GetPString(IDS_PROCSTITLETEXT),
+                    szQty, GetPString(IDS_THRDSTITLETEXT), tm);
+            WinSetDlgItemText(hwnd, MINI_PROC, s);
+          }
+          DosFreeMem(pbh);
+        }
+      }
       else {
         commafmt(szQty, sizeof(szQty),

trunk/dll/fm3dlg.h

@@ -521 +521 @@
 #define KILL_SHOW                                                                                       23104
 #define KILL_HDR                                                                                                23105
+#define KILL2_CHECKBOX                                                                  23106
 
 #define UNDEL_FRAME                                                                             23200

trunk/dll/fm3dll.def

@@ -11 +11 @@
 
 import DOSQPROCSTATUS DOSCALLS.154
+#       DOSQUERYSYSSTATE DOSCALLS.368
 
 export    InitFM3DLL_                                 .1,

trunk/dll/fm3dll.h

@@ -1371 +1371 @@
   fNoIconsFiles, fNoIconsDirs, fVerify, fDCOpens,
   fLinkSetsIcon, fSaveState, fTextTools, fCopyDefault,
-  fToolTitles, fLogFile, fRealIdle, fNoSaveState,
+  fToolTitles, fLogFile, fRealIdle, fNoSaveState, fUseQSysState,
   fSplitStatus, fArcStuffVisible, fUseMCI, fAmAV2,
   fNoTreeGap, fDummy, fVTreeOpensWPS, fUseQProcStat,

trunk/dll/fm3res.dlg

@@ -930 +930 @@
         PUSHBUTTON      "Cancel", DID_CANCEL, 194, 4, 40, 14,
                         BS_NOPOINTERFOCUS
-        AUTOCHECKBOX    "~Use undocumented DosQProcStat API", KILL_CHECKBOX,
-                        30, 20, 178, 10
+        AUTOCHECKBOX    "~Use DosQProcStat 16 bit API (thunk)", KILL_CHECKBOX,
+                        20, 20, 118, 10, WS_GROUP
+        AUTOCHECKBOX    "~Use DosQSysState 32 bit API ", KILL2_CHECKBOX,
+                        140, 20, 108, 10
         LTEXT           "PID: Name:", KILL_HDR, 6, 156, 86, 8, DT_VCENTER
                         PRESPARAMS PP_FONTNAMESIZE, "10.System Monospaced"

trunk/dll/init.c

@@ -1056 +1056 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "UseQProcStat",
-                      &fUseQProcStat, &size);
+                      &fUseQProcStat, &size);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, FM3Str, "UseQSysState",
+                      &fUseQSysState, &size);
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "DataMin", &fDataMin, &size);

trunk/dll/killproc.c

@@ -16 +16 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  02 Sep 07 GKY Replaced DosQProcStatus with DosQuerySysState to fix trap in thunk code
 
 
@@ -33 +34 @@
 #include <limits.h>
 
-#include "procstat.h"
 #include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
+#include "procstat.h"
 
 #pragma data_seg(DATA2)
@@ -134 +135 @@
 }
 
+static VOID FillKillListThread3(VOID * arg)
+{
+  HWND hwnd = *(HWND *) arg;
+  CHAR s[1036];
+  HAB thab;
+  HMQ thmq;
+  INT rc;
+  QSPREC *ppi;
+  QSPTRREC *pbh;
+  QSLREC *pmi;
+
+  thab = WinInitialize(0);
+  thmq = WinCreateMsgQueue(thab, 0);
+  WinCancelShutdown(thmq, TRUE);
+  IncrThreadUsage();
+
+  WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
+  rc = DosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
+                   PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
+  if (rc)
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_OUTOFMEMORY));
+  else {
+    rc = DosQuerySysState(QS_PROCESS | QS_MTE, 0, 0, 0, pbh, USHRT_MAX);
+    if (!rc) {
+      ppi = pbh->pProcRec;
+      while (ppi->RecType == 1) {
+        if (ppi->pid != mypid) {
+          pmi = pbh->pLibRec;
+          while (pmi && ppi->hMte != pmi->hmte)
+            pmi = pmi->pNextRec;
+          if (pmi) {
+            sprintf(s, "%04x ", ppi->pid);
+            if (!stricmp((CHAR *) pmi->pName, "SYSINIT"))
+              GetDosPgmName(ppi->pid, s + strlen(s));
+            else {
+              if (*pmi->pName)
+                strcat(s, (CHAR *) pmi->pName);
+              else
+                strcat(s, GetPString(IDS_UNKNOWNPROCTEXT));
+            }
+            if (WinIsWindow(thab, hwnd)) {
+              WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_INSERTITEM,
+                                MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                                MPFROMP(s));
+            }
+            else
+              break;
+          }
+        }
+        ppi = (QSPREC *) (ppi->pThrdRec + ppi->cTCB);
+      }                                 // while
+    }
+    DosFreeMem(pbh);
+  }
+
+  if (WinIsWindow(thab, hwnd))
+    PostMsg(hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID);
+  WinDestroyMsgQueue(thmq);
+  DecrThreadUsage();
+  WinTerminate(thab);
+}
+
 static VOID FillKillListThread(VOID * arg)
 {
@@ -241 +305 @@
     WinDefDlgProc(hwnd, WM_SETICON, MPFROMLONG(hptrIcon), MPVOID);
     WinCheckButton(hwnd, KILL_CHECKBOX, fUseQProcStat);
+    WinCheckButton(hwnd, KILL2_CHECKBOX, fUseQSysState);
+    if (WinQueryButtonCheckstate(hwnd, KILL2_CHECKBOX)) {
+      WinCheckButton(hwnd, KILL_CHECKBOX, FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, KILL_CHECKBOX), FALSE);
+    }
+    if (WinQueryButtonCheckstate(hwnd, KILL_CHECKBOX)) {
+      WinCheckButton(hwnd, KILL2_CHECKBOX, FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, KILL2_CHECKBOX), FALSE);
+    }
     PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(KILL_RESCAN, 0), MPVOID);
     break;
@@ -267 +340 @@
       PrfWriteProfileData(fmprof,
                           FM3Str,
-                          "UseQProcStat", &fUseQProcStat, sizeof(BOOL));
+                          "UseQProcStat", &fUseQProcStat, sizeof(BOOL));
       PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(KILL_RESCAN, 0), MPVOID);
+      if (WinQueryButtonCheckstate(hwnd, KILL_CHECKBOX)) {
+        WinCheckButton(hwnd, KILL2_CHECKBOX, FALSE);
+        WinEnableWindow(WinWindowFromID(hwnd, KILL2_CHECKBOX), FALSE);
+      }
+      else
+        WinEnableWindow(WinWindowFromID(hwnd, KILL2_CHECKBOX), TRUE);
+      break;
+    case KILL2_CHECKBOX:
+      fUseQSysState = WinQueryButtonCheckstate(hwnd, KILL2_CHECKBOX);
+      PrfWriteProfileData(fmprof,
+                          FM3Str,
+                          "UseQSysState", &fUseQSysState, sizeof(BOOL));
+      PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(KILL_RESCAN, 0), MPVOID);
+      if (WinQueryButtonCheckstate(hwnd, KILL2_CHECKBOX)) {
+        WinCheckButton(hwnd, KILL_CHECKBOX, FALSE);
+        WinEnableWindow(WinWindowFromID(hwnd, KILL_CHECKBOX), FALSE);
+      }
+      else
+        WinEnableWindow(WinWindowFromID(hwnd, KILL_CHECKBOX), TRUE);
       break;
 
@@ -322 +414 @@
           DosSleep(100);//05 Aug 07 GKY 250
         else
-          WinDismissDlg(hwnd, 0);
-      }
+            WinDismissDlg(hwnd, 0);
+      }
+      else if (fUseQSysState)
+        if (_beginthread(FillKillListThread3,
+                         NULL, 65536, (PVOID) & hwnd) != -1)
+          DosSleep(100);//05 Aug 07 GKY 250
+        else
+            WinDismissDlg(hwnd, 0);
       else {
         if (_beginthread(FillKillListThread,
@@ -408 +506 @@
 
 #pragma alloc_text(KILLPROC,FillKillListThread,FillKillListThread2,GetDosPgmName,KillDlgProc)
+#pragma alloc_text(KILLPROC,FillKillListThread)