Changeset 53


Ignore:
Timestamp:
10/13/2007 10:53:34 AM (7 years ago)
Author:
lowjoel
Message:

-Document the Schneider pass for eraser launcher
-More warning fixes

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Eraser.cpp

    r32 r53  
    137137        ::PathRemoveFileSpec(temp); 
    138138        ::PathAppend(temp, "eraser.ini"); 
    139         m_pszProfileName = strdup(temp); 
     139        m_pszProfileName = _strdup(temp); 
    140140    } 
    141141 
     
    221221    EnableHtmlHelp(); 
    222222    int helpfilelen = strlen(m_pszHelpFilePath); 
    223     if((helpfilelen >= 4) && !stricmp(&m_pszHelpFilePath[helpfilelen - 4], ".hlp")) 
     223    if((helpfilelen >= 4) && !_stricmp(&m_pszHelpFilePath[helpfilelen - 4], ".hlp")) 
    224224        strcpy((char *)&m_pszHelpFilePath[helpfilelen - 4], ".chm"); 
    225225 
  • trunk/EraserDll/Eraser.cpp

    r47 r53  
    24742474            if (!file.Open(newfilename, CFile::modeRead | CFile::typeBinary)) 
    24752475                continue; 
    2476             unsigned int len = file.GetLength(); 
     2476            unsigned int len = (unsigned int)file.GetLength(); 
    24772477            void *buffer = calloc(1, len); 
    24782478            try { 
  • trunk/EraserDll/NTFS.cpp

    r4 r53  
    617617                        wszStreamName[psi->NameLength / sizeof(WCHAR)] = 0; 
    618618 
    619                         if (wcsicmp(wszStreamName, L"::$DATA")) { 
     619                        if (_wcsicmp(wszStreamName, L"::$DATA")) { 
    620620                            // name of the alternate data stream 
    621621                            unicodeToCString(wszStreamName, ads.m_strName); 
  • trunk/EraserDll/Pass.cpp

    r4 r53  
    1919// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 
    2020// 02111-1307, USA. 
    21  
    22 #define PASS_CPP 
    2321 
    2422#include "stdafx.h" 
  • trunk/EraserDll/Pass.h

    r4 r53  
    233233 
    234234// global array of built-in methods 
    235 #ifndef PASS_CPP 
    236235extern const BMETHOD bmMethods[nBuiltinMethods]; 
    237 #endif 
    238236 
    239237#endif // PASS_H 
  • trunk/EraserDoc.cpp

    r43 r53  
    697697 
    698698                CString strTmp; 
    699                 LONGLONG dwLen = dwMax - str.GetLength(); 
     699                int dwLen = dwMax - str.GetLength(); 
    700700 
    701701                sf.Seek(-1*dwLen, CFile::end); 
  • trunk/Launcher/Launcher.cpp

    r46 r53  
    153153        osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); 
    154154 
    155         if( !(bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) &osvi)) ) 
     155        if ( (bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *) &osvi)) != TRUE ) 
    156156        { 
    157157            osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); 
    158             if (! GetVersionEx ( (OSVERSIONINFO *) &osvi) )  
     158            if ( !GetVersionEx ((OSVERSIONINFO *) &osvi) )  
    159159                return ; 
    160160        } 
    161         if (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId ) 
     161        if ( VER_PLATFORM_WIN32_NT == osvi.dwPlatformId ) 
    162162        { 
    163163            if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 ) 
  • trunk/Launcher/Launcher.rc

    r45 r53  
    107107BEGIN 
    108108    IDD_ERROR_DIALOG        "Failed to create dialog." 
    109     IDS_CMDLINE_INCORRECT   "Incorrect command line.\n\nUsage:\n\n  eraserl  [Data] [Method] [-silent | -results | -resultsonerror ] [-queue] [-options]\n\n  Data:\n     -file\t\tdata [-subfolders]\n     -folder\t\tdata [-subfolders] [-keepfolder]\n     -disk\t\tdrive: | ""all""\n     -recycled\n\n  Method:\n     -method\t""Gutmann"" | ""DoD"" | ""DoD_E"" | ""First_Last2k"" | ""Random"" passes | ""Library""\n\n  Parameters:\n     -file\t\tData is a file (wildcards allowed)\n       -subfolders\t  Include subfolders\n     -folder\t\tData is a folder\n       -subfolders\t  Include subfolders\n       -keepfolder\t  Do not delete the folder\n     -disk\t\tData is unused space on a drive or all local hard drives\n     -recycled\tErase all data on Recycle Bin\n     -method\tUse given overwriting method (default ""Library"")\n     -silent\t\tNo windows\n     -results\tShow Erasing Report\n     -resultsonerror\tShow Erasing Report only in case of error\n     -queue\tWait until previous instances have finished\n     -options\tIgnore other parameters and show options" 
     109    IDS_CMDLINE_INCORRECT   "Incorrect command line.\n\nUsage:\n\n  eraserl  [Data] [Method] [-silent | -results | -resultsonerror ] [-queue] [-options]\n\n  Data:\n     -file\t\tdata [-subfolders]\n     -folder\t\tdata [-subfolders] [-keepfolder]\n     -disk\t\tdrive: | ""all""\n     -recycled\n\n  Method:\n     -method\t""Gutmann"" | ""DoD"" | ""DoD_E"" | ""First_Last2k"" | ""Schneider"" | ""Random"" passes | ""Library""\n\n  Parameters:\n     -file\t\tData is a file (wildcards allowed)\n       -subfolders\t  Include subfolders\n     -folder\t\tData is a folder\n       -subfolders\t  Include subfolders\n       -keepfolder\t  Do not delete the folder\n     -disk\t\tData is unused space on a drive or all local hard drives\n     -recycled\tErase all data on Recycle Bin\n     -method\tUse given overwriting method (default ""Library"")\n     -silent\t\tNo windows\n     -results\tShow Erasing Report\n     -resultsonerror\tShow Erasing Report only in case of error\n     -queue\tWait until previous instances have finished\n     -options\tIgnore other parameters and show options" 
    110110    IDS_ERROR_DIALOG        "Failed to create window." 
    111111    IDS_ERROR_MAX_INSTANCE  "Maximum instance count reached." 
  • trunk/SchedulerView.cpp

    r47 r53  
    11741174            CListCtrl&      lc          = GetListCtrl(); 
    11751175            int             iCount      = lc.GetItemCount(); 
    1176             DWORD_PTR       iIndex      = 0; 
     1176            INT_PTR         iIndex      = 0; 
    11771177            CScheduleItem   *psiItem    = 0; 
    11781178            CString         str; 
  • trunk/TaskDataPage.cpp

    r47 r53  
    324324    finish_action->SetItemData(finish_action->AddString("Shutdown system"), EWX_SHUTDOWN); 
    325325    finish_action->SetItemData(finish_action->AddString("Restart"), EWX_REBOOT); 
    326     finish_action->SetItemData(finish_action->AddString("Sleep"), -1); 
     326    finish_action->SetItemData(finish_action->AddString("Sleep"), (DWORD_PTR)-1); 
    327327 
    328328    finish_action->SetCurSel(m_iFinishActionInd); 
Note: See TracChangeset for help on using the changeset viewer.