Changeset 1302 for trunk/dll/avl.c

Timestamp:

Nov 30, 2008, 6:28:52 AM (17 years ago)

Author:

Gregg Young

Message:

Add ini entry for LastArchiver so the previous archiver is selected in the select archive dialog if no default is provided. (Ticket 306) Part of remove or replace with a mutex semaphore DosEnterCriSec where appropriate. (Ticket 308)

File:

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

trunk/dll/avl.c

@@ -33 +33 @@
   22 Jun 08 GKY Added free_archivers for fortify checking
   19 Jul 08 GKY ifdef Fortify free_archivers
+  29 Nov 08 GKY Add ini entry for LastArchiver so the previous archiver is selected in the
+                Select archive dialog if no default is provided.
+  29 Nov 08 GKY Remove or replace with a mutex semaphore DosEnterCriSec where appropriate.
 
 ***********************************************************************/
@@ -81 +84 @@
 BOOL arcsigsmodified;
 
+#define ARCHIVER_LINE_BYTES     256
+
 //=== quick_find_type() ===
 ARC_TYPE *quick_find_type(CHAR * filespec, ARC_TYPE * topsig)
@@ -163 +168 @@
 
   // Try to reselect last selection unless user wants default selection
+  if (sOldSelect == LIT_NONE) {
+    ULONG size = sizeof(SHORT);
+
+    PrfQueryProfileData(fmprof, appname, "LastArchiver", &sOldSelect, &size);
+  }
   if (sOldSelect != LIT_NONE && !found) {
     SHORT sItemCount =
@@ -301 +311 @@
 //=== get_line_strip_comments() read line, strip comments and whitespace ===
 
-#define ARCHIVER_LINE_BYTES     256
-
 static PSZ get_line_strip_comments(PSZ pszIn, FILE * fp)
 {
@@ -359 +367 @@
   arcsigs_trailer_line_num = 0;
 
-  DosEnterCritSec();
+  //DosEnterCritSec(); //GKY 11-29-08
+  DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
   psz = searchpath(GetPString(IDS_ARCHIVERBB2));
   if (!psz || !*psz) {
-    DosExitCritSec();
+    DosReleaseMutexSem(hmtxFM2Globals);
+    //DosExitCritSec();
     return -1;
   }
   fp = _fsopen(psz, "r", SH_DENYWR);
-  DosExitCritSec();
+  DosReleaseMutexSem(hmtxFM2Globals);
+  //DosExitCritSec();
   if (!fp)
     return -2;
@@ -818 +829 @@
         if (!*szItemText)
           pat = NULL;
-        else {
+        else {
           for (; pat; pat = pat->next) {
             if (pat->id && !strcmp(szItemText, pat->id))
@@ -839 +850 @@
         return 0;
       }
+      PrfWriteProfileData(fmprof, appname, "LastArchiver", &sSelect, sizeof(SHORT));
       sLastSelect = sSelect;
       WinDismissDlg(hwnd, TRUE);
@@ -858 +870 @@
                                           LM_QUERYSELECTION,
                                           MPFROMSHORT(LIT_FIRST), MPVOID);
-      if (sSelect != LIT_NONE)
-        sLastSelect = sSelect;
+      if (sSelect != LIT_NONE) {
+        sLastSelect = sSelect;
+        PrfWriteProfileData(fmprof, appname, "LastArchiver", &sSelect, sizeof(SHORT));
+      }
       *ppatReturn = NULL;
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);  // fixme to understand why needed