Changeset 92

Timestamp:

Aug 6, 2017, 9:59:15 PM (8 years ago)

Author:

Gregg Young

Message:

Include pmprintf Ticket #22

Location:

trunk

Files:

• common.c (modified) (5 diffs)
• eastring.c (modified) (1 diff)
• fspopup.c (modified) (5 diffs)
• h/lswitch.h (modified) (1 diff)
• hook/lswhook.c (modified) (1 diff)
• lswmain.c (modified) (1 diff)
• object.c (modified) (1 diff)
• pmpopup.c (modified) (1 diff)
• settings.c (modified) (5 diffs)
• taskbar.c (modified) (4 diffs)
• widget/lswidget.c (modified) (1 diff)

trunk/common.c ¶

@@ -26 +26 @@
 #include "eastring.h"
 #include "object.h"
-//#define  __PMPRINTF__
-//#include "PMPRINTF.H"
 
 #ifdef XWORKPLACE
@@ -47 +45 @@
     CHAR s[100];
 
-// usFunc is 0 for app initialization, 1 and for widget phases 1 and 2 initialization
-    //PmPrintfDisplayInterfaceVersionInfo();
-    //PmPrintfQueueNameThisProcess(NULL);
-    
+    // usFunc is 0 for app initialization, 1 and for widget phases 1 and 2 initialization
+#ifdef  __PMPRINTF__
+    PmPrintfDisplayInterfaceVersionInfo();
+    PmPrintfQueueNameThisProcess(NULL);
+#endif
     if (usFunc != 1)
         DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, +31, 0);
@@ -105 +104 @@
 
         GetIniFileName(ucFName, sizeof(ucFName));
-        //Pmpf(("INI filenaame \"%s\"", ucFName));
         if (LoadSettings(hab, ucFName, &plswData->Settings) != 0)
             rc1 = LSWERRCANTLOADSETTINGS;
@@ -261 +259 @@
         APIRET rc;
 
-        //DebugHereIAm();
         DosRequestMutexSem(plswData->htmxFSMonDispatRunning, SEM_INDEFINITE_WAIT);
