Changeset 1570


Ignore:
Timestamp:
1/18/2010 7:17:47 AM (5 years ago)
Author:
lowjoel
Message:

Compilo fixes from 1552 to 1569 after the huge reshuffling

Location:
branches/eraser6/CodeReview
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs

    r1563 r1570  
    238238                    { 
    239239                        //Prevent the system from sleeping. 
    240                         KernelApi.SetThreadExecutionState(ThreadExecutionState.Continuous | 
    241                             ThreadExecutionState.SystemRequired); 
     240                        Power.ExecutionState = ExecutionState.Continuous | 
     241                            ExecutionState.SystemRequired; 
    242242 
    243243                        //Broadcast the task started event. 
     
    294294                    { 
    295295                        //Allow the system to sleep again. 
    296                         KernelApi.SetThreadExecutionState(ThreadExecutionState.Continuous); 
     296                        Power.ExecutionState = ExecutionState.Continuous; 
    297297 
    298298                        //If the task is a recurring task, reschedule it since we are done. 
     
    708708                        new TaskProgressChangedEventArgs(string.Empty, 0, 0))); 
    709709 
    710                 RecycleBin.EmptyRecycleBin(EmptyRecycleBinOptions.NoConfirmation | 
     710                RecycleBin.Empty(EmptyRecycleBinOptions.NoConfirmation | 
    711711                    EmptyRecycleBinOptions.NoProgressUI | EmptyRecycleBinOptions.NoSound); 
    712712            } 
  • branches/eraser6/CodeReview/Eraser.Util/ConsoleWindow.cs

    r1567 r1570  
    3030    /// object. 
    3131    /// </summary> 
    32     class ConsoleWindow : IDisposable 
     32    public class ConsoleWindow : IDisposable 
    3333    { 
    34         ConsoleWindow() 
     34        public ConsoleWindow() 
    3535        { 
    3636            NativeMethods.AllocConsole(); 
  • branches/eraser6/CodeReview/Eraser.Util/VolumeInfo.cs

    r1569 r1570  
    494494                QueryTime = info.QueryTime; 
    495495                StorageDeviceNumber = info.StorageDeviceNumber; 
    496                 StorageManagerName = new string((char*)info.StorageManagerName); 
     496                StorageManagerName = info.StorageManagerName; 
    497497            } 
    498498 
  • branches/eraser6/CodeReview/Eraser/Program.ConsoleProgram.cs

    r1524 r1570  
    2828 
    2929using Eraser.Manager; 
     30using Eraser.Util; 
    3031 
    3132namespace Eraser 
     
    5657                //Create the console window if we don't have the quiet argument. 
    5758                if (!Arguments.Quiet) 
    58                     if (Util.KernelApi.AllocConsole()) 
    59                     { 
    60                         Console.SetOut(new StreamWriter(Console.OpenStandardOutput())); 
    61                         Console.SetIn(new StreamReader(Console.OpenStandardInput())); 
    62                     } 
     59                    ConsoleWindow = new ConsoleWindow(); 
    6360            } 
    6461 
     
    8784                    Console.ReadLine(); 
    8885 
    89                     Util.KernelApi.FreeConsole(); 
     86                    if (disposing) 
     87                        ConsoleWindow.Dispose(); 
    9088                } 
    9189            } 
     
    128126 
    129127            /// <summary> 
     128            /// The Console Window created by this object. 
     129            /// </summary> 
     130            private ConsoleWindow ConsoleWindow; 
     131 
     132            /// <summary> 
    130133            /// The command line arguments the program was started with. 
    131134            /// </summary> 
Note: See TracChangeset for help on using the changeset viewer.