Changeset 1863
- Timestamp:
- Aug 23, 2015, 2:13:48 AM (10 years ago)
- Location:
- trunk/dll
- Files:
-
- 10 edited
-
filldir.c (modified) (3 diffs)
-
flesh.c (modified) (5 diffs)
-
flesh.h (modified) (2 diffs)
-
fm3dlg.h (modified) (3 diffs)
-
fm3res.dlg (modified) (3 diffs)
-
info.c (modified) (2 diffs)
-
init.c (modified) (4 diffs)
-
notebook.c (modified) (7 diffs)
-
notebook.h (modified) (2 diffs)
-
worker.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/filldir.c
r1856 r1863 116 116 04 Aug 15 SHL Move StubbyThread to flesh.c 117 117 07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh 118 22 Aug 15 GKY Remove recurse scan code. 119 22 Aug 15 GKY Minimize the occurence of an A:\ Drive not ready error by moving the cursor 120 to the default drive. 118 121 119 122 ***********************************************************************/ … … 1502 1505 1503 1506 // move cursor onto the default drive rather than the first drive 1504 if (!fSwitchTreeOnDirChg) { 1507 pci = (PCNRITEM) WinSendMsg(hwndCnr, 1508 CM_QUERYRECORD, 1509 MPVOID, 1510 MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER)); 1511 while (pci && (INT)pci != -1) { 1512 if ((ULONG) (toupper(*pci->pszFileName) - '@') == ulCurDriveNum) { 1513 WinSendMsg(hwndCnr, 1514 CM_SETRECORDEMPHASIS, 1515 MPFROMP(pci), MPFROM2SHORT(TRUE, CRA_CURSORED)); 1516 break; 1517 } 1505 1518 pci = (PCNRITEM) WinSendMsg(hwndCnr, 1506 CM_QUERYRECORD, 1507 MPVOID, 1508 MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER)); 1509 while (pci && (INT)pci != -1) { 1510 if ((ULONG) (toupper(*pci->pszFileName) - '@') == ulCurDriveNum) { 1511 WinSendMsg(hwndCnr, 1512 CM_SETRECORDEMPHASIS, 1513 MPFROMP(pci), MPFROM2SHORT(TRUE, CRA_CURSORED)); 1514 break; 1515 } 1516 pci = (PCNRITEM) WinSendMsg(hwndCnr, 1517 CM_QUERYRECORD, 1518 MPFROMP(pci), 1519 MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER)); 1520 } 1519 CM_QUERYRECORD, 1520 MPFROMP(pci), 1521 MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER)); 1521 1522 } 1522 1523 … … 1616 1617 ~flags & DRIVE_NOPRESCAN && 1617 1618 (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE)) { 1618 AddFleshWorkRequest(hwndCnr, pci, e FillDir);1619 AddFleshWorkRequest(hwndCnr, pci, eStubby); 1619 1620 } // if drive needs to be scanned 1620 1621 } -
trunk/dll/flesh.c
r1861 r1863 249 249 CM_QUERYRECORD, 250 250 MPFROMP(pciParent), 251 251 MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER)); 252 252 253 253 // 2015-08-06 SHL allow pciL -1 254 254 // 2015-08-06 SHL FIXME to not need pszFileName check 255 if (!pciL || (INT)pciL == -1 || !*pciL->pszFileName ) {255 if (!pciL || (INT)pciL == -1 || !*pciL->pszFileName || !strcmp(pciL->pszFileName, NullStr)) { 256 256 257 257 // No children or filename null … … 287 287 NULL, // total files 288 288 NULL); // total bytes 289 if (pciParent && pciParent->pszFileName && !(driveflags[toupper(*pciParent->pszFileName) - 'A'] & DRIVE_RSCANNED))290 driveflags[toupper(*pciParent->pszFileName) - 'A'] |= DRIVE_RSCANNED;291 289 return TRUE; 292 290 } … … 786 784 } 787 785 c = strlen(((PFLESHWORKITEM)item)->pci->pszFileName); 788 return strncmp(((PFLESHWORKITEM)item)->pci->pszFileName, (PCSZ)data, c) == 0;786 return strncmp(((PFLESHWORKITEM)item)->pci->pszFileName, (PCSZ)data, c) == 0; 789 787 } 790 788 … … 956 954 957 955 if (WinIsWindow((HAB)0, item->hwndCnr)) { 958 959 ULONG flags;960 961 956 #if 0 // 2015-08-07 SHL FIXME debug 962 957 // 2015-08-03 SHL FIXME debug … … 985 980 FleshEnv(item->hwndCnr, item->pci); 986 981 break; 987 case eFillDir:988 982 case eStubby: 989 983 // DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread pci %p pszFileName %s", stubbyArgs->pci, stubbyArgs->pci->pszFileName); // 2015-08-03 SHL FIXME debug 990 flags = driveflags[toupper(*item->pci->pszFileName) - 'A']; 991 992 #if 1 993 if (item->action == eFillDir) { 994 // eFillDir maps to eFlesh or eStubby depending on fRScan.. settings 995 if (((fRScanLocal && flags & DRIVE_LOCALHD) || 996 (fRScanRemote && flags & DRIVE_REMOTE) || 997 (fRScanVirtual && flags & DRIVE_VIRTUAL)) && 998 (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) | 999 (fRScanSlow ? 0 : DRIVE_SLOW))))) 1000 { 1001 item->action = eFlesh; 1002 } 1003 else 1004 item->action = eStubby; 1005 } 1006 #else 1007 wantFlesh = ((fRScanLocal && flags & DRIVE_LOCALHD ) || 1008 (fRScanRemote && flags & DRIVE_REMOTE) || 1009 (fRScanVirtual && flags & DRIVE_VIRTUAL)) && 1010 // 2015-08-11 SHL typo - should not be local or 1011 (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) || 1012 (fRScanSlow ? 0 : DRIVE_SLOW)))); 1013 #endif 1014 if (item->action == eStubby) { 1015 Stubby(item->hwndCnr, item->pci); 1016 break; 1017 } 1018 // Drop through to eFlesh 1019 984 Stubby(item->hwndCnr, item->pci); 985 break; 1020 986 case eFlesh: 1021 987 if (Flesh(item->hwndCnr, item->pci)) { -
trunk/dll/flesh.h
r1860 r1863 11 11 07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh 12 12 19 Aug 15 SHL Allow WaitFleshWorkListEmpty to wait for dependent items 13 22 Aug 15 GKY Remove recurse scan code. 13 14 14 15 ***********************************************************************/ … … 19 20 BOOL StartFleshWorkThread(VOID); 20 21 21 typedef enum {eStubby, eFlesh, eFleshEnv, eUnFlesh , eFillDir} FLESHWORKACTION;22 typedef enum {eStubby, eFlesh, eFleshEnv, eUnFlesh} FLESHWORKACTION; 22 23 23 24 BOOL IsFleshWorkListEmpty(); -
trunk/dll/fm3dlg.h
r1778 r1863 48 48 09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings 49 49 for apps. 50 22 Aug 15 GKY Remove recurse scan code. 50 51 51 52 ***********************************************************************/ … … 746 747 #define CFGS_NOREMOVABLESCAN 25368 747 748 #define CFGS_FILESTOGET 25369 748 #define CFGS_RSCANLOCAL 25370749 #define CFGS_RSCANREMOTE 25371750 #define CFGS_RSCANVIRTUAL 25372751 #define CFGS_RSCANSLOW 25373752 #define CFGS_RSCANNOWRITE 25374753 749 #define CFGS_EJECTREMOVABLESCAN 25375 754 750 #define CFGS_EJECTCDSCAN 25376 … … 950 946 #define DVS_RAMDISK 27018 951 947 #define DVS_WRITEVERIFYOFF 27019 952 #define DVS_RSCANNED 27020953 948 #define DVS_LOCALHD 27021 954 949 #define DVS_NOEASUPPORT 27022 -
trunk/dll/fm3res.dlg
r1778 r1863 60 60 09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings 61 61 for apps. 62 22 Aug 15 GKY Remove recurse scan code. 62 63 63 64 ***********************************************************************/ … … 2000 2001 SPBS_NUMERICONLY | SPBS_MASTER | SPBS_SERVANT | 2001 2002 SPBS_JUSTCENTER | WS_TABSTOP | SPBS_FASTSPIN | 2002 WS_VISIBLE 2003 GROUPBOX "Recurse scan at startup:", -1, 130, 65, 166, 70, NOT WS_GROUP 2004 AUTOCHECKBOX "Local hard drives", CFGS_RSCANLOCAL, 136, 116, 106, 10 2005 AUTOCHECKBOX "Remote drives", CFGS_RSCANREMOTE, 136, 104, 106, 10 2006 AUTOCHECKBOX "Virtual drives", CFGS_RSCANVIRTUAL, 136, 92, 106, 10 2007 AUTOCHECKBOX "Slow drives of drive types selected", CFGS_RSCANSLOW, 2008 142, 80, 136, 10 2009 AUTOCHECKBOX "Read only drives of drive types selected", CFGS_RSCANNOWRITE, 2010 142, 68, 136, 10 2003 WS_VISIBLE 2011 2004 GROUPBOX "Drive tree rescan on media eject from:", -1, 130, 16, 166, 45, NOT WS_GROUP 2012 2005 AUTOCHECKBOX "Removable drives", CFGS_EJECTREMOVABLESCAN, 136, 44, 106, 10 … … 2149 2142 PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L 2150 2143 CHECKBOX "Invalid", DVS_INVALID, 4, 34, 94, 10, 2151 BS_NOPOINTERFOCUS | NOT WS_TABSTOP2152 PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L2153 CHECKBOX "Recursive scan done", DVS_RSCANNED, 4, 22, 94, 10,2154 2144 BS_NOPOINTERFOCUS | NOT WS_TABSTOP 2155 2145 PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L -
trunk/dll/info.c
r1749 r1863 39 39 causing an error message from DefaultView 40 40 28 Apr 14 JBS Ticket #522: Ensure use of wrapper functions where needed 41 22 Aug 15 GKY Remove recurse scan code. 41 42 42 43 ***********************************************************************/ … … 984 985 WinCheckButton(hwnd,DVS_WRITEVERIFYOFF, 985 986 ((driveflags[drive] & DRIVE_WRITEVERIFYOFF) != 0)); 986 WinCheckButton(hwnd,DVS_RSCANNED,987 ((driveflags[drive] & DRIVE_RSCANNED) != 0));988 987 WinCheckButton(hwnd,DVS_LOCALHD, 989 988 ((driveflags[drive] & DRIVE_LOCALHD) != 0)); -
trunk/dll/init.c
r1860 r1863 137 137 19 Aug 15 SHL Delete obsoletes 138 138 20 Aug 15 SHL Support PCSZ_DOS...SEM 139 22 Aug 15 GKY Remove recurse scan code. 139 140 140 141 ***********************************************************************/ … … 1209 1210 fSaveMiniCmds = fUserComboBox = fFM2Deletes = fConfirmTarget = 1210 1211 fShowTarget = fDrivebarHelp = fCheckMM = fInitialDriveScan = 1211 fEjectRemovableScan = fRScanLocal =TRUE;1212 fEjectRemovableScan = TRUE; 1212 1213 ulCnrType = CCS_EXTENDSEL; 1213 1214 FilesToGet = FILESTOGET_MAX; … … 1610 1611 PrfQueryProfileData(fmprof, appname, "RemoteBug", &fRemoteBug, &size); 1611 1612 size = sizeof(BOOL); 1612 PrfQueryProfileData(fmprof, appname, "RScanLocal", &fRScanLocal, &size);1613 size = sizeof(BOOL);1614 PrfQueryProfileData(fmprof, appname, "RScanRemote", &fRScanRemote, &size);1615 size = sizeof(BOOL);1616 PrfQueryProfileData(fmprof, appname, "RScanVirtual", &fRScanVirtual, &size);1617 size = sizeof(BOOL);1618 PrfQueryProfileData(fmprof, appname, "RScanSlow", &fRScanSlow, &size);1619 size = sizeof(BOOL);1620 PrfQueryProfileData(fmprof, appname, "RScanNoWrite", &fRScanNoWrite, &size);1621 size = sizeof(BOOL);1622 1613 PrfQueryProfileData(fmprof, appname, "EjectRemovableScan", &fEjectRemovableScan, &size); 1623 1614 size = sizeof(BOOL); … … 1662 1653 // 2015-08-11 SHL FIXME debug 1663 1654 DbgMsg(pszSrcFile, __LINE__, "ShowEnv %u SwitchTree %u SwitchTreeExpand %u SwitchTreeOnFocus %u CollapseFirst %u", fShowEnv, fSwitchTreeOnDirChg, fSwitchTreeExpand, fSwitchTreeOnFocus, fCollapseFirst); 1664 DbgMsg(pszSrcFile, __LINE__, "RScanLocal %u RScanRemote %u RScanVirtual %u RScanSlow RScanNoWrite %u", fRScanLocal, fRScanRemote, fRScanVirtual, fRScanSlow, fRScanNoWrite); 1665 1655 1666 1656 LoadDetailsSwitches(PCSZ_DIRCNR, &dsDirCnrDefault, FALSE); 1667 1657 -
trunk/dll/notebook.c
r1844 r1863 68 68 25 May 15 GKY Auto open help only on first access of quick setting page during a session. 69 69 09 Aug 15 SHL Use RESTORE_STATE_... 70 22 Aug 15 GKY Remove recurse scan code. 70 71 71 72 ***********************************************************************/ … … 167 168 BOOL fRealIdle; 168 169 BOOL fRemoteBug; 169 BOOL fRScanLocal;170 BOOL fRScanRemote;171 BOOL fRScanVirtual;172 BOOL fRScanSlow;173 BOOL fRScanNoWrite;174 170 BOOL fSaveState; 175 171 BOOL fShowDriveOnly; … … 508 504 WinCheckButton(hwnd, CFGS_REMOTEBUG, fRemoteBug); 509 505 WinCheckButton(hwnd, CFGS_NOREMOVABLESCAN, fNoRemovableScan); 510 WinCheckButton(hwnd, CFGS_RSCANLOCAL, fRScanLocal);511 WinCheckButton(hwnd, CFGS_RSCANREMOTE, fRScanRemote);512 WinCheckButton(hwnd, CFGS_RSCANVIRTUAL, fRScanVirtual);513 WinCheckButton(hwnd, CFGS_RSCANSLOW, fRScanSlow);514 WinCheckButton(hwnd, CFGS_RSCANNOWRITE, fRScanNoWrite);515 506 WinCheckButton(hwnd, CFGS_EJECTREMOVABLESCAN, fEjectRemovableScan); 516 507 WinCheckButton(hwnd, CFGS_EJECTCDSCAN, fEjectCDScan); … … 573 564 fRemoteBug = WinQueryButtonCheckstate(hwnd, CFGS_REMOTEBUG); 574 565 PrfWriteProfileData(fmprof, appname, "RemoteBug", &fRemoteBug, 575 sizeof(BOOL));576 fRScanLocal = WinQueryButtonCheckstate(hwnd, CFGS_RSCANLOCAL);577 PrfWriteProfileData(fmprof, appname, "RScanLocal", &fRScanLocal,578 sizeof(BOOL));579 fRScanRemote = WinQueryButtonCheckstate(hwnd, CFGS_RSCANREMOTE);580 PrfWriteProfileData(fmprof, appname, "RScanRemote", &fRScanRemote,581 sizeof(BOOL));582 fRScanVirtual = WinQueryButtonCheckstate(hwnd, CFGS_RSCANVIRTUAL);583 PrfWriteProfileData(fmprof, appname, "RScanVirtual", &fRScanVirtual,584 sizeof(BOOL));585 fRScanSlow = WinQueryButtonCheckstate(hwnd, CFGS_RSCANSLOW);586 PrfWriteProfileData(fmprof, appname, "RScanSlow", &fRScanSlow,587 sizeof(BOOL));588 fRScanNoWrite = WinQueryButtonCheckstate(hwnd, CFGS_RSCANNOWRITE);589 PrfWriteProfileData(fmprof, appname, "RScanNoWrite", &fRScanNoWrite,590 566 sizeof(BOOL)); 591 567 fNoRemovableScan = WinQueryButtonCheckstate(hwnd, CFGS_NOREMOVABLESCAN); … … 3175 3151 fForceLower = FALSE; 3176 3152 fEjectRemovableScan = FALSE; 3177 fRScanLocal = FALSE;3178 3153 dsDirCnrDefault.detailslongname = FALSE; 3179 3154 dsDirCnrDefault.detailssubject = FALSE; … … 3354 3329 fDrivebarHelp = TRUE; 3355 3330 fShowTarget = TRUE; 3356 fRScanLocal = TRUE;3357 fRScanRemote = FALSE;3358 fRScanVirtual = FALSE;3359 fRScanSlow = FALSE;3360 fRScanNoWrite = FALSE;3361 3331 fEjectRemovableScan = TRUE; 3362 3332 fEjectCDScan = FALSE; … … 3670 3640 fDrivebarHelp = TRUE; 3671 3641 fShowTarget = TRUE; 3672 fRScanLocal = TRUE;3673 fRScanRemote = TRUE;3674 fRScanVirtual = FALSE;3675 fRScanSlow = FALSE;3676 fRScanNoWrite = FALSE;3677 3642 fEjectRemovableScan = TRUE; 3678 3643 fEjectCDScan = TRUE; -
trunk/dll/notebook.h
r1778 r1863 20 20 09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings 21 21 for apps. 22 22 Aug 15 GKY Remove recurse scan code. 22 23 23 24 ***********************************************************************/ … … 87 88 extern BOOL fRealIdle; 88 89 extern BOOL fRemoteBug; 89 extern BOOL fRScanLocal;90 extern BOOL fRScanRemote;91 extern BOOL fRScanVirtual;92 extern BOOL fRScanSlow;93 90 extern BOOL fRScanNoWrite; 94 91 extern BOOL fSaveState; -
trunk/dll/worker.c
r1859 r1863 70 70 12 Aug 15 JBS Ticket #522: Ensure no "highmem-unsafe" functions are called directly 71 71 Calls to unsafe Dos... functions have been changed to call the wrapped xDos... functions 72 22 Aug 15 GKY Remove recurse scan code. 72 73 73 74 ***********************************************************************/ … … 994 995 GetPString(IDS_TOTEXT), newname); 995 996 } 996 if (!strcmp(realappname, "FM/4") || 997 ((driveflags[*wk->li->targetpath - 'A'] & DRIVE_RSCANNED) && 997 if (!strcmp(realappname, "FM/4") && 998 998 AddToList(wk->li->list[x], 999 &files, &cFilesModified, &cItemsAllocated)) )999 &files, &cFilesModified, &cItemsAllocated)) 1000 1000 Broadcast(hab2, 1001 1001 wk->li->type == IDM_RENAME ? wk->hwndParent : wk->hwndCnr, 1002 1002 UM_UPDATERECORD, 1003 1003 MPFROMP(wk->li->list[x]), MPVOID); 1004 if (!strcmp(realappname, "FM/4") || 1005 (driveflags[*wk->li->targetpath - 'A'] & DRIVE_RSCANNED) && 1004 if (!strcmp(realappname, "FM/4") && 1006 1005 AddToList(newname, &files, &cFilesModified, &cItemsAllocated)) 1007 1006 Broadcast(hab2,
Note:
See TracChangeset
for help on using the changeset viewer.
