Changeset 1673 for trunk/dll/dircnrs.c


Ignore:
Timestamp:
Dec 30, 2012, 7:51:01 PM (13 years ago)
Author:
Gregg Young
Message:

Update to Doxygen comment style Ticket 55. Also some minor code cleanup.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/dircnrs.c

    r1664 r1673  
    225225          break;
    226226        }
    227         /* else intentional fallthru */
     227        // else intentional fallthru
    228228      case DIR_SELECTED:
    229229      case DIR_VIEW:
     
    256256                                                                   QW_PARENT),
    257257                                                    DIR_CNR), QWL_USER);
    258             if (id == DIR_SORT) {       /* don't have sort pathname in dirs */
     258            if (id == DIR_SORT) {       // don't have sort pathname in dirs
    259259              WinSendMsg(hwndButtonPopup,
    260260                         MM_DELETEITEM,
     
    514514        if (AcceptOneDrop(hwnd, mp1, mp2))
    515515          return MRFROM2SHORT(DOR_DROP, DO_MOVE);
    516         return (MRFROM2SHORT(DOR_NODROP, 0));   /* Drop not valid */
     516        return (MRFROM2SHORT(DOR_NODROP, 0));   // Drop not valid
    517517      case DM_DROPHELP:
    518518        DropHelp(mp1, mp2, hwnd, GetPString(IDS_DIRCNRFOLDERDROPHELP));
     
    754754      Fortify_ChangeScope(dcd, -1);
    755755#     endif
    756       /* set unique id */
     756      // set unique id
    757757      WinSetWindowUShort(hwnd, QWS_ID, DIROBJ_FRAME + (DIR_FRAME - dcd->id));
    758758      dcd->hwndObject = hwnd;
    759759      if (ParentIsDesktop(hwnd, dcd->hwndParent))
    760         DosSleep(100); //05 Aug 07 GKY 250
     760        DosSleep(100);
    761761    }
    762762    else
     
    835835
    836836  case UM_RESCAN:
    837     /*
    838      * populate container
    839      */
     837    // populate container
    840838    dcd = WinQueryWindowPtr(hwnd, QWL_USER);
    841839    if (dcd) {
    842       //DosEnterCritSec(); //GKY 11-29-08
    843840      DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
    844841      if (dcd->stopflag)
     
    846843      if (dcd->stopflag) {
    847844        DosReleaseMutexSem(hmtxFM2Globals);
    848         //DosExitCritSec();
    849845        return 0;
    850846      }
    851847      DosReleaseMutexSem(hmtxFM2Globals);
    852       //DosExitCritSec();
    853848      if (mp1) {
    854849        strcpy(dcd->previous, dcd->directory);
     
    943938            WinSendMsg(dcd->hwndCnr, CM_SETRECORDEMPHASIS, MPFROMP(pci),
    944939                       MPFROM2SHORT(TRUE, CRA_CURSORED));
    945             /* make sure that record shows in viewport */
     940            // make sure that record shows in viewport
    946941            ShowCnrRecord(dcd->hwndCnr, (PMINIRECORDCORE) pci);
    947942          }
     
    13621357
    13631358  case WM_SETFOCUS:
    1364     /* put name of our window (directory name) on status line */
     1359    // put name of our window (directory name) on status line
    13651360    if (mp2) {
    13661361      // Getting focus
    13671362      if (dcd && hwndStatus) {
    1368         /* put name of our window (directory name) on status line */
     1363        // put name of our window (directory name) on status line
    13691364        PCNRITEM pci = NULL;
    13701365        if (fAutoView && hwndMain) {
     
    15501545    if (dcd) {
    15511546      if (!dcd->hwndObject) {
    1552         /*
    1553          * first time through -- set things up
    1554          */
     1547        // first time through -- set things up
    15551548
    15561549        CNRINFO cnri;
     
    18811874                pci = FindCnrRecord(hwnd, newfile, NULL, TRUE, FALSE, TRUE);
    18821875                if (pci && (INT) pci != -1)
    1883                   /* make sure that record shows in viewport */
     1876                  // make sure that record shows in viewport
    18841877                  ShowCnrRecord(hwnd, (PMINIRECORDCORE) pci);
    18851878              }
     
    28402833        break;
    28412834
    2842 /*
    2843           case CN_PICKUP:
    2844             return PickUp(hwnd,dcd->hwndObject,mp2);
    2845 */
    2846 
    28472835      case CN_CONTEXTMENU:
    28482836        {
     
    29332921        if (mp2) {
    29342922
    2935           PDRAGITEM pDItem;     /* Pointer to DRAGITEM */
    2936           PDRAGINFO pDInfo;     /* Pointer to DRAGINFO */
     2923          PDRAGITEM pDItem;     // Pointer to DRAGITEM
     2924          PDRAGINFO pDInfo;     // Pointer to DRAGINFO
    29372925          PCNRITEM pci;
    29382926          USHORT uso;
     
    29492937              DRIVE_NOTWRITEABLE)) {
    29502938            DrgFreeDraginfo(pDInfo);
    2951             return MRFROM2SHORT(DOR_DROP,       /* Return okay to link */
    2952                                 DO_LINK);       /* (compare) only */
     2939            return MRFROM2SHORT(DOR_DROP,       // Return okay to link
     2940                                DO_LINK);       // (compare) only
    29532941          }
    29542942          if (pci) {
     
    29862974          }
    29872975
    2988           /* Access DRAGITEM index to DRAGITEM
     2976          /**
     2977           * Access DRAGITEM index to DRAGITEM
    29892978           * Check valid rendering mechanisms and data
    29902979           */
     
    29992988            if (toupper(*dcd->directory) < 'C')
    30002989              return MRFROM2SHORT(DOR_DROP, DO_COPY);
    3001             return MRFROM2SHORT(DOR_DROP,       /* Return okay to drop */
     2990            return MRFROM2SHORT(DOR_DROP,       // Return okay to drop
    30022991                                ((fCopyDefault) ? DO_COPY : DO_MOVE));
    30032992          }
    3004           DrgFreeDraginfo(pDInfo);      /* Free DRAGINFO */
    3005         }
    3006         return MRFROM2SHORT(DOR_NODROP, 0);     /* Drop not valid */
     2993          DrgFreeDraginfo(pDInfo);      // Free DRAGINFO
     2994        }
     2995        return MRFROM2SHORT(DOR_NODROP, 0);     // Drop not valid
    30072996
    30082997      case CN_INITDRAG:
     
    36343623                     MPFROMLONG(CMA_FIRST));
    36353624    if (pci && (INT) pci != -1) {
    3636       /* Got match make found item current item */
     3625      // Got match make found item current item
    36373626      USHORT attrib = CRA_CURSORED;
    36383627      // 29 Mar 09 SHL fixme to clear other object select if not extended select
     
    36413630      WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPFROMP(pci),
    36423631                 MPFROM2SHORT(TRUE, attrib));
    3643       /* make sure that record shows in viewport */
     3632      // make sure that record shows in viewport
    36443633      ShowCnrRecord(hwnd, (PMINIRECORDCORE) pci);
    36453634      return (MRESULT)TRUE;
     
    36753664                 ULONG flags)
    36763665{
    3677   /* bitmapped flags:
     3666  /**
     3667   * bitmapped flags:
    36783668   * 0x00000001 = don't close app when window closes
    36793669   * 0x00000002 = no frame controls
Note: See TracChangeset for help on using the changeset viewer.