Changeset 1877 for trunk/dll/filldir.c
- Timestamp:
- Oct 11, 2015, 11:43:27 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/filldir.c
r1873 r1877 397 397 if (pgeaPrev) { 398 398 pgeaPrev->oNextEntryOffset = (PSZ)pgea - (PSZ)pgeaPrev; 399 //DbgMsg(pszSrcFile, __LINE__, "pgea %p oNextEntryOffset %u", pgeaPrev, pgeaPrev->oNextEntryOffset);400 399 } 401 400 strcpy(pgea->szName, pcsz); 402 401 pgea->cbName = strlen(pgea->szName); 403 402 pgea->oNextEntryOffset = 0; 404 //DbgMsg(pszSrcFile, __LINE__, "pgea %p cbName %u szName %s", pgea, pgea->cbName, pgea->szName);405 403 offset = sizeof(GEA2) + pgea->cbName; // Calc length including null 406 404 offset = (offset + 3) & ~3; // Doubleword align … … 409 407 } 410 408 } // for 411 412 409 pgealist->cbList = (PSZ)pgea - (PSZ)pgealist; 413 //DbgMsg(pszSrcFile, __LINE__, "pgealist %p cbList %u", pgealist, pgealist->cbList);414 415 410 pfealist = xmallocz(65536, pszSrcFile, __LINE__); 416 411 if (pfealist) { … … 429 424 s, pci->pszFileName); 430 425 } 431 //DbgMsg(pszSrcFile, __LINE__, "DosQueryPathInfo %s failed with rc %u ", pci->pszFileName, rc);432 426 else { 433 427 PFEA2 pfea = eaop.fpFEA2List->list; … … 439 433 GetPString(IDS_ERROREATYPETEXT), 440 434 achValue, pfea->cbName, pfea->szName); 441 //DbgMsg(pszSrcFile, __LINE__, "EA type 0x%x unexpected for %.*s", achValue, pfea->cbName, pfea->szName);442 435 else { 443 436 CHAR ch = achValue[pfea->cbValue]; … … 446 439 pszValue = xstrdup(achValue + (sizeof(USHORT) * 2), pszSrcFile, __LINE__); 447 440 achValue[pfea->cbValue] = ch; 448 //DbgMsg(pszSrcFile, __LINE__, "pfea %p %.*s cbValue %u %s", pfea, pfea->cbName, pfea->szName, pfea->cbValue, pszValue);449 441 if (strncmp(pfea->szName, LONGNAME, pfea->cbName) == 0) 450 442 pci->pszLongName = pszValue; … … 454 446 Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, 455 447 GetPString(IDS_ERROREATYPETEXT), pfea, pfea->cbName, pfea->szName); 456 //DbgMsg(pszSrcFile, __LINE__, "pfea %p EA %.*s unexpected", pfea, pfea->cbName, pfea->szName);457 448 } 458 449 } … … 772 763 else { 773 764 pci->pszFmtFileSize = NullStr; 774 //DbgMsg(pszSrcFile, __LINE__, "Bypassed Format size %s", pci->pszDisplayName);775 765 } 776 766 pci->date.day = pfsa4->fdateLastWrite.day; … … 1205 1195 while (pci && (INT)pci != -1) { 1206 1196 if (!pci->pszFileName || !strcmp(pci->pszFileName, NullStr)) { 1207 // 2015-08-23 SHL FIXME debug1208 //DbgMsg(pszSrcFile, __LINE__, "ProcessDirectory pci %p pci->pszFileName %p %s",1209 // pci, pci->pszFileName,1210 // pci->pszFileName == NullStr ? "NullStr" : "NULL");1211 1197 Runtime_Error(pszSrcFile, __LINE__, "pci->pszFileName NULL for %p", pci); 1212 1198 return; … … 1281 1267 ULONG startdrive = 3; 1282 1268 HWND hwndDrivelist; 1283 1284 1269 static BOOL didonce; 1285 1270 static ULONG ulLastDriveMap; 1286 1287 //DbgMsg(pszSrcFile, __LINE__, "FillTreeCnr hwndCnr %x hwndParent %x", hwndCnr, hwndParent); // 2015-08-03 SHL FIXME debug1288 1271 1289 1272 *szSuggest = 0; … … 1708 1691 } 1709 1692 } 1710 // DbgMsg(pszSrcFile, __LINE__, "szSuggest %x info %x", *szSuggest, info);1711 1693 if (*szSuggest) { 1712 1694 APIRET rc; … … 1768 1750 } // if !fDontSuggestAgain 1769 1751 didonce = TRUE; 1770 1771 //DbgMsg(pszSrcFile, __LINE__, "FillTreeCnr finished"); // 2015-08-03 SHL FIXME debug1772 1773 1752 } // FillTreeCnr 1774 1753 … … 1926 1905 VOID FreeCnrItem(HWND hwnd, PCNRITEM pci) 1927 1906 { 1928 // DbgMsg(pszSrcFile, __LINE__, "FreeCnrItem hwnd %x pci %p", hwnd, pci);1929 1930 1907 FreeCnrItemData(pci); 1931 1908 … … 2024 2001 if (remaining && --remaining == 0) 2025 2002 break; 2026 if (!bIdlePrioritySet /* && --usTimerCheckCountdown == 0 */) {2003 if (!bIdlePrioritySet) { 2027 2004 bIdlePrioritySet = !IdleIfNeeded(&itdSleep, 30); 2028 // usTimerCheckCountdown = RCI_ITEMS_PER_TIMER_CHECK;2029 2005 } 2030 2006 } // while … … 2035 2011 } 2036 2012 } 2037 2038 // DbgMsg(pszSrcFile, __LINE__, "RemoveCnrItems %p %u %s", pci, usCnt, pci->pszFileName);2039 2040 2013 if (remaining != - 1) { 2041 2014 remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pciFirst), MPFROM2SHORT(usCnt, usFlags));
Note:
See TracChangeset
for help on using the changeset viewer.