Changeset 1616 for trunk/dll/arccnrs.c
- Timestamp:
- Aug 13, 2011, 8:32:14 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/arccnrs.c
r1554 r1616 86 86 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 87 87 by temp file creation failures. 88 13 Aug 11 GKY Change to Doxygen comment format 88 89 89 90 ***********************************************************************/ … … 383 384 ret = TestCDates(&pai1->date, &pai1->time, 384 385 &pai2->date, &pai2->time); 385 /*(pai1->date.year < pai2->date.year) ? 1 :386 (pai1->date.year > pai2->date.year) ? -1 :387 (pai1->date.month < pai2->date.month) ? 1 :388 (pai1->date.month > pai2->date.month) ? -1 :389 (pai1->date.day < pai2->date.day) ? 1 :390 (pai1->date.day > pai2->date.day) ? -1 :391 (pai1->time.hours < pai2->time.hours) ? 1 :392 (pai1->time.hours > pai2->time.hours) ? -1 :393 (pai1->time.minutes < pai2->time.minutes) ? 1 :394 (pai1->time.minutes > pai2->time.minutes) ? -1 :395 (pai1->time.seconds < pai2->time.seconds) ? 1 :396 (pai1->time.seconds > pai2->time.seconds) ? -1 : 0;*/397 386 break; 398 387 … … 718 707 gotend = TRUE; 719 708 else { 720 / * add to container */709 // add to container 721 710 fname = NULL; 722 711 bstrip(s); … … 739 728 for (fieldnum = 0; fieldnum <= highest; fieldnum++) { 740 729 pp = p; 741 while (*pp && (*pp == ' ' || *pp == '\t')) / * skip leading */730 while (*pp && (*pp == ' ' || *pp == '\t')) // skip leading 742 731 pp++; 743 732 if (!*pp) … … 795 784 else if (fieldnum == info->fnpos) { 796 785 fname = pp; 797 if (pp && *pp == '*' && !*(pp + 1)) / * workaround for LH.EXE */786 if (pp && *pp == '*' && !*(pp + 1)) // workaround for LH.EXE 798 787 fname = NULL; 799 788 if (info->nameislast) … … 927 916 } 928 917 else if (!nomove && tinfo) { 929 / * if we got a false hit, move working hit to top */918 // if we got a false hit, move working hit to top 930 919 tinfo = info->next; 931 920 info->next = arcsighead; … … 1219 1208 if (AcceptOneDrop(hwnd, mp1, mp2)) 1220 1209 return MRFROM2SHORT(DOR_DROP, DO_MOVE); 1221 return MRFROM2SHORT(DOR_NODROP, 0); / * Drop not valid */1210 return MRFROM2SHORT(DOR_NODROP, 0); // Drop not valid 1222 1211 case DM_DROPHELP: 1223 1212 DropHelp(mp1, mp2, hwnd, GetPString(IDS_ARCCNRFOLDERDROPHELPTEXT)); … … 1512 1501 Fortify_BecomeOwner(dcd); 1513 1502 # endif 1514 / * set unique id */1503 // set unique id 1515 1504 WinSetWindowUShort(hwnd, QWS_ID, ARCOBJ_FRAME + (ARC_FRAME - dcd->id)); 1516 1505 dcd->hwndObject = hwnd; // pass back hwnd … … 1521 1510 1522 1511 case UM_RESCAN: 1523 /* 1512 /** 1524 1513 * populate container 1525 1514 */ … … 1680 1669 ad.namecanchange = 0; 1681 1670 ad.fmoving = (li->type == IDM_ARCHIVEM); 1682 if (!WinDlgBox(HWND_DESKTOP, dcd->hwndClient, ArchiveDlgProc, FM3ModHandle, ARCH_FRAME, (PVOID) & ad) || !*ad.arcname || !*ad.command) /* we blew it */ 1671 if (!WinDlgBox(HWND_DESKTOP, dcd->hwndClient, ArchiveDlgProc, 1672 FM3ModHandle, ARCH_FRAME, (PVOID) & ad) || !*ad.arcname || 1673 !*ad.command) // we blew it 1683 1674 break; 1684 / * build the sucker */1675 // build the sucker 1685 1676 strcpy(szBuffer, ad.command); 1686 1677 strcat(szBuffer, " "); … … 1916 1907 } while (li->list[x]); 1917 1908 if (li->type == IDM_EXTRACT || li->type == IDM_EXTRACTWDIRS) { 1918 / * update windows */1909 // update windows 1919 1910 for (x = 0; li->list[x]; x++) { 1920 1911 … … 2298 2289 2299 2290 case WM_SETFOCUS: 2300 /* 2291 /** 2301 2292 * put name of our window (archive name) on status line 2302 2293 */ … … 2414 2405 else { 2415 2406 if (!dcd->hwndObject) { 2416 /* 2407 /** 2417 2408 * first time through -- set things up 2418 2409 */ … … 2693 2684 2694 2685 case IDM_WINDOWSMENU: 2695 /* 2686 /** 2696 2687 * add switchlist entries to end of pulldown menu 2697 2688 */ … … 2893 2884 case IDM_SORTLWDATE: 2894 2885 dcd->sortFlags &= SORT_REVERSE; 2895 / * intentional fallthru */2886 // intentional fallthru 2896 2887 case IDM_SORTREVERSE: 2897 2888 switch (SHORT1FROMMP(mp1)) { … … 3218 3209 3219 3210 pDInfo = ((PCNRDRAGINFO) mp2)->pDragInfo; 3220 DrgAccessDraginfo(pDInfo); / * Access DRAGINFO */3221 DrgFreeDraginfo(pDInfo); / * Free DRAGINFO */3211 DrgAccessDraginfo(pDInfo); // Access DRAGINFO 3212 DrgFreeDraginfo(pDInfo); // Free DRAGINFO 3222 3213 } 3223 3214 return 0; … … 3227 3218 if (mp2) { 3228 3219 3229 PDRAGITEM pDItem; / * Pointer to DRAGITEM */3230 PDRAGINFO pDInfo; / * Pointer to DRAGINFO */3220 PDRAGITEM pDItem; // Pointer to DRAGITEM 3221 PDRAGINFO pDInfo; // Pointer to DRAGINFO 3231 3222 PARCITEM pci; 3232 3223 … … 3235 3226 pci = NULL; 3236 3227 pDInfo = ((PCNRDRAGINFO) mp2)->pDragInfo; 3237 DrgAccessDraginfo(pDInfo); / * Access DRAGINFO */3228 DrgAccessDraginfo(pDInfo); // Access DRAGINFO 3238 3229 if (*dcd->arcname) { 3239 3230 if ((driveflags[toupper(*dcd->arcname) - 'A'] & … … 3247 3238 return MRFROM2SHORT(DOR_NODROP, 0); 3248 3239 } 3249 pDItem = DrgQueryDragitemPtr(pDInfo, /* Access DRAGITEM */3250 0); /* Index to DRAGITEM */3251 if (DrgVerifyRMF(pDItem, /* Check valid rendering */3252 (CHAR *) DRM_OS2FILE, / * mechanisms and data */3240 pDItem = DrgQueryDragitemPtr(pDInfo, // Access DRAGITEM 3241 0); // Index to DRAGITEM 3242 if (DrgVerifyRMF(pDItem, // Check valid rendering 3243 (CHAR *) DRM_OS2FILE, // mechanisms and data 3253 3244 NULL) && !(pDItem->fsControl & DC_PREPARE)) { 3254 DrgFreeDraginfo(pDInfo); / * Free DRAGINFO */3255 return MRFROM2SHORT(DOR_DROP, / * Return okay to drop */3245 DrgFreeDraginfo(pDInfo); // Free DRAGINFO 3246 return MRFROM2SHORT(DOR_DROP, // Return okay to drop 3256 3247 fCopyDefault ? DO_COPY : DO_MOVE); 3257 3248 } 3258 DrgFreeDraginfo(pDInfo); / * Free DRAGINFO */3259 } 3260 return (MRFROM2SHORT(DOR_NEVERDROP, 0)); / * Drop not valid */3249 DrgFreeDraginfo(pDInfo); // Free DRAGINFO 3250 } 3251 return (MRFROM2SHORT(DOR_NEVERDROP, 0)); // Drop not valid 3261 3252 3262 3253 case CN_INITDRAG: … … 3587 3578 ARC_TYPE * sinfo) 3588 3579 { 3589 /* 3580 /** 3590 3581 * bitmapped flags: 3591 3582 * 1 = am extracted from another archive
Note:
See TracChangeset
for help on using the changeset viewer.