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  - 
      
trunk/dll/assoc.c
r1594 r1616 27 27 01 May 10 GKY Changes to move environment storage to INI file 28 28 03 Jul 11 GKY Fixed failure to save associations after reordering item to the top or bottom. 29 13 Aug 11 GKY Change to Doxygen comment format 29 30 30 31 **************************************************************************************/ … … 195 196 !xfgets(offset, sizeof(offset), fp, pszSrcFile, __LINE__) || 196 197 !xfgets(flags, sizeof(flags), fp, pszSrcFile, __LINE__)) 197 break; / * error! */198 break; // error! 198 199 pszCmdLine[MaxComLineStrg - 1] = 0; 199 200 bstripcr(pszCmdLine); … … 241 242 VOID display_associations(HWND hwnd, ASSOC *temp, LINKASSOC *info) 242 243 { 243 //CHAR szEnviroment[ENVIRONMENT_SIZE];244 244 PSZ pszDisplayStr; 245 245 SHORT x; 246 246 247 //*szEnviroment = 0;248 //WinQueryDlgItemText(hwnd, ASS_ENVIRON, ENVIRONMENT_SIZE - 1, szEnviroment);249 //bstripcr(szEnviroment);250 //if (*szEnviroment)251 // PrfWriteProfileString(fmprof, FM3Str, temp->pszCmdLine, szEnviroment);252 247 pszDisplayStr = xmallocz((CCHMAXPATH * 2) + MaxComLineStrg + 6, 253 248 pszSrcFile, __LINE__); … … 289 284 next = info->next; 290 285 if (!strcmp("*", info->mask)) { 291 if (info != asshead) { / * already top record */286 if (info != asshead) { // already top record 292 287 if (info->prev) 293 288 (info->prev)->next = info->next; … … 371 366 } 372 367 else { 373 if (!asshead) / * only item in list */368 if (!asshead) // only item in list 374 369 asshead = asstail = info; 375 370 else { 376 if (asstail) { / * place at tail */371 if (asstail) { // place at tail 377 372 asstail->next = info; 378 373 info->prev = asstail; … … 505 500 fclose(fp); 506 501 } 507 if (didmatch) { / * got a match; do it... */502 if (didmatch) { // got a match; do it... 508 503 509 504 CHAR *list[2]; … … 807 802 info = add_association(&temp); 808 803 if (!info) 809 WinDismissDlg(hwnd, 1); /* Runtime_Error(pszSrcFile, __LINE__, "add_association"); */804 WinDismissDlg(hwnd, 1); 810 805 else { 811 806 display_associations(hwnd, &temp, info);  - 
      
