Changeset 533 for trunk/dll/inis.c

Timestamp:

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

Author:

root

Message:

Renames
Count thread usage

File:

• trunk/dll/inis.c (modified) (14 diffs)

trunk/dll/inis.c

@@ -12 +12 @@
   05 Jun 05 SHL Use QWL_USER
   17 Jul 06 SHL Use Runtime_Error
+  03 Nov 06 SHL Renames
+  03 Nov 06 SHL Count thread usage
 
 ***********************************************************************/
@@ -36 +38 @@
 static PSZ pszSrcFile = __FILE__;
 
-#pragma alloc_text(INIS,EnumAppNames,GetKeyData,EnumKeyNames,AddIniProc,IniProc,BackupIni,ChangeIniProc,SwapIniProc,IniLBSubProc,IniLBSubProc2,CopyIni,CompareIni,IntraIniProc,FilterIniProc)
+#pragma alloc_text(INIS,EnumAppNames,GetKeyData,EnumKeyNames,AddIniProc,IniProc,BackupIniThread,ChangeIniProc,SwapIniProc,IniLBSubProc,IniLBSubProc2,CopyIniThread,CompareIniThread,IntraIniProc,FilterIniProc)
 #pragma alloc_text(STARTUP,StartIniEditor)
 
@@ -79 +81 @@
 
 
-VOID CopyIni (VOID *args)
+VOID CopyIniThread (VOID *args)
 {
   INIREC     *inirec = (INIREC *)args;
@@ -94 +96 @@
       if(hmq2) {
         WinCancelShutdown(hmq2,TRUE);
+        IncrThreadUsage();
         *userini = *sysini = 0;
         memset(&cprfp,0,sizeof(PRFPROFILE));
@@ -246 +249 @@
         WinDestroyMsgQueue(hmq2);
       }
+      DecrThreadUsage();
       WinTerminate(hab2);
     }
@@ -259 +263 @@
 
 
-VOID CompareIni (VOID *args)
+static VOID CompareIniThread (VOID *args)
 {
   INIREC     *inirec = (INIREC *)args;
@@ -271 +275 @@
       if(hmq2) {
         WinCancelShutdown(hmq2,TRUE);
+        IncrThreadUsage();
+
+        // fixme to do something?
 
         WinDestroyMsgQueue(hmq2);
       }
+      DecrThreadUsage();
       WinTerminate(hab2);
     }
@@ -281 +289 @@
 
 
-VOID BackupIni (VOID *args)
+static VOID BackupIniThread (VOID *args)
 {
   PPRFPROFILE prfp = (PPRFPROFILE)args;
@@ -299 +307 @@
       if(hmq2) {
         WinCancelShutdown(hmq2,TRUE);
+        IncrThreadUsage();
         *userini = *sysini = 0;
         memset(&cprfp,0,sizeof(PRFPROFILE));
@@ -375 +384 @@
         WinDestroyMsgQueue(hmq2);
       }
+      DecrThreadUsage();
       WinTerminate(hab2);
     }
@@ -2559 +2569 @@
               inirec->confirm = inidata->confirm;
               strcpy(inirec->filename1,inidata->ininame);
-              if (_beginthread(CopyIni,NULL,122880,(PVOID)inirec) == -1) {
+              if (_beginthread(CopyIniThread,NULL,122880,(PVOID)inirec) == -1) {
                 Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
                 free(inirec);
@@ -2580 +2590 @@
               strcpy(inirec->filename1,inidata->ininame);
               inirec->hwndDlg = hwnd;
-              if (_beginthread(CompareIni,NULL,122880,(PVOID)inirec) == -1) {
+              if (_beginthread(CompareIniThread,NULL,122880,(PVOID)inirec) == -1) {
                 Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
                 free(inirec);
@@ -2626 +2636 @@
                 break;
               }
-              if (_beginthread(CopyIni,NULL,122880,(PVOID)inirec) == -1) {
+              if (_beginthread(CopyIniThread,NULL,122880,(PVOID)inirec) == -1) {
                 Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
                 free(inirec);
@@ -2673 +2683 @@
                   else {
                     prfp->cchSysName = strlen(prfp->pszSysName);
-                    if (_beginthread(BackupIni,NULL,122880,(PVOID)prfp) == -1) {
+                    if (_beginthread(BackupIniThread,NULL,122880,(PVOID)prfp) == -1) {
                       Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT));
                       free(prfp->pszSysName);