Changeset 1877 for trunk/dll/dircnrs.c
- Timestamp:
- Oct 11, 2015, 11:43:27 PM (10 years ago)
- File:
-
- 1 edited
-
trunk/dll/dircnrs.c (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/dircnrs.c
r1874 r1877 915 915 if (hwndTree) { 916 916 // 2015-08-12 SHL Optimze to update drive tree for only last saved state 917 918 #if 0 // 2015-08-13 SHL919 if (fSwitchTreeOnDirChg)920 DbgMsg(pszSrcFile, __LINE__, "DirObjWndProc UM_RESCAN cDirectoriesRestored %u", cDirectoriesRestored); // 2015-08-04 SHL FIXME debug921 #endif922 917 if (fSwitchTreeOnDirChg) { 923 918 // Keep drive tree in sync with directory container … … 927 922 if (hwndMain) { 928 923 if (TopWindow(hwndMain, (HWND)0) == dcd->hwndFrame) { 929 //DbgMsg(pszSrcFile, __LINE__, "DirObjWndProc UM_RESCAN PostMsg(UM_SHOWME)"); // 2015-08-04 SHL FIXME debug930 924 if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID)) 931 925 free(pszTempDir); … … 933 927 } 934 928 else { 935 //DbgMsg(pszSrcFile, __LINE__, "DirObjWndProc UM_RESCAN PostMsg(UM_SHOWME)"); // 2015-08-04 SHL FIXME debug936 929 if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID)) 937 930 free(pszTempDir); … … 1445 1438 if (fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory) { 1446 1439 PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__); 1447 //DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc WM_SETFOCUS cDirectoriesRestored %u", cDirectoriesRestored); // 2015-08-04 SHL FIXME debug1448 1440 if (pszTempDir) { 1449 //DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc WM_SETFOCUS PostMsg(UM_SHOWME, %s)", pszTempDir); // 2015-08-04 SHL FIXME debug1450 1441 if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID)) 1451 1442 free(pszTempDir); // Failed … … 1466 1457 strcpy(dcd->previous, dcd->directory); 1467 1458 strcpy(dcd->directory, fullname); 1468 // DosEnterCritSec(); // GKY 11-27-081469 1459 dcd->stopflag++; 1470 // DosExitCritSec();1471 // DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");1472 1460 if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) { 1473 1461 strcpy(dcd->directory, dcd->previous); 1474 // DosEnterCritSec(); // GKY 11-27-081475 1462 dcd->stopflag--; 1476 // DosExitCritSec();1477 1463 } 1478 1464 else if (*dcd->directory) { … … 1490 1476 case WM_TIMER: 1491 1477 // Started/stopped by DirObjWndPro 1492 // dcd = WinQueryWindowPtr(hwnd, QWL_USER);1493 1478 if (dcd) { 1494 1479 commafmt(tb, sizeof(tb), dcd->totalfiles); 1495 1480 CommaFmtULL(tf, sizeof(tf), dcd->ullTotalBytes, 'K'); 1496 1481 sprintf(s, "%s / %s", tb, tf); 1497 // DbgMsg(pszSrcFile, __LINE__, "WM_TIMER %s", s); // 15 Sep 09 SHL fixme debug1498 1482 WinSetDlgItemText(dcd->hwndClient, DIR_TOTALS, s); 1499 1483 } … … 1674 1658 } 1675 1659 else 1676 DosSleep(32); // 05 Aug 07 GKY 641660 DosSleep(32); 1677 1661 WinEnableMenuItem(DirCnrMenu, IDM_FINDINTREE, (hwndTree != (HWND) 0)); 1678 1662 } … … 1688 1672 case UM_SETUP2: 1689 1673 if (dcd) { 1690 // DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc UM_SETUP2 %x", hwnd);1691 1674 AdjustCnrColsForPref(hwnd, NULL, &dcd->ds, FALSE); 1692 1675 SayFilter(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), … … 1986 1969 1987 1970 if (pszTempDir) { 1988 //DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc IDM_FINDINTREE PostMsg(UM_SHOWME)"); // 2015-08-04 SHL FIXME debug1989 1971 if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), 1990 1972 MPFROMLONG(1L))) … … 2373 2355 2374 2356 case IDM_RESCAN: 2375 dcd->stopflag++;; 2376 // DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN"); 2357 dcd->stopflag++; 2377 2358 if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPVOID)) { 2378 2359 dcd->stopflag--; … … 2509 2490 strcpy(dcd->directory, (CHAR *)mp2); 2510 2491 dcd->stopflag++; 2511 //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");2512 2492 if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) { 2513 2493 strcpy(dcd->directory, dcd->previous); … … 2539 2519 strcpy(dcd->directory, tempname2); 2540 2520 dcd->stopflag++; 2541 //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");2542 2521 if (!PostMsg(dcd->hwndObject, 2543 2522 UM_RESCAN, MPVOID, MPFROMLONG(1L))) { … … 2567 2546 strcpy(dcd->directory, dcd->previous); 2568 2547 strcpy(dcd->previous, tempname); 2569 dcd->stopflag++; ; 2570 //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN"); 2548 dcd->stopflag++; 2571 2549 if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) { 2572 2550 strcpy(dcd->directory, dcd->previous); … … 2602 2580 strcpy(dcd->directory, newdir); 2603 2581 dcd->stopflag++; 2604 //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");2605 2582 if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) { 2606 2583 strcpy(dcd->directory, dcd->previous); … … 2878 2855 // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg 2879 2856 // 2015-09-26 GKY Waits (WaitFleshWorkListEmpty) in object window 2880 DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);2881 2857 if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && AddFleshWorkRequest(hwnd, pci, eFlesh) && 2882 2858 !dcd->suspendview && fTopDir) { 2883 2859 PostMsg(dcd->hwndObject, UM_TOPDIR, MPFROMP(pci), MPVOID); 2884 DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);2885 2860 } 2886 2861 } … … 2889 2864 } 2890 2865 else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) { 2891 DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);2892 2866 if (AddFleshWorkRequest(hwnd, pci, eFlesh) && !dcd->suspendview && 2893 2867 fTopDir) { … … 2895 2869 // 2015-09-26 GKY Waits (WaitFleshWorkListEmpty) in object window 2896 2870 PostMsg(dcd->hwndObject, UM_TOPDIR, MPFROMP(pci), MPVOID); 2897 DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);2898 2871 } 2899 2872 } … … 3454 3427 strcpy(dcd->directory, pci->pszFileName); 3455 3428 dcd->stopflag++; 3456 //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");3457 3429 if (!PostMsg(dcd->hwndObject, 3458 3430 UM_RESCAN, MPVOID, MPFROMLONG(1))) { … … 3498 3470 else { 3499 3471 dcd->stopflag++; 3500 //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");3501 3472 if (!PostMsg(dcd->hwndObject, 3502 3473 UM_RESCAN, MPVOID, MPFROMLONG(1L))) {
Note:
See TracChangeset
for help on using the changeset viewer.
