Changeset 1301 for trunk/dll/arccnrs.c

Timestamp:

Nov 30, 2008, 6:25:27 AM (17 years ago)

Author:

Gregg Young

Message:

Add flag to tell CheckListProc file is in an archive so it won't try to open it. (Ticket 283) Part of remove or replace with a mutex semaphore DosEnterCriSec where appropriate. (Ticket 308)

File:

• trunk/dll/arccnrs.c (modified) (8 diffs)

trunk/dll/arccnrs.c

@@ -62 +62 @@
                 the archiver process closes. (Ticket 58)
   23 Nov 08 JBS Ticket 284: Support archivers with no Start or End of list strings
+  29 Nov 08 GKY Add flag to tell CheckListProc file is in an archive so it won't try to open it.
+  29 Nov 08 GKY Remove or replace with a mutex semaphore DosEnterCriSec where appropriate.
 
 ***********************************************************************/
@@ -676 +678 @@
 //       gotend =   !info->endlist ||
 //                       !*info->endlist ||     // If list has no end marker
-//                       (stricmp(info->endlist, "*#* None *#*") == 0); 
+//                       (stricmp(info->endlist, "*#* None *#*") == 0);
 
       while (!feof(fp) && !gotend && !*pStopFlag) {
@@ -1727 +1729 @@
             ck.list = li->list;
             ck.cmd = li->type;
-            ck.prompt = prompt;
+            ck.prompt = prompt;
+            ck.flags = CHECK_ARCHIVE;
             sprintf(prompt, GetPString(IDS_ARCCNRDELREFTEXT),
                     (li->type == IDM_DELETE) ?
@@ -1824 +1827 @@
                 }
               }
-              if (exfiles && numfiles) {
+              if (exfiles && numfiles) {
 
                 CHECKLIST ckl;
@@ -1833 +1836 @@
                 ckl.list = exfiles;
                 ckl.prompt = prompt;
-                ckl.cmd = li->type;
+                ckl.cmd = li->type;
+                ckl.flags = CHECK_ARCHIVE;
                 sprintf(prompt,
                         GetPString(IDS_REPLACEWARNTEXT),
@@ -2617 +2621 @@
           if (!SetDir(dcd->hwndParent, hwnd, s, 0)) {
             if (stricmp(dcd->directory, s)) {
-              DosEnterCritSec();
-              strcpy(lastextractpath, s);
-              DosExitCritSec();
+              //DosEnterCritSec();  //GKY 11-29-08
+              DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
+              strcpy(lastextractpath, s);
+              DosReleaseMutexSem(hmtxFM2Globals);
+              //DosExitCritSec();
             }
             strcpy(dcd->directory, s);
@@ -3055 +3061 @@
         if (mp2) {
           if (stricmp(dcd->directory, (CHAR *) mp2)) {
-            DosEnterCritSec();
+            //DosEnterCritSec(); //GKY 11-29-08
+            DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
             strcpy(lastextractpath, (CHAR *) mp2);
-            MakeValidDir(lastextractpath);
-            DosExitCritSec();
+            MakeValidDir(lastextractpath);
+            DosReleaseMutexSem(hmtxFM2Globals);
+            //DosExitCritSec();
           }
           strcpy(dcd->directory, (CHAR *) mp2);
@@ -3708 +3716 @@
         }
         if (!*dcd->directory && *lastextractpath) {
-          DosEnterCritSec();
-          strcpy(dcd->directory, lastextractpath);
-          DosExitCritSec();
+          //DosEnterCritSec();  //GKY 11-29-08
+          DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
+          strcpy(dcd->directory, lastextractpath);
+          DosReleaseMutexSem(hmtxFM2Globals);
+          //DosExitCritSec();
         }
         if (!*dcd->directory) {