trunk/dll/autoview.c
r1498 r1616 36 36 one or more miniapp but not to FM/2 37 37 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *. 38 13 Aug 11 GKY Change to Doxygen comment format 38 39 39 40 ***********************************************************************/ … … 98 99 CHAR * data) 99 100 { 100 / * save an ea to disk */101 // save an ea to disk 101 102 102 103 FEA2LIST *pfealist = NULL; … … 236 237 break; 237 238 } 238 pfealist->list[0].cbValue = /*(ULONG)*/ (eaval - 239 (pfealist->list[0].szName + 239 pfealist->list[0].cbValue = (eaval - (pfealist->list[0].szName + 240 240 pfealist->list[0].cbName + 1)); 241 241 memset(&eaop, 0, sizeof(eaop)); … … 256 256 register CHAR *p; 257 257 258 if (comments) { / * check -- is it empty? */258 if (comments) { // check -- is it empty? 259 259 p = comments; 260 260 while (*p && isspace(*p)) … … 632 632 readonly = TRUE; 633 633 } 634 / * else EA not present */634 // else EA not present 635 635 MLEsetchanged(hwndAutoMLE, FALSE); 636 636 MLEsetreadonly(hwndAutoMLE, readonly);  - 
      
trunk/dll/avl.c
r1557 r1616 40 40 23 Oct 10 GKY Changes to populate and utilize a HELPTABLE for context specific help 41 41 21 Nov 10 GKY Check if archiver.bb2 has been changed on disk before editing 42 13 Aug 11 GKY Change to Doxygen comment format 42 43 43 44 ***********************************************************************/ … … 126 127 127 128 for (pat = arcsighead; pat; pat = pat->next) { 128 /* 129 /** 129 130 * this inner loop tests for a dup signature entry and assures 130 131 * that only the entry at the top of the list gets used for … … 242 243 if (!DosChgFilePtr(handle, 243 244 abs(info->file_offset), 244 (info->file_offset >= 0) ? 245 FILE_BEGIN : FILE_END,&len)) {245 (info->file_offset >= 0) ? FILE_BEGIN : FILE_END, 246 &len)) { 246 247 if (!DosRead(handle, buffer, l, &len) && len == l) { 247 248 if (!memcmp(info->signature, buffer, l)) … … 252 253 } // for 253 254 254 DosClose(handle); / * Either way, we're done for now */255 return info; / * Return signature, if any */255 DosClose(handle); // Either way, we're done for now 256 return info; // Return signature, if any 256 257 } 257 258 … … 659 660 ditem.hstrSourceName = DrgAddStrHandle(NullStr); 660 661 ditem.hstrTargetName = DrgAddStrHandle(NullStr); 661 // ditem.fsControl = 0;662 662 ditem.fsSupportedOps = DO_MOVEABLE; 663 663 … … 671 671 dimage.cxOffset = -16; 672 672 dimage.cyOffset = 0; 673 DrgSetDragitem(pDInfo, &ditem, sizeof(DRAGITEM), 0); / * Index of DRAGITEM */674 hwndDrop = DrgDrag(hwnd, pDInfo, &dimage, 1, / * One DRAGIMAGE */673 DrgSetDragitem(pDInfo, &ditem, sizeof(DRAGITEM), 0); // Index of DRAGITEM 674 hwndDrop = DrgDrag(hwnd, pDInfo, &dimage, 1, // One DRAGIMAGE 675 675 VK_ENDDRAG, NULL); 676 676 if (!hwndDrop) … … 678 678 679 679 DrgFreeDraginfo(pDInfo); 680 // WinSetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_ACTIVATE);681 680 } 682 681 } … … 701 700 // fprintf(stderr, "DRAGOVER posted 0x%x WM_BUTTON1CLICK x y %d %d\n", hwnd, ptl2.x, ptl2.y); 702 701 } 703 pDInfo = (PDRAGINFO) mp1; / * Get DRAGINFO pointer */702 pDInfo = (PDRAGINFO) mp1; // Get DRAGINFO pointer 704 703 if (pDInfo) { 705 704 if (!DrgAccessDraginfo(pDInfo)) { … … 709 708 else { 710 709 pDItem = DrgQueryDragitemPtr(pDInfo, 0); 711 / * Check valid rendering mechanisms and data format */710 // Check valid rendering mechanisms and data format 712 711 ok = DrgVerifyRMF(pDItem, DRM_LBOX, NULL); 713 712 DrgFreeDraginfo(pDInfo); … … 737 736 // DrawTargetEmphasis(hwnd, emphasized); 738 737 } 739 pDInfo = (PDRAGINFO) mp1; / * Get DRAGINFO pointer */738 pDInfo = (PDRAGINFO) mp1; // Get DRAGINFO pointer 740 739 if (pDInfo) { 741 740 if (!DrgAccessDraginfo(pDInfo)) { … … 747 746 if (!pDItem) 748 747 Win_Error(hwnd, hwnd, pszSrcFile, __LINE__, "DM_DROP"); 749 / * Check valid rendering mechanisms and data */748 // Check valid rendering mechanisms and data 750 749 ok = DrgVerifyRMF(pDItem, DRM_LBOX, NULL) 751 750 && ~pDItem->fsControl & DC_PREPARE; 752 751 if (ok) { 753 // ret = FullDrgName(pDItem,buffer,buflen); 754 /* note: targetfail is returned to source for all items */ 752 // note: targetfail is returned to source for all items 755 753 DrgSendTransferMsg(pDInfo->hwndSource, DM_ENDCONVERSATION, 756 754 MPFROMLONG(pDItem->ulItemID), … … 804 802 break; 805 803 } 806 /* Passed arg points to where to return selected archiver definition804 /** Passed arg points to where to return selected archiver definition 807 805 * On input arg value controls selection list content 808 806 * If non-NULL, dup names are suppressed … … 1121 1119 } 1122 1120 1123 /* 1124 see archiver.tmp1125 02-08-96 23:55 11126 8 Feb 96 23:55:32 21127 8 Feb 96 11:55p 31128 96-02-08 23:55:32 41129 31-02-98 23:55 51121 /** 1122 * see archiver.tmp 1123 * 02-08-96 23:55 1 1124 * 8 Feb 96 23:55:32 2 1125 * 8 Feb 96 11:55p 3 1126 * 96-02-08 23:55:32 4 1127 * 31-02-98 23:55 5 1130 1128 */ 1131 1129  - 
      
trunk/dll/avv.c
r1544 r1616 30 30 11 Jan 08 GKY Replace "ARCHIVER.BB2" in string file with global set at compile in init.c 31 31 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *. 32 13 Aug 11 GKY Change to Doxygen comment format 32 33 33 34 ***********************************************************************/ … … 247 248 archiverbb2 = (PSZ) PCSZ_ARCHIVERBB2; 248 249 } 249 / * Check space on drive*/250 if (CheckDriveSpaceAvail(archiverbb2, ullDATFileSpaceNeeded * 4, 1) == 2) // *4 is because this file is larger than other .dat files250 // Check space on drive 251 if (CheckDriveSpaceAvail(archiverbb2, ullDATFileSpaceNeeded * 4, 1) == 2) // 4 is because this file is larger than other .dat files 251 252 return; //already gave error msg 252 253 253 / * save a backup */254 // save a backup 254 255 psz = strrchr(archiverbb2, '.'); 255 256 if (psz && !stricmp(psz, PCSZ_DOTBB2)) {  
  Note:
 See   TracChangeset
 for help on using the changeset viewer.
  