Changeset 829

Timestamp:

Sep 3, 2007, 4:48:29 AM (18 years ago)

Author:

Steven Levine

Message:

Update DosQProcStatus declarations for OpenWatcom compat
Layout KILL_FRAME to avoid text overlap

Location:

trunk/dll

Files:

• datamin.c (modified) (2 diffs)
• fm3res.dlg (modified) (1 diff)
• killproc.c (modified) (4 diffs)
• procstat.h (modified) (2 diffs)

trunk/dll/datamin.c

@@ -807 +807 @@
         APIRET rc;
 
-        rc = DosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
+        rc = DosAllocMem((PVOID)&pbh, USHRT_MAX + 4096,
                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
         if (rc)
@@ -813 +813 @@
                     GetPString(IDS_OUTOFMEMORY));
         else {
-          if (DosQProcStatus(pbh, USHRT_MAX))
+          if (DosQProcStatus((ULONG *)pbh, USHRT_MAX))
             noqproc = TRUE;
           else {

trunk/dll/fm3res.dlg

@@ -915 +915 @@
 DLGTEMPLATE KILL_FRAME LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "FM/2: Kill Process", KILL_FRAME, 12, 6, 239, 168, NOT
-            FS_DLGBORDER | WS_VISIBLE | NOT WS_SAVEBITS, FCF_SYSMENU |
-            FCF_TITLEBAR | FCF_MINBUTTON | FCF_MAXBUTTON | FCF_TASKLIST |
-            FCF_SIZEBORDER
-    BEGIN
-        LISTBOX         KILL_LISTBOX, 4, 33, 230, 124, LS_NOADJUSTPOS |
+    DIALOG  "FM/2: Kill Process", KILL_FRAME, 25, -48, 265, 203, NOT 
+            FS_DLGBORDER | WS_VISIBLE | NOT WS_SAVEBITS, FCF_SYSMENU | 
+            FCF_TITLEBAR | FCF_MINBUTTON | FCF_MAXBUTTON
+    BEGIN
+        LISTBOX         KILL_LISTBOX, 16, 58, 230, 124, LS_NOADJUSTPOS | 
                         LS_HORZSCROLL
                         PRESPARAMS PP_FONTNAMESIZE, "10.System Monospaced"
-        DEFPUSHBUTTON   "~Kill", DID_OK, 4, 4, 40, 14, BS_NOPOINTERFOCUS |
-                        WS_GROUP
-        PUSHBUTTON      "~Rescan", KILL_RESCAN, 100, 4, 40, 14,
-                        BS_NOPOINTERFOCUS
-        PUSHBUTTON      "~Help", IDM_HELP, 146, 4, 40, 14, BS_NOPOINTERFOCUS
-        PUSHBUTTON      "Cancel", DID_CANCEL, 194, 4, 40, 14,
-                        BS_NOPOINTERFOCUS
-        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
+        DEFPUSHBUTTON   "~Kill", COLR_BLACK, 14, 9, 40, 14, 
+                        BS_NOPOINTERFOCUS | WS_GROUP
+        PUSHBUTTON      "~Rescan", KILL_RESCAN, 110, 9, 40, 14, 
+                        BS_NOPOINTERFOCUS
+        PUSHBUTTON      "~Help", IDM_HELP, 156, 9, 40, 14, BS_NOPOINTERFOCUS
+        PUSHBUTTON      "Cancel", COLR_BLUE, 204, 9, 40, 14, 
+                        BS_NOPOINTERFOCUS
+        AUTOCHECKBOX    "~Use DosQProcStat 16 bit API (deprecated)", 
+                        KILL_CHECKBOX, 24, 29, 201, 10, WS_GROUP
+        AUTOCHECKBOX    "~Use DosQSysState 32 bit API  (preferred)", 
+                        KILL2_CHECKBOX, 24, 40, 201, 12
+        LTEXT           "PID: Name:", KILL_HDR, 18, 185, 86, 8, DT_VCENTER
                         PRESPARAMS PP_FONTNAMESIZE, "10.System Monospaced"
-        PUSHBUTTON      "Show", KILL_SHOW, 52, 4, 40, 14, BS_NOPOINTERFOCUS
+        PUSHBUTTON      "Show", KILL_SHOW, 62, 9, 40, 14, BS_NOPOINTERFOCUS
     END
 END

trunk/dll/killproc.c

@@ -17 +17 @@
   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
-
+  02 Sep 07 SHL Expand FillKillListThread2 stack to avoid exception in __TNK
 
 ***********************************************************************/
@@ -95 +95 @@
               GetPString(IDS_OUTOFMEMORY));
   else {
-    rc = DosQProcStatus(pbh, USHRT_MAX);
+    rc = DosQProcStatus((ULONG *)pbh, USHRT_MAX);
     if (!rc) {
       ppi = pbh->ppi;
@@ -411 +411 @@
       if (fUseQProcStat) {
         if (_beginthread(FillKillListThread2,
-                         NULL, 65536, (PVOID) & hwnd) != -1)
-          DosSleep(100);//05 Aug 07 GKY 250
+                         NULL, 65536 + 8192, (PVOID)&hwnd) != -1)
+          DosSleep(100);                // 05 Aug 07 GKY 250
         else
             WinDismissDlg(hwnd, 0);
@@ -425 +425 @@
         if (_beginthread(FillKillListThread,
                          NULL, 65536, (PVOID) & hwnd) != -1)
-          DosSleep(100); //05 Aug 07 GKY 250
+          DosSleep(100);                // 05 Aug 07 GKY 250
         else
           WinDismissDlg(hwnd, 0);

trunk/dll/procstat.h

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  Define DosQProcStatus interface
+
+  02 Sep 07 SHL Update for OpenWatcom
+
+***********************************************************************/
+
 /**********************************************************************
  * MODULE NAME :  procstat.h             AUTHOR:  Rick Fishman        *
@@ -17 +28 @@
  **********************************************************************/
 
+#if defined(__WATCOMC__)
+APIRET16 APIENTRY16 DosQProcStatus(ULONG *pBuf, USHORT cbBuf);
+#endif
+
+#if defined(__IBMC__)
 #pragma linkage( DosQProcStatus, far16 pascal )
 USHORT DosQProcStatus(PVOID pvBuf, USHORT cbBuf);
+#endif
 
 #define PROCESS_END_INDICATOR   3       // Indicates end of process structs