Changeset 1565 for trunk/dll/select.c
- Timestamp:
- May 31, 2011, 8:37:01 PM (14 years ago)
- File:
-
- 1 edited
-
trunk/dll/select.c (modified) (27 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/select.c
r1544 r1565 7 7 8 8 Copyright (c) 1993-98 M. Kimes 9 Copyright (c) 2004, 20 08Steven H. Levine9 Copyright (c) 2004, 2011 Steven H. Levine 10 10 11 11 01 Aug 04 SHL Rework lstrip/rstrip usage … … 30 30 12 Jan 08 SHL Localize SpecialSelect in comp.c 31 31 29 Feb 08 GKY Use xfree where appropriate 32 31 May 11 SHL Ensure mask->pszMasks[1] initialize to NULL if not used 32 33 33 34 ***********************************************************************/ … … 151 152 *p = 0; 152 153 } 153 / * input now contains name of file to select */154 // Input now contains name of file to select 154 155 pci = FindCnrRecord(hwndCnr, 155 156 input, pciParent, partial, partial, TRUE); 156 if (pci) / * found it? */157 if (pci) // Found it? 157 158 WinSendMsg(hwndCnr, 158 159 CM_SETRECORDEMPHASIS, … … 162 163 else 163 164 errs++; 164 if (errs > 50) { / * prevent runaway on bad file */165 if (errs > 50) { // Prevent runaway on bad file 165 166 166 167 APIRET ret; … … 230 231 pszToMatch = file; 231 232 if (*Mask.pszMasks[x] != '/') { 232 233 if (wildcard(pszToMatch, Mask.pszMasks[x], TRUE)) { 233 234 markit = TRUE; 234 235 } … … 253 254 ULONG pos; 254 255 LONG len; 255 256 257 258 259 256 FILE *inputFile; 257 CHAR *moderb = "rb"; 258 259 if ((inputFile = xfsopen(pci->pszFileName, moderb, SH_DENYNO, 260 pszSrcFile, __LINE__, TRUE)) != NULL) { 260 261 pos = ftell(inputFile); 261 262 while (!feof(inputFile)) { … … 359 360 LONG len; 360 361 FILE *inputFile; 361 362 363 364 362 CHAR *moderb = "rb"; 363 364 if ((inputFile = xfsopen(pci->pszFileName, moderb, SH_DENYNO, 365 pszSrcFile, __LINE__, TRUE)) != NULL) { 365 366 pos = ftell(inputFile); 366 367 while (!feof(inputFile)) { … … 529 530 //== SetMask() Convert mask string to array of pointers to masks == 530 531 531 VOID SetMask(PSZ maskstr, MASK * 532 VOID SetMask(PSZ maskstr, MASK *mask) 532 533 { 533 534 UINT x; … … 546 547 p++; // Find separator 547 548 if (*p) { 548 *p = 0; // Replace ; 549 *p = 0; // Replace ; will nul to terminate string 549 550 p++; 550 551 } 551 552 } // for 552 553 mask->pszMasks[x] = NULL; // Mark end 554 if (!x) 555 mask->pszMasks[1] = NULL; // Need 1 more for multiple mask detect 2011-05-31 SHL 553 556 DosExitCritSec(); 554 557 } … … 655 658 return; 656 659 657 / * count directory containers, build array of hwnds */660 // Count directory containers, build array of hwnds 658 661 henum = WinBeginEnumWindows(hwndParent); 659 662 while ((hwnd = WinGetNextWindow(henum)) != NULLHANDLE) { … … 684 687 hwndCnr, 685 688 UM_NOTIFY, MPFROMP(GetPString(IDS_BUILDINGLISTSTEXT)), MPVOID); 686 DosSleep(0); //26 Aug 07 GKY 1687 } 688 689 / * count records, build array of pointers to records */689 DosSleep(0); // Allow other windows to update 690 } 691 692 // Count records, build array of pointers to records 690 693 for (z = 0; z < numwindows; z++) { 691 694 pci = (PCNRITEM) WinSendMsg(Cnrs[z].hwndCnr, … … 714 717 MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER)); 715 718 } 716 DosSleep(0); //26 Aug 07 GKY 1719 DosSleep(0); // Allow other windows to update 717 720 Cnrs[z].numfiles = x; 718 721 if (Cnrs[z].numfiles) … … 739 742 Cnrs[z].ss[x].largest = FALSE; 740 743 cmp = TestCDates(&bsres->pci->date, &bsres->pci->time, 741 744 &Cnrs[z].ss[x].pci->date, &Cnrs[z].ss[x].pci->time); 742 745 /*(Cnrs[z].ss[x].pci->date.year > 743 746 bsres->pci->date.year) ? TRUE : (Cnrs[z].ss[x].pci->date.year < … … 837 840 MPFROM2SHORT(TRUE, CRA_SELECTED)); 838 841 } 839 DosSleep(0); //26 Aug 07 GKY 1842 DosSleep(0); // Allow other windows to update 840 843 } 841 844 break; … … 848 851 MPFROM2SHORT(TRUE, CRA_SELECTED)); 849 852 } 850 DosSleep(0); //26 Aug 07 GKY 1853 DosSleep(0); // Allow other windows to update 851 854 } 852 855 break; … … 859 862 MPFROM2SHORT(TRUE, CRA_SELECTED)); 860 863 } 861 DosSleep(0); //26 Aug 07 GKY 1864 DosSleep(0); // Allow other windows to update 862 865 } 863 866 break; … … 870 873 MPFROM2SHORT(TRUE, CRA_SELECTED)); 871 874 } 872 DosSleep(0); //26 Aug 07 GKY 1875 DosSleep(0); // Allow other windows to update 873 876 } 874 877 break; … … 881 884 MPFROM2SHORT(TRUE, CRA_SELECTED)); 882 885 } 883 DosSleep(0); //26 Aug 07 GKY 1886 DosSleep(0); // Allow other windows to update 884 887 } 885 888 break; … … 892 895 MPFROM2SHORT(TRUE, CRA_SELECTED)); 893 896 } 894 DosSleep(0); //26 Aug 07 GKY 1897 DosSleep(0); // Allow other windows to update 895 898 } 896 899 break; … … 903 906 MPFROM2SHORT(TRUE, CRA_SELECTED)); 904 907 } 905 DosSleep(0); //26 Aug 07 GKY 1908 DosSleep(0); // Allow other windows to update 906 909 } 907 910 break; … … 915 918 MPFROM2SHORT(FALSE, CRA_SELECTED)); 916 919 } 917 DosSleep(0); //26 Aug 07 GKY 1920 DosSleep(0); // Allow other windows to update 918 921 } 919 922 break; … … 926 929 MPFROM2SHORT(FALSE, CRA_SELECTED)); 927 930 } 928 DosSleep(0); //26 Aug 07 GKY 1931 DosSleep(0); // Allow other windows to update 929 932 } 930 933 break; … … 937 940 MPFROM2SHORT(FALSE, CRA_SELECTED)); 938 941 } 939 DosSleep(0); //26 Aug 07 GKY 1942 DosSleep(0); // Allow other windows to update 940 943 } 941 944 break; … … 948 951 MPFROM2SHORT(FALSE, CRA_SELECTED)); 949 952 } 950 DosSleep(0); //26 Aug 07 GKY 1953 DosSleep(0); // Allow other windows to update 951 954 } 952 955 break; … … 959 962 MPFROM2SHORT(FALSE, CRA_SELECTED)); 960 963 } 961 DosSleep(0); //26 Aug 07 GKY 1964 DosSleep(0); // Allow other windows to update 962 965 } 963 966 break; … … 970 973 MPFROM2SHORT(FALSE, CRA_SELECTED)); 971 974 } 972 DosSleep(0); //26 Aug 07 GKY 1975 DosSleep(0); // Allow other windows to update 973 976 } 974 977 break; … … 981 984 MPFROM2SHORT(FALSE, CRA_SELECTED)); 982 985 } 983 DosSleep(0); //26 Aug 07 GKY 1986 DosSleep(0); // Allow other windows to update 984 987 } 985 988 break;
Note:
See TracChangeset
for help on using the changeset viewer.
