Changeset 1316

Timestamp:

Dec 3, 2008, 7:31:42 PM (17 years ago)

Author:

Gregg Young

Message:

Code clean up -- remove redundant code; move code to match openwatcom requirements etc.

Location:

trunk/dll

Files:

• filldir.c (modified) (4 diffs)
• mkdir.c (modified) (2 diffs)
• treecnr.c (modified) (1 diff)
• worker.c (modified) (2 diffs)

trunk/dll/filldir.c

@@ -994 +994 @@
               ri.zOrder = (ULONG) CMA_TOP;
               ri.cRecordsInsert = ulSelCnt;
-              ri.fInvalidateRecord =
-                !fSyncUpdates && dcd && dcd->type == DIR_FRAME ?
-                  FALSE : TRUE;
+              ri.fInvalidateRecord = TRUE;
+               // !fSyncUpdates && dcd && dcd->type == DIR_FRAME ? FALSE : TRUE; //fSyncUpdates always TRUE 12-1-08 GKY
               if (!WinSendMsg(hwndCnr,
                               CM_INSERTRECORD,
@@ -1010 +1009 @@
                   ullTotalBytes = 0;
                   if (WinIsWindow((HAB) 0, hwndCnr))
-                    FreeCnrItemList(hwndCnr, pciFirst);
+                    FreeCnrItemList(hwndCnr, pciFirst);
                 }
               // }
@@ -1102 +1101 @@
                 ullTotalBytes = 0;
                 if (WinIsWindow((HAB) 0, hwndCnr))
-                  FreeCnrItemList(hwndCnr, pciFirst);
+                  FreeCnrItemList(hwndCnr, pciFirst);
               }
             }
@@ -1560 +1559 @@
                                 MPVOID,
                                 MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
-
     while (pci && (INT)pci != -1) {
       StubbyScan = xmallocz(sizeof(STUBBYSCAN), pszSrcFile, __LINE__);

trunk/dll/mkdir.c

@@ -43 +43 @@
 #pragma data_seg(GLOBAL2)
 CHAR targetdir[CCHMAXPATH];
-
-#pragma alloc_text(MKDIR,MassMkdir,SetDir,PMMkDir,SetTargetDir)
 
 APIRET MassMkdir(HWND hwndClient, CHAR * dir)
@@ -244 +242 @@
   }
 }
+
+#pragma alloc_text(MKDIR,MassMkdir,SetDir,PMMkDir,SetTargetDir)

trunk/dll/treecnr.c

@@ -809 +809 @@
                  MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
       while (StubbyScanCount !=0)
-        DosSleep(100);
+        DosSleep(50);
       FillTreeCnr(dcd->hwndCnr, dcd->hwndParent);
       if (fOkayMinimize) {

trunk/dll/worker.c

@@ -1605 +1605 @@
                                  &fsa, (ULONG) sizeof(FILESTATUS3));
                 if (fsa.attrFile & FILE_DIRECTORY) {
-                  sprintf(prompt,
+                  /*sprintf(prompt,
                           GetPString(IDS_DELETINGTEXT), wk->li->list[x]);
+                  AddNote(prompt);*/ //Duplicate call 12-03-08 GKY
                   DosRequestMutexSem(hmtxFM2Delete, SEM_INDEFINITE_WAIT); // Prevent race 12-3-08 GKY
-                  AddNote(prompt);
                   error = (APIRET) wipeallf("%s%s*",
                                             wk->li->list[x],
                                             (*wk->li->list[x] &&
                                              wk->li->
-                                             list[x][strlen(wk->li->list[x]) -
-                                                     1] !=
-                                             '\\') ? "\\" : NullStr);
+                                             list[x][strlen(wk->li->list[x]) - 1]
+                                             != '\\') ? "\\" : NullStr);
                   DosError(FERR_DISABLEHARDERR);
                   if (!error)
@@ -1624 +1623 @@
                 }
                 else {
-                  sprintf(prompt,
+                  /*sprintf(prompt,
                           GetPString(IDS_DELETINGTEXT), wk->li->list[x]);
-                  AddNote(prompt);
+                  AddNote(prompt); */  //Duplicate call 12-03-08 GKY
                   DosError(FERR_DISABLEHARDERR);
                   if (wk->li->type == IDM_DELETE){