Changeset 212 for trunk/dll/arccnrs.c

Timestamp:

Jun 18, 2005, 5:50:20 AM (20 years ago)

Author:

root

Message:

Drop obsolete, localize
Correct last sort logic
Use QWL_USER

File:

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

trunk/dll/arccnrs.c

@@ -15 +15 @@
   25 May 05 SHL Rename comnam to szCommonName and fix typo
   25 May 05 SHL Use ULONGLONG and CommaFmtULL
+  05 Jun 05 SHL Drop obsolete, localize
+  05 Jun 05 SHL Correct last sort logic
+  05 Jun 05 SHL Use QWL_USER
 
 ***********************************************************************/
@@ -46 +49 @@
 #pragma alloc_text(STARTUP,StartArcCnr)
 
-INT arcsortFlags = 0;
-
-
-MRESULT EXPENTRY ArcErrProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+static INT DefArcSortFlags;
+
+static MRESULT EXPENTRY ArcErrProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
 {
   ARCDUMP *ad;
@@ -138 +140 @@
 
 
-SHORT APIENTRY ArcSort (PMINIRECORDCORE p1,PMINIRECORDCORE p2,PVOID pStorage)
+static SHORT APIENTRY ArcSort (PMINIRECORDCORE pmrc1,PMINIRECORDCORE pmrc2,PVOID pStorage)
 {
-  PARCITEM    p = (PARCITEM)p1,pp = (PARCITEM)p2;
-  DIRCNRDATA *dcd = (DIRCNRDATA *)pStorage;
+  PARCITEM    pai1 = (PARCITEM)pmrc2;
+  PARCITEM    pai2 = (PARCITEM)pmrc2;
+  DIRCNRDATA *pdcd = (DIRCNRDATA *)pStorage;
   SHORT       ret = 0;
   CHAR       *pext,*ppext;
-
-  if(dcd)
-    arcsortFlags = dcd->sortFlags;
-  if(arcsortFlags) {
-    switch(arcsortFlags & (~SORT_REVERSE)) {
+  INT        sortFlags;
+
+  if (!pdcd)
+  {
+    HWND hwndCnr = pai1->hwndCnr;
+    pdcd = (DIRCNRDATA *)WinQueryWindowPtr(hwndCnr,QWL_USER);
+    // fixme debug
+    if (!pdcd)
+    {
+      saymsg(0,NULLHANDLE,"*Debug*","dcd NULL %s %u",__FILE__, __LINE__);
+      return ret;
+    }
+  }
+
+  sortFlags = pdcd->sortFlags;          // Optimize
+
+  if(sortFlags) {
+    switch(sortFlags & (~SORT_REVERSE)) {
       case SORT_FIRSTEXTENSION:
-        pext = strchr(p->szFileName,'.');
-        ppext = strchr(pp->szFileName,'.');
+        pext = strchr(pai1->szFileName,'.');
+        ppext = strchr(pai2->szFileName,'.');
         if(!pext)
           pext = NullStr;
@@ -160 +176 @@
 
       case SORT_LASTEXTENSION:
-        pext = strrchr(p->szFileName,'.');
-        ppext = strrchr(pp->szFileName,'.');
+        pext = strrchr(pai1->szFileName,'.');
+        ppext = strrchr(pai2->szFileName,'.');
         if(!pext)
           pext = NullStr;
@@ -170 +186 @@
 
       case SORT_LWDATE:
-        ret = (p->date.year < pp->date.year) ? 1 :
-              (p->date.year > pp->date.year) ? -1 :
-              (p->date.month < pp->date.month) ? 1 :
-              (p->date.month > pp->date.month) ? -1 :
-              (p->date.day < pp->date.day) ? 1 :
-              (p->date.day > pp->date.day) ? -1 :
-              (p->time.hours < pp->time.hours) ? 1 :
-              (p->time.hours > pp->time.hours) ? -1 :
-              (p->time.minutes < pp->time.minutes) ? 1 :
-              (p->time.minutes > pp->time.minutes) ? -1 :
-              (p->time.seconds < pp->time.seconds) ? 1 :
-              (p->time.seconds > pp->time.seconds) ? -1 : 0;
+        ret = (pai1->date.year < pai2->date.year) ? 1 :
+              (pai1->date.year > pai2->date.year) ? -1 :
+              (pai1->date.month < pai2->date.month) ? 1 :
+              (pai1->date.month > pai2->date.month) ? -1 :
+              (pai1->date.day < pai2->date.day) ? 1 :
+              (pai1->date.day > pai2->date.day) ? -1 :
+              (pai1->time.hours < pai2->time.hours) ? 1 :
+              (pai1->time.hours > pai2->time.hours) ? -1 :
+              (pai1->time.minutes < pai2->time.minutes) ? 1 :
+              (pai1->time.minutes > pai2->time.minutes) ? -1 :
+              (pai1->time.seconds < pai2->time.seconds) ? 1 :
+              (pai1->time.seconds > pai2->time.seconds) ? -1 : 0;
         break;
 
       case SORT_SIZE:
-        ret = (p->cbFile < pp->cbFile) ? 1 : (p->cbFile == pp->cbFile) ?
+        ret = (pai1->cbFile < pai2->cbFile) ? 1 : (pai1->cbFile == pai2->cbFile) ?
               0 : -1;
         if(!ret)
-          ret = (p->cbComp < pp->cbComp) ? 1 : (p->cbComp == pp->cbComp) ?
+          ret = (pai1->cbComp < pai2->cbComp) ? 1 : (pai1->cbComp == pai2->cbComp) ?
                 0 : -1;
         break;
 
       case SORT_EASIZE:
-        ret = (p->cbComp < pp->cbComp) ? 1 : (p->cbComp == pp->cbComp) ?
+        ret = (pai1->cbComp < pai2->cbComp) ? 1 : (pai1->cbComp == pai2->cbComp) ?
               0 : -1;
         if(!ret)
-          ret = (p->cbFile < pp->cbFile) ? 1 : (p->cbFile == pp->cbFile) ?
+          ret = (pai1->cbFile < pai2->cbFile) ? 1 : (pai1->cbFile == pai2->cbFile) ?
                 0 : -1;
         break;
     }
     if(!ret)
-      ret = (SHORT)stricmp(p->szFileName,pp->szFileName);
-    if(ret && (arcsortFlags & SORT_REVERSE))
+      ret = (SHORT)stricmp(pai1->szFileName,pai2->szFileName);
+    if(ret && (sortFlags & SORT_REVERSE))
       ret = (ret > 0) ? -1 : 1;
     return ret;
   }
-  return (SHORT)stricmp(p->szFileName,pp->szFileName);
+  return (SHORT)stricmp(pai1->szFileName,pai2->szFileName);
 }
 
 
-INT APIENTRY ArcFilter (PMINIRECORDCORE rmini,PVOID arg)
+static INT APIENTRY ArcFilter (PMINIRECORDCORE rmini,PVOID arg)
 {
   DIRCNRDATA   *dcd = (DIRCNRDATA *)arg;
@@ -246 +262 @@
 
 
-MRESULT EXPENTRY ArcFrameWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+static MRESULT EXPENTRY ArcFrameWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
 {
   return CommonFrameWndProc(ARC_CNR,hwnd,msg,mp1,mp2);
@@ -252 +268 @@
 
 
-BOOL IsArcThere (HWND hwnd, CHAR *arcname)
+static BOOL IsArcThere (HWND hwnd, CHAR *arcname)
 {
   if(arcname) {
@@ -695 +711 @@
                 dcd = WinQueryWindowPtr(WinWindowFromID(WinQueryWindow(hwnd,
                                                         QW_PARENT),
-                                        ARC_CNR),
-                                        0);
+                                                        ARC_CNR),
+                                        QWL_USER);
                 if(id == DIR_SORT) {
                   if(dcd)
@@ -1139 +1155 @@
 
   switch(msg) {
-    case WM_CREATE:
-      break;
-
     case DM_PRINTOBJECT:
     case DM_DISCARDOBJECT:
@@ -1993 +2006 @@
 
 
-MRESULT EXPENTRY ArcCnrWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+static MRESULT EXPENTRY ArcCnrWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
 {
   DIRCNRDATA *dcd = WinQueryWindowPtr(hwnd,QWL_USER);
@@ -2433 +2446 @@
                   dcd->sortFlags,
                   TRUE);
+          DefArcSortFlags = dcd->sortFlags;     // Remember for new windows
         }
       }
@@ -2887 +2901 @@
                     dcd->sortFlags,
                     TRUE);
+            DefArcSortFlags = dcd->sortFlags;   // Remember for new windows
             break;
 
@@ -3510 +3525 @@
 
 HWND StartArcCnr (HWND hwndParent,HWND hwndCaller,CHAR *arcname,INT flags,
-                  ARC_TYPE *sinfo) {
-
+                  ARC_TYPE *sinfo)
+{
   /*
    * bitmapped flags:
@@ -3625 +3640 @@
         dcd->dontclose = ((flags & 4) != 0);
         dcd->info = info;
+        dcd->sortFlags = DefArcSortFlags;
         {
           PFNWP oldproc;
@@ -3631 +3647 @@
                                       (PFNWP)ArcFrameWndProc);
           WinSetWindowPtr(hwndFrame,
-                          0,
+                          QWL_USER,
                           (PVOID)oldproc);
         }
@@ -3651 +3667 @@
         if(dcd->hwndCnr) {
           WinSetWindowPtr(dcd->hwndCnr,
-                          0,
+                          QWL_USER,
                           (PVOID)dcd);
           {
@@ -3790 +3806 @@
   return hwndFrame;
 }
-