Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/kernel32/time.cpp

    r21302 r21916  
    3636#include "dbglocal.h"
    3737
     38extern "C" {
    3839
    3940//******************************************************************************
    4041//File time (UTC) to MS-DOS date & time values (also UTC)
    4142//******************************************************************************
    42 BOOL WIN32API FileTimeToDosDateTime(const FILETIME *lpFileTime, LPWORD lpDosDate, 
     43BOOL WIN32API FileTimeToDosDateTime(const FILETIME *lpFileTime, LPWORD lpDosDate,
    4344                                    LPWORD lpDosTime)
    4445{
    … …  
    6061        return FALSE;
    6162    }
    62     return O32_FileTimeToLocalFileTime(lpFileTime, lpLocalTime); 
     63    return O32_FileTimeToLocalFileTime(lpFileTime, lpLocalTime);
    6364}
    6465//******************************************************************************
    6566//Local time to File time (UTC)
    6667//******************************************************************************
    67 BOOL WIN32API LocalFileTimeToFileTime(const FILETIME *lpLocalFileTime, 
     68BOOL WIN32API LocalFileTimeToFileTime(const FILETIME *lpLocalFileTime,
    6869                                      LPFILETIME lpFileTime)
    6970{
    … …  
    9899}
    99100//******************************************************************************
    100 //MS-DOS date & time values (UTC) to File time (also UTC) 
     101//MS-DOS date & time values (UTC) to File time (also UTC)
    101102//******************************************************************************
    102103BOOL WIN32API DosDateTimeToFileTime(WORD wDosDate, WORD wDosTime, LPFILETIME pFileTime)
    103104{
    104105    dprintf(("%x %x", wDosDate, wDosTime));
    105    
     106
    106107    if(pFileTime == NULL) {
    107108        SetLastError(ERROR_INVALID_PARAMETER);
    … …  
    117118}
    118119//******************************************************************************
    119 //The GetLocalTime function retrieves the current local date and time. 
     120//The GetLocalTime function retrieves the current local date and time.
    120121//(in local time)
    121122//******************************************************************************
    … …  
    130131}
    131132//******************************************************************************
    132 //The SetLocalTime function sets the current local time and date. 
     133//The SetLocalTime function sets the current local time and date.
    133134//(in local time)
    134135//******************************************************************************
    … …  
    143144}
    144145//******************************************************************************
    145 //The GetSystemTime function retrieves the current system date and time. 
     146//The GetSystemTime function retrieves the current system date and time.
    146147//The system time is expressed in Coordinated Universal Time (UTC).
    147148//******************************************************************************
    … …  
    157158}
    158159//******************************************************************************
    159 //The SetSystemTime function sets the current system time and date. 
     160//The SetSystemTime function sets the current system time and date.
    160161//The system time is expressed in Coordinated Universal Time (UCT).
    161162//******************************************************************************
    … …  
    185186}
    186187//******************************************************************************
    187 static const LPSTR szTZBias           = "Bias";
    188 static const LPSTR szTZActiveTimeBias = "ActiveTimeBias";
    189 
    190 static const LPWSTR szTZStandardName  = (LPWSTR)L"StandardName";
    191 static const LPSTR szTZStandardBias   = "StandardBias";
    192 static const LPSTR szTZStandardStart  = "StandardStart";
    193 
    194 static const LPWSTR szTZDaylightName  = (LPWSTR)L"DaylightName";
    195 static const LPSTR szTZDaylightBias   = "DaylightBias";
    196 static const LPSTR szTZDaylightStart  = "DaylightStart";
    197 static const LPSTR KEY_WINDOWS_TZ     = "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation";
     188static const LPCSTR szTZBias           = "Bias";
     189static const LPCSTR szTZActiveTimeBias = "ActiveTimeBias";
     190
     191static const LPCWSTR szTZStandardName  = (LPCWSTR)L"StandardName";
     192static const LPCSTR szTZStandardBias   = "StandardBias";
     193static const LPCSTR szTZStandardStart  = "StandardStart";
     194
     195static const LPCWSTR szTZDaylightName  = (LPCWSTR)L"DaylightName";
     196static const LPCSTR szTZDaylightBias   = "DaylightBias";
     197static const LPCSTR szTZDaylightStart  = "DaylightStart";
     198static const LPCSTR KEY_WINDOWS_TZ     = "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation";
    198199//******************************************************************************
    199200DWORD WIN32API GetTimeZoneInformation(LPTIME_ZONE_INFORMATION lpTimeZone)
    … …  
    370371//******************************************************************************
    371372
    372 
     373} // extern "C"
     374
Note: See TracChangeset for help on using the changeset viewer.