Changeset 533 for trunk/dll/newview.c

Timestamp:

Nov 4, 2006, 10:07:44 PM (19 years ago)

Author:

root

Message:

Renames
Count thread usage

File:

• trunk/dll/newview.c (modified) (19 diffs)

trunk/dll/newview.c

@@ -16 +16 @@
   17 Jul 06 SHL Use Runtime_Error
   26 Jul 06 SHL Use chop_at_crnl and convert_nl_to_nul
+  03 Nov 06 SHL Renames
+  03 Nov 06 SHL Count thread usage
 
 ***********************************************************************/
@@ -41 +43 @@
 static PSZ pszSrcFile = __FILE__;
 
-#pragma alloc_text(NEWVIEW,ViewStatusProc,FreeViewerMem,LoadFile)
+#pragma alloc_text(NEWVIEW,ViewStatusProc,FreeViewerMem,LoadFileThread)
 #pragma alloc_text(NEWVIEW,InitWindow,PaintLine,ViewWndProc)
-#pragma alloc_text(NEWVIEW,ViewFrameWndProc,StartViewer,ReLine)
-#pragma alloc_text(NEWVIEW,BuildAList,Search,Clipboard,FindStrDlgProc)
+#pragma alloc_text(NEWVIEW,ViewFrameWndProc,StartViewer,ReLineThread)
+#pragma alloc_text(NEWVIEW,BuildAList,SearchThread,ClipboardThread,FindStrDlgProc)
 #pragma alloc_text(NEWVIEW,BuildAList2,UrlDlgProc)
 
@@ -893 +895 @@
 }
 
-static VOID Search(VOID * args)
+static VOID SearchThread(VOID * args)
 {
   HWND hwnd = (HWND)args;
@@ -910 +912 @@
   {
     hmq2 = WinCreateMsgQueue(hab2, 0);
-    if (hmq2)
-    {
+    if (hmq2) {
       WinCancelShutdown(hmq2, TRUE);
+      IncrThreadUsage();
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
       if (ad)
@@ -1060 +1062 @@
       WinDestroyMsgQueue(hmq2);
     }
+    DecrThreadUsage();
     WinTerminate(hab2);
   }
@@ -1065 +1068 @@
 }
 
-static VOID Clipboard(VOID * args)
+static VOID ClipboardThread(VOID * args)
 {
   HWND hwnd = (HWND)args;
@@ -1081 +1084 @@
   {
     hmq2 = WinCreateMsgQueue(hab2, 0);
-    if (hmq2)
-    {
+    if (hmq2) {
       WinCancelShutdown(hmq2, TRUE);
+      IncrThreadUsage();
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
       if (ad)
@@ -1168 +1171 @@
       WinDestroyMsgQueue(hmq2);
     }
+    DecrThreadUsage();
     WinTerminate(hab2);
   }
@@ -1173 +1177 @@
 }
 
-static VOID ReLine(VOID * args)
+static VOID ReLineThread(VOID * args)
 {
   HWND hwnd = (HWND)args;
@@ -1185 +1189 @@
   priority_normal();
   hab2 = WinInitialize(0);
-  if (hab2)
-  {
+  if (hab2) {
     hmq2 = WinCreateMsgQueue(hab2, 0);
-    if (hmq2)
-    {
+    if (hmq2) {
       WinCancelShutdown(hmq2, TRUE);
+      IncrThreadUsage();
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
-      if (ad)
-      {
+      if (ad) {
         ad -> relining = TRUE;
-        if (!DosRequestMutexSem(ad -> ScanSem, SEM_INDEFINITE_WAIT))
-        {
+        if (!DosRequestMutexSem(ad -> ScanSem, SEM_INDEFINITE_WAIT)) {
           ad -> busy++;
           ad -> maxx = 0;
@@ -1358 +1359 @@
       WinDestroyMsgQueue(hmq2);
     }
+    DecrThreadUsage();
     WinTerminate(hab2);
   }
   DosPostEventSem(CompactSem);
-  if (ad && !ad -> stopflag)
-  {
+  if (ad && !ad -> stopflag) {
     PostMsg(hwnd, UM_CONTAINER_FILLED, MPFROMLONG(firstline),
             MPFROMLONG(cursored));
@@ -1369 +1370 @@
 }
 
-static VOID LoadFile(VOID * args)
+static VOID LoadFileThread(VOID * args)
 {
   HWND hwnd = (HWND)args;
@@ -1387 +1388 @@
     {
       WinCancelShutdown(hmq2, TRUE);
+      IncrThreadUsage();
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
       if (ad)
@@ -1465 +1467 @@
                     }
                     if (ad -> textsize) {
-                      if (_beginthread(ReLine, NULL, 524288, (PVOID) hwnd) == -1)
+                      if (_beginthread(ReLineThread, NULL, 524288, (PVOID) hwnd) == -1)
                         Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
                       else
@@ -1482 +1484 @@
       WinDestroyMsgQueue(hmq2);
     }
+    DecrThreadUsage();
     WinTerminate(hab2);
   }
@@ -1958 +1961 @@
         WinSetWindowPtr(hwndFrame, QWL_USER, (PVOID)oldproc);
         ad -> hps = InitWindow(hwnd);
-        if (_beginthread(LoadFile, NULL, 524288, (PVOID) hwnd) == -1)
+        if (_beginthread(LoadFileThread, NULL, 524288, (PVOID) hwnd) == -1)
           Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
         else {
@@ -2093 +2096 @@
         if (!ad -> relining)
         {
-          if (_beginthread(ReLine, NULL, 524288, (PVOID) hwnd) == -1)
+          if (_beginthread(ReLineThread, NULL, 524288, (PVOID) hwnd) == -1)
           {
             Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
@@ -3679 +3682 @@
                                       "Viewer.Searchtext",
                                       (PVOID) ad -> searchtext);
-              if (_beginthread(Search, NULL, 524288, (PVOID) hwnd) == -1)
+              if (_beginthread(SearchThread, NULL, 524288, (PVOID) hwnd) == -1)
                 Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
             }
@@ -3967 +3970 @@
           {
             ad -> cliptype = SHORT1FROMMP(mp1);
-            if (_beginthread(Clipboard,NULL,524288,(PVOID) hwnd) == -1)
+            if (_beginthread(ClipboardThread,NULL,524288,(PVOID) hwnd) == -1)
               Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
           }