Changeset 1344 for trunk/dll/extract.c

Timestamp:

Dec 19, 2008, 2:40:20 PM (17 years ago)

Author:

Gregg Young

Message:

Update extract to filename based subdirectory; Remember now remembers the previous directory and ignores filename as extract path which is identical to its previous behavior. (Ticket 22)

File:

• trunk/dll/extract.c (modified) (9 diffs)

trunk/dll/extract.c

@@ -100 +100 @@
 {
   EXTRDATA *arcdata = NULL;
-  ULONG size = sizeof(BOOL);
+  ULONG size;
   BOOL fFileNameExtPath;
 
@@ -108 +108 @@
     arcdata = (EXTRDATA *) mp2;
     {
-      ULONG sizet;
+      BOOL fDirectory = FALSE;
       BOOL fRemember = FALSE;
-      BOOL fDirectory = FALSE;
       PFNWP oldproc;
 
@@ -118 +117 @@
       if (oldproc)
         WinSetWindowPtr(WinWindowFromID(hwnd, EXT_DIRECTORY),
-                        QWL_USER, (PVOID) oldproc);
+                        QWL_USER, (PVOID) oldproc);
+      size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, FM3Str, "RememberExt",
-                          (PVOID) & fRemember, &size);
+                          (PVOID) & fRemember, &size);
+      size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, FM3Str, "DirectoryExt",
                           (PVOID) & fDirectory, &size);
+      size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, FM3Str, "FileNamePathExt",
                           (PVOID) & fFileNameExtPath, &size);
@@ -171 +173 @@
       if (fRemember) {
 
-        CHAR textdir[CCHMAXPATH];
-
-        sizet = sizeof(textdir);
-        *textdir = 0;
-        PrfQueryProfileData(fmprof, FM3Str, "Ext_ExtractDir",
-                            (PVOID) textdir, &size);
+        CHAR textdir[CCHMAXPATH];
+
+        PrfQueryProfileString(fmprof, FM3Str, "Ext_ExtractDir", NULL, textdir, sizeof(textdir));
         if (*textdir && !IsFile(textdir))
           strcpy(arcdata->extractdir, textdir);
-        sizet = sizeof(textdir);
-        *textdir = 0;
-        PrfQueryProfileData(fmprof, FM3Str, "Ext_Mask", (PVOID) textdir,
-                            &size);
+        PrfQueryProfileString(fmprof, FM3Str, "Ext_Mask", NULL, textdir, sizeof(textdir));
         WinSetDlgItemText(hwnd, EXT_MASK, textdir);
       }
@@ -224 +220 @@
         WinEnableWindow(WinWindowFromID(hwnd, EXT_WDIRS), FALSE);
       else if (fRemember) {
-        //size = sizeof(BOOL);
-        fRemember = FALSE;
+        fRemember = FALSE;
+        size = sizeof(BOOL);
         PrfQueryProfileData(fmprof, FM3Str, "Ext_WDirs",
                             (PVOID) &fRemember, &size);
@@ -251 +247 @@
       {
         BOOL fRemember = WinQueryButtonCheckstate(hwnd, EXT_REMEMBER);
-
+        size = sizeof(BOOL);
         PrfWriteProfileData(fmprof, FM3Str, "RememberExt",
-                            (PVOID) &fRemember, size);
+                            (PVOID) &fRemember, size);
+        WinSendDlgItemMsg(hwnd, EXT_FILENAMEEXT, BM_SETCHECK,
+                            MPFROM2SHORT(FALSE, 0), MPVOID);
       }
       break;
@@ -260 +258 @@
       {
         BOOL fDirectory = WinQueryButtonCheckstate(hwnd, EXT_AWDIRS);
-
+        size = sizeof(BOOL);
         PrfWriteProfileData(fmprof, FM3Str, "DirectoryExt",
                             (PVOID) &fDirectory, size);
@@ -279 +277 @@
     case EXT_FILENAMEEXT:
       {
-        BOOL fFileNameExtPath = WinQueryButtonCheckstate(hwnd, EXT_FILENAMEEXT);
-
+        BOOL fFileNameExtPath = WinQueryButtonCheckstate(hwnd, EXT_FILENAMEEXT);
+        BOOL fRemember = WinQueryButtonCheckstate(hwnd, EXT_REMEMBER);
+        size = sizeof(BOOL);
         PrfWriteProfileData(fmprof, FM3Str, "FileNamePathExt",
-                            (PVOID) &fFileNameExtPath, size);
+                            fRemember ? FALSE : (PVOID) &fFileNameExtPath, size);
+        if (fRemember)
+          break;
         if (fFileNameExtPath && arcdata->arcname) {
           CHAR FileName[CCHMAXPATH];
@@ -426 +427 @@
           if (fRemember) {
             PrfWriteProfileString(fmprof, FM3Str, "Ext_ExtractDir", s);
-            fRemember = WinQueryButtonCheckstate(hwnd, EXT_WDIRS);
+            fRemember = WinQueryButtonCheckstate(hwnd, EXT_WDIRS);
+            size = sizeof(BOOL);
             PrfWriteProfileData(fmprof, FM3Str, "Ext_WDirs",
                                 (PVOID) &fRemember, size);