-        //DebugHereIAm();
 
         WinDeleteAtom(hatomtblAtomTbl,
@@ -295 +291 @@
 
     if (usFunc != 1) {
-        //DebugHereIAm();
         DosRequestMutexSem(plswData->htmxFSMonDispatRunning, SEM_INDEFINITE_WAIT );
         DosFreeMem(plswData);

trunk/eastring.c ¶

@@ -10 +10 @@
 
 #include "EAString.h"
-#define  __PMPRINTF__
+//#define  __PMPRINTF__
 #include "PMPRINTF.H"
 

trunk/fspopup.c ¶

@@ -19 +19 @@
 #include <stdio.h>
 #include <process.h>
-#define  __PMPRINTF__
-#include "PMPRINTF.H"
 
 #ifndef XWORKPLACE
@@ -84 +82 @@
     LoadExceptq(&exRegRec, "", NULL);
 #endif
-    DebugHereIAm();
     plswData = (PLSWDATA) pParm;
 
@@ -103 +100 @@
     }
     rc = DosRequestMutexSem(plswData->htmxFSMonDispatRunning, SEM_INDEFINITE_WAIT );
-    PmpfF(("Mon RequestMSem %i", rc));
     while (DosWaitEventSem(plswData->hevRunning, 10L) == ERROR_TIMEOUT) {
         /* if we popup in PM reset the semaphore and post a triggering message;
@@ -163 +159 @@
     if (hmonKbd != 0)
         DosMonClose(hmonKbd);
-    DebugHereIAm();
     DosReleaseMutexSem(plswData->htmxFSMonDispatRunning);
 #ifndef XWORKPLACE
@@ -236 +231 @@
     for (;;) {
         usCount = sizeof(keybuf);
-        if (DosMonRead
-            ((PBYTE) & monInBuf, DCWW_WAIT, (PBYTE) & keybuf, &usCount))
+        if (DosMonRead((PBYTE) & monInBuf, DCWW_WAIT, (PBYTE) & keybuf, &usCount))
             break;
         DosMonWrite((PBYTE) & monOutBuf, (PBYTE) & keybuf, usCount);

trunk/h/lswitch.h ¶

@@ -34 +34 @@
 #include <stdlib.h>
 #include "api16.h"
+
+//#define  __PMPRINTF__
+#include "PMPRINTF.H"
 
 //#define XWORKPLACE

trunk/hook/lswhook.c ¶

@@ -20 +20 @@
 #include <string.h>
 #include <stdio.h>
-#define  __PMPRINTF__
-#include "PMPRINTF.H"
 
 /*

trunk/lswmain.c ¶

@@ -20 +20 @@
 #define INCL_LOADEXCEPTQ
 #include "exceptq.h"
-#define  __PMPRINTF__
-#include "PMPRINTF.H"
 
 VOID main()

trunk/object.c ¶

@@ -12 +12 @@
 
 #include "object.h"
-#define  __PMPRINTF__
+//#define  __PMPRINTF__
 #include "PMPRINTF.H"
 

trunk/pmpopup.c ¶

@@ -29 +29 @@
 #include <unikbd.h>
 #endif
-#define  __PMPRINTF__
-#include "PMPRINTF.H"
 
 /* we subclass the window procedure of the popup window frame */

trunk/settings.c ¶

@@ -20 +20 @@
 #include "taskbar.h"
 #include "lswres.h"
-//#define  __PMPRINTF__
-//#include "PMPRINTF.H"
 
 #define BKM_SETNOTEBOOKBUTTONS   0x0375 /* Set common pushbuttons    */
@@ -144 +142 @@
     SKIPLIST *pSkipList;
 
-    //PmpfF(("pszfilename %s", pszFName));
     if (strlen(pszFName) != 0) {
         if ((hini = PrfOpenProfile(hab, pszFName)) == NULLHANDLE) {
-            //DebugHereIAm();
             return 1;
         }
@@ -162 +158 @@
             return 3;
         rc = PrfQueryProfileData(hini, PRF_APPNAME, PRF_SETTINGS, pBuf, &ulCbBuf);
-        if (!rc)  {//        return 2;
+        if (!rc)  {
             rc = PrfQueryProfileData(HINI_USERPROFILE, PRF_APPNAME, PRF_SETTINGS, pBuf, &ulCbBuf);
             if (pszFName != NULL)
@@ -176 +172 @@
             }
         }
-        //DebugHereIAm();
         if (!bChangedINI) {
             ulIndex = sizeof(LSWSETTINGS) - 3 * sizeof(pSettings->SkipListPopup);
@@ -435 +430 @@
     }
     else
-        return 1; //hini = HINI_USERPROFILE;
+        return 1; 
     ulSize = sizeof(UCHAR);
     PrfWriteProfileData(hini, PRF_APPNAME, "VerMajor", &pSettings->ucVerMajor, ulSize);

trunk/taskbar.c ¶

@@ -23 +23 @@
 #include "lswres.h"
 #include "object.h"
-//#define  __PMPRINTF__
-//#include "PMPRINTF.H"
 
 #define PROCITEMHGT 6/5
@@ -1144 +1142 @@
             SWCNTRL swctlItem;
             SWP swpItem;
-            BOOL bIconOnly;
+            //BOOL bIconOnly;
             SHORT sId =
                 (SHORT) WinSendMsg(pbData->hwndSubWinMenu,
@@ -1185 +1183 @@
             plswData->Settings.bGroupItems = FALSE;
             WinSendMsg(plswData->hwndTaskBarClient, LSWM_INITBUTTONS, 0, 0);
+            DosSleep(10);
             plswData->Settings.bGroupItems = TRUE;
             WinSendMsg(plswData->hwndTaskBarClient, LSWM_INITBUTTONS, 0, 0);
@@ -1815 +1814 @@
         rc = DosKillThread(plswData->itidFSDispat);
         rc1 = DosKillThread(plswData->itidFSMon);
-        //PmpfF(("FSMon TID %i DosKill %i", plswData->itidFSMon, rc1));
-        //PmpfF(("FSMonDispt TID %i DosKill %i", plswData->itidFSDispat, rc));
         SwitcherTerm(plswData, 1);
         mrc = plswData->pWidget->pfnwpDefWidgetProc(hwnd, msg, mp1, mp2);

trunk/widget/lswidget.c ¶

@@ -45 +45 @@
 
 // XWorkplace implementation headers
-#include "center.h"                     // public XCenter interfaces
-#define  __PMPRINTF__
-#include "PMPRINTF.H"
+#include "center.h"  
 
 #if 0