Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 38963: Implement KdpSendBuffer, KdpCalculateChecksum, reference: http://www.vista-xp.co.uk/forums/technical-reference-library/2540-basics-debugging.html
by tkreuzer＠svn.reactos.org 20 Jan '09

20 Jan '09

Author: tkreuzer Date: Mon Jan 19 18:42:10 2009 New Revision: 38963 URL: http://svn.reactos.org/svn/reactos?rev=38963&view=rev Log: Implement KdpSendBuffer, KdpCalculateChecksum, reference: http://www.vista-xp.co.uk/forums/technical-reference-library/2540-basics-de… Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Mon Jan 19 18:42:10 2009 @@ -5,6 +5,7 @@ * PURPOSE: Serial i/o functions for the kernel debugger. * PROGRAMMER: Alex Ionescu * Hervé Poussineau + * Timo Kreuzer */ /* INCLUDES *****************************************************************/ @@ -485,8 +486,55 @@ return TRUE; } -/* - * @implemented +/* NEW INTERNAL FUNCTIONS ****************************************************/ + +/****************************************************************************** + * \name KdpCalculateChecksum + * \brief Calculates the checksum for the packet data. + * \param Buffer Pointer to the packet data. + * \param Length Length of data in bytes. + * \return The calculated checksum. + * \sa http://www.vista-xp.co.uk/forums/technical-reference-library/2540-basics-de… + */ +ULONG +NTAPI +KdpCalculateChecksum( + IN PVOID Buffer, + IN ULONG Length) +{ + ULONG i, Checksum = 0; + + for (i = 0; i < Length; i++) + { + Checksum += ((PUCHAR)Buffer)[i]; + } + return Checksum; +} + +/****************************************************************************** + * \name KdpSendBuffer + * \brief Sends a buffer of data to the KD port. + * \param Buffer Pointer to the data. + * \param Size Size of data in bytes. + */ +VOID +NTAPI +KdpSendBuffer( + IN PVOID Buffer, + IN ULONG Size) +{ + INT i; + for (i = 0; i < Size; i++) + { + KdPortPutByteEx(&DefaultPort, ((PUCHAR)Buffer)[i]); + } +} + +/****************************************************************************** + * \name KdDebuggerInitialize0 + * \brief Phase 0 initialization. + * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. + * \return Status */ NTSTATUS NTAPI @@ -595,8 +643,11 @@ return STATUS_SUCCESS; } -/* - * @unimplemented +/****************************************************************************** + * \name KdDebuggerInitialize0 + * \brief Phase 0 initialization. + * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. + * \return Status */ NTSTATUS NTAPI

1 0

[silverblade] 38962: setupldr previously worked by faking the FreeLdr OS menu function. Now FreeLdr has a special OS type for ReactOS Setup, which will only work for the bootcd. As a result, bootcd can display a menu now. This opens up the possibility of including both a "live" environment for users to play with as well as the opportunity to install, from the same disc.
by silverblade＠svn.reactos.org 19 Jan '09

19 Jan '09

Author: silverblade Date: Mon Jan 19 17:38:08 2009 New Revision: 38962 URL: http://svn.reactos.org/svn/reactos?rev=38962&view=rev Log: setupldr previously worked by faking the FreeLdr OS menu function. Now FreeLdr has a special OS type for ReactOS Setup, which will only work for the bootcd. As a result, bootcd can display a menu now. This opens up the possibility of including both a "live" environment for users to play with as well as the opportunity to install, from the same disc. Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Mon Jan 19 17:38:08 2009 @@ -115,6 +115,14 @@ { LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]); } +#ifdef FREELDR_ROS_SETUP + else if (_stricmp(SettingValue, "ReactOSSetup") == 0) + { + // Could probably pass the selection across at a later date + // which might be useful for different install methods? + RunReactOSSetup(); + } +#endif #ifdef __i386__ else if (_stricmp(SettingValue, "WindowsNT40") == 0) { Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Mon Jan 19 17:38:08 2009 @@ -77,6 +77,12 @@ <file>version.c</file> <file>cmdline.c</file> <file>machine.c</file> + <file>drivemap.c</file> + <file>miscboot.c</file> + <file>options.c</file> + <file>linuxboot.c</file> + <file>oslist.c</file> + <file>custom.c</file> <directory name="include"> <pch>freeldr.h</pch> </directory> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] Mon Jan 19 17:38:08 2009 @@ -7,10 +7,4 @@ <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <file>bootmgr.c</file> - <file>drivemap.c</file> - <file>miscboot.c</file> - <file>options.c</file> - <file>linuxboot.c</file> - <file>oslist.c</file> - <file>custom.c</file> </module> Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Mon Jan 19 17:38:08 2009 @@ -107,5 +107,6 @@ VOID BootMain(LPSTR CmdLine); VOID RunLoader(VOID); +VOID RunReactOSSetup(VOID); #endif // defined __FREELDR_H Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Mon Jan 19 17:38:08 2009 @@ -42,7 +42,7 @@ #define USE_UI -VOID RunLoader(VOID) +VOID RunReactOSSetup(VOID) { ULONG i; LPCSTR SourcePath; Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Mon Jan 19 17:38:08 2009 @@ -4,11 +4,15 @@ <include base="setupldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> + <define name="FREELDR_ROS_SETUP" /> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <compilerflag>-Os</compilerflag> + + <file>bootmgr.c</file> + <directory name="inffile"> <file>inffile.c</file> </directory>

1 0

[sginsberg] 38961: - Add 32-bit versions to wdbgexts.h - Add lots of missing definitions to windbgkd.h, gathered from Singularity, tinykrnl, articles, blogs, etc
by sginsberg＠svn.reactos.org 19 Jan '09

19 Jan '09

Author: sginsberg Date: Mon Jan 19 17:34:27 2009 New Revision: 38961 URL: http://svn.reactos.org/svn/reactos?rev=38961&view=rev Log: - Add 32-bit versions to wdbgexts.h - Add lots of missing definitions to windbgkd.h, gathered from Singularity, tinykrnl, articles, blogs, etc Modified: trunk/reactos/include/psdk/wdbgexts.h trunk/reactos/include/reactos/windbgkd.h Modified: trunk/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wdbgexts.h?re… ============================================================================== --- trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] Mon Jan 19 17:34:27 2009 @@ -21,6 +21,101 @@ #define DBGKD_VERS_FLAG_PARTITIONS 0x0020 #define KDBG_TAG TAG('K', 'D', 'B', 'G') + +typedef struct _DBGKD_GET_VERSION32 +{ + USHORT MajorVersion; + USHORT MinorVersion; + USHORT ProtocolVersion; + USHORT Flags; + ULONG KernBase; + ULONG PsLoadedModuleList; + USHORT MachineType; + USHORT ThCallbackStack; + USHORT NextCallback; + USHORT FramePointer; + ULONG KiCallUserMode; + ULONG KeUserCallbackDispatcher; + ULONG BreakpointWithStatus; + ULONG DebuggerDataList; +} DBGKD_GET_VERSION32, *PDBGKD_GET_VERSION32; + +typedef struct _DBGKD_DEBUG_DATA_HEADER32 +{ + LIST_ENTRY32 List; + ULONG OwnerTag; + ULONG Size; +} DBGKD_DEBUG_DATA_HEADER32, *PDBGKD_DEBUG_DATA_HEADER32; + +typedef struct _KDDEBUGGER_DATA32 +{ + DBGKD_DEBUG_DATA_HEADER32 Header; + ULONG KernBase; + ULONG BreakpointWithStatus; + ULONG SavedContext; + USHORT ThCallbackStack; + USHORT NextCallback; + USHORT FramePointer; + USHORT PaeEnabled:1; + ULONG KiCallUserMode; + ULONG KeUserCallbackDispatcher; + ULONG PsLoadedModuleList; + ULONG PsActiveProcessHead; + ULONG PspCidTable; + ULONG ExpSystemResourcesList; + ULONG ExpPagedPoolDescriptor; + ULONG ExpNumberOfPagedPools; + ULONG KeTimeIncrement; + ULONG KeBugCheckCallbackListHead; + ULONG KiBugcheckData; + ULONG IopErrorLogListHead; + ULONG ObpRootDirectoryObject; + ULONG ObpTypeObjectType; + ULONG MmSystemCacheStart; + ULONG MmSystemCacheEnd; + ULONG MmSystemCacheWs; + ULONG MmPfnDatabase; + ULONG MmSystemPtesStart; + ULONG MmSystemPtesEnd; + ULONG MmSubsectionBase; + ULONG MmNumberOfPagingFiles; + ULONG MmLowestPhysicalPage; + ULONG MmHighestPhysicalPage; + ULONG MmNumberOfPhysicalPages; + ULONG MmMaximumNonPagedPoolInBytes; + ULONG MmNonPagedSystemStart; + ULONG MmNonPagedPoolStart; + ULONG MmNonPagedPoolEnd; + ULONG MmPagedPoolStart; + ULONG MmPagedPoolEnd; + ULONG MmPagedPoolInformation; + ULONG MmPageSize; + ULONG MmSizeOfPagedPoolInBytes; + ULONG MmTotalCommitLimit; + ULONG MmTotalCommittedPages; + ULONG MmSharedCommit; + ULONG MmDriverCommit; + ULONG MmProcessCommit; + ULONG MmPagedPoolCommit; + ULONG MmExtendedCommit; + ULONG MmZeroedPageListHead; + ULONG MmFreePageListHead; + ULONG MmStandbyPageListHead; + ULONG MmModifiedPageListHead; + ULONG MmModifiedNoWritePageListHead; + ULONG MmAvailablePages; + ULONG MmResidentAvailablePages; + ULONG PoolTrackTable; + ULONG NonPagedPoolDescriptor; + ULONG MmHighestUserAddress; + ULONG MmSystemRangeStart; + ULONG MmUserProbeAddress; + ULONG KdPrintCircularBuffer; + ULONG KdPrintCircularBufferEnd; + ULONG KdPrintWritePointer; + ULONG KdPrintRolloverCount; + ULONG MmLoadedUserImageList; +} KDDEBUGGER_DATA32, *PKDDEBUGGER_DATA32; typedef struct _DBGKD_GET_VERSION64 { Modified: trunk/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/windbgkd.h… ============================================================================== --- trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] Mon Jan 19 17:34:27 2009 @@ -60,6 +60,12 @@ #define DbgKdLoadSymbolsStateChange 0x00003031 #define DbgKdCommandStringStateChange 0x00003032 #define DbgKdMaximumStateChange 0x00003033 + +// +// This is combined with the basic state change code +// if the state is from an alternate source +// +#define DbgKdAlternateStateChange 0x00010000 // // Manipulate Types @@ -114,6 +120,25 @@ #define DbgKdGetStringApi 0x00003231 // +// Trace I/O Types +// +#define DbgKdPrintTraceApi 0x00003330 + +// +// Control Request Types +// +#define DbgKdRequestHardwareBp 0x00004300 +#define DbgKdReleaseHardwareBp 0x00004301 + +// +// File I/O Types +// +#define DbgKdCreateFileApi 0x00003430 +#define DbgKdReadFileApi 0x00003431 +#define DbgKdWriteFileApi 0x00003432 +#define DbgKdCloseFileApi 0x00003433 + +// // Control Report Flags // #define REPORT_INCLUDES_SEGS 0x0001 @@ -140,6 +165,34 @@ #define DBGKD_QUERY_MEMORY_WRITE 0x02 #define DBGKD_QUERY_MEMORY_EXECUTE 0x04 #define DBGKD_QUERY_MEMORY_FIXED 0x08 + +// +// Internal Breakpoint Flags +// +#define DBGKD_INTERNAL_BP_FLAG_COUNTONLY 0x01 +#define DBGKD_INTERNAL_BP_FLAG_INVALID 0x02 +#define DBGKD_INTERNAL_BP_FLAG_SUSPENDED 0x04 +#define DBGKD_INTERNAL_BP_FLAG_DYING 0x08 + +// +// Fill Memory Flags +// +#define DBGKD_FILL_MEMORY_VIRTUAL 0x01 +#define DBGKD_FILL_MEMORY_PHYSICAL 0x002 + +// +// Physical Memory Caching Flags +// +#define DBGKD_CACHING_DEFAULT 0 +#define DBGKD_CACHING_CACHED 1 +#define DBGKD_CACHING_UNCACHED 2 +#define DBGKD_CACHING_WRITE_COMBINED 3 + +// +// Partition Switch Flags +// +#define DBGKD_PARTITION_DEFAULT 0x00 +#define DBGKD_PARTITION_ALTERNATE 0x01 // // KD Packet Structure @@ -189,6 +242,13 @@ ULONG64 CurrentSymbolEnd; } AMD64_DBGKD_CONTROL_SET, *PAMD64_DBGKD_CONTROL_SET; +typedef struct _ARM_DBGKD_CONTROL_SET +{ + ULONG Continue; + ULONG CurrentSymbolStart; + ULONG CurrentSymbolEnd; +} ARM_DBGKD_CONTROL_SET, *PARM_DBGKD_CONTROL_SET; + typedef struct _DBGKD_ANY_CONTROL_SET { union @@ -196,15 +256,22 @@ X86_DBGKD_CONTROL_SET X86ControlSet; IA64_DBGKD_CONTROL_SET IA64ControlSet; AMD64_DBGKD_CONTROL_SET Amd64ControlSet; + ARM_DBGKD_CONTROL_SET ArmControlSet; }; } DBGKD_ANY_CONTROL_SET, *PDBGKD_ANY_CONTROL_SET; #include <poppack.h> -typedef X86_DBGKD_CONTROL_SET DBGKD_CONTROL_SET; +typedef X86_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; // // DBGKM Structure for Exceptions // +typedef struct _DBGKM_EXCEPTION32 +{ + EXCEPTION_RECORD32 ExceptionRecord; + ULONG FirstChance; +} DBGKM_EXCEPTION32, *PDBGKM_EXCEPTION32; + typedef struct _DBGKM_EXCEPTION64 { EXCEPTION_RECORD64 ExceptionRecord; @@ -214,10 +281,37 @@ // // DBGKD Structure for State Change // -typedef struct _DBGKD_CONTROL_REPORT -{ - ULONG Dr6; - ULONG Dr7; +typedef struct _X86_DBGKD_CONTROL_REPORT +{ + ULONG Dr6; + ULONG Dr7; + USHORT InstructionCount; + USHORT ReportFlags; + UCHAR InstructionStream[DBGKD_MAXSTREAM]; + USHORT SegCs; + USHORT SegDs; + USHORT SegEs; + USHORT SegFs; + ULONG EFlags; +} X86_DBGKD_CONTROL_REPORT, *PX86_DBGKD_CONTROL_REPORT; + +typedef struct _ALPHA_DBGKD_CONTROL_REPORT +{ + ULONG InstructionCount; + UCHAR InstructionStream[DBGKD_MAXSTREAM]; +} ALPHA_DBGKD_CONTROL_REPORT, *PALPHA_DBGKD_CONTROL_REPORT; + +typedef struct _IA64_DBGKD_CONTROL_REPORT +{ + ULONG InstructionCount; + UCHAR InstructionStream[DBGKD_MAXSTREAM]; +} IA64_DBGKD_CONTROL_REPORT, *PIA64_DBGKD_CONTROL_REPORT; + +typedef struct _AMD64_DBGKD_CONTROL_REPORT +{ + ULONG64 Dr6; + ULONG64 Dr7; + ULONG EFlags; USHORT InstructionCount; USHORT ReportFlags; UCHAR InstructionStream[DBGKD_MAXSTREAM]; @@ -225,8 +319,20 @@ USHORT SegDs; USHORT SegEs; USHORT SegFs; - ULONG EFlags; -} DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; +} AMD64_DBGKD_CONTROL_REPORT, *PAMD64_DBGKD_CONTROL_REPORT; + +typedef X86_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT; + +typedef struct _DBGKD_ANY_CONTROL_REPORT +{ + union + { + X86_DBGKD_CONTROL_REPORT X86ControlReport; + ALPHA_DBGKD_CONTROL_REPORT AlphaControlReport; + IA64_DBGKD_CONTROL_REPORT IA64ControlReport; + AMD64_DBGKD_CONTROL_REPORT Amd64ControlReport; + }; +} DBGKD_ANY_CONTROL_REPORT, *PDBGKD_ANY_CONTROL_REPORT; // // DBGKD Structure for Debug I/O Type Print String @@ -261,8 +367,28 @@ } DBGKD_DEBUG_IO, *PDBGKD_DEBUG_IO; // +// DBGkD Structure for Command String +// +typedef struct _DBGKD_COMMAND_STRING +{ + ULONG Flags; + ULONG Reserved1; + ULONG64 Reserved2[7]; +} DBGKD_COMMAND_STRING, *PDBGKD_COMMAND_STRING; + +// // DBGKD Structure for Load Symbols // +typedef struct _DBGKD_LOAD_SYMBOLS32 +{ + ULONG PathNameLength; + ULONG BaseOfDll; + ULONG ProcessId; + ULONG CheckSum; + ULONG SizeOfImage; + BOOLEAN UnloadSymbols; +} DBGKD_LOAD_SYMBOLS32, *PDBGKD_LOAD_SYMBOLS32; + typedef struct _DBGKD_LOAD_SYMBOLS64 { ULONG PathNameLength; @@ -276,6 +402,24 @@ // // DBGKD Structure for Wait State Change // + +typedef struct _DBGKD_WAIT_STATE_CHANGE32 +{ + ULONG NewState; + USHORT ProcessorLevel; + USHORT Processor; + ULONG NumberProcessors; + ULONG Thread; + ULONG ProgramCounter; + union + { + DBGKM_EXCEPTION32 Exception; + DBGKD_LOAD_SYMBOLS32 LoadSymbols; + } u; + DBGKD_CONTROL_REPORT ControlReport; + CONTEXT Context; +} DBGKD_WAIT_STATE_CHANGE32, *PDBGKD_WAIT_STATE_CHANGE32; + typedef struct _DBGKD_WAIT_STATE_CHANGE64 { ULONG NewState; @@ -293,9 +437,37 @@ CONTEXT Context; } DBGKD_WAIT_STATE_CHANGE64, *PDBGKD_WAIT_STATE_CHANGE64; +typedef struct _DBGKD_ANY_WAIT_STATE_CHANGE +{ + ULONG NewState; + USHORT ProcessorLevel; + USHORT Processor; + ULONG NumberProcessors; + ULONG64 Thread; + ULONG64 ProgramCounter; + union + { + DBGKM_EXCEPTION64 Exception; + DBGKD_LOAD_SYMBOLS64 LoadSymbols; + DBGKD_COMMAND_STRING CommandString; + } u; + union + { + DBGKD_CONTROL_REPORT ControlReport; + DBGKD_ANY_CONTROL_REPORT AnyControlReport; + }; +} DBGKD_ANY_WAIT_STATE_CHANGE, *PDBGKD_ANY_WAIT_STATE_CHANGE; + // // DBGKD Manipulate Structures // +typedef struct _DBGKD_READ_MEMORY32 +{ + ULONG TargetBaseAddress; + ULONG TransferCount; + ULONG ActualBytesRead; +} DBGKD_READ_MEMORY32, *PDBGKD_READ_MEMORY32; + typedef struct _DBGKD_READ_MEMORY64 { ULONG64 TargetBaseAddress; @@ -303,6 +475,13 @@ ULONG ActualBytesRead; } DBGKD_READ_MEMORY64, *PDBGKD_READ_MEMORY64; +typedef struct _DBGKD_WRITE_MEMORY32 +{ + ULONG TargetBaseAddress; + ULONG TransferCount; + ULONG ActualBytesWritten; +} DBGKD_WRITE_MEMORY32, *PDBGKD_WRITE_MEMORY32; + typedef struct _DBGKD_WRITE_MEMORY64 { ULONG64 TargetBaseAddress; @@ -319,6 +498,12 @@ { ULONG ContextFlags; } DBGKD_SET_CONTEXT, *PDBGKD_SET_CONTEXT; + +typedef struct _DBGKD_WRITE_BREAKPOINT32 +{ + ULONG BreakPointAddress; + ULONG BreakPointHandle; +} DBGKD_WRITE_BREAKPOINT32, *PDBGKD_WRITE_BREAKPOINT32; typedef struct _DBGKD_WRITE_BREAKPOINT64 { @@ -348,12 +533,29 @@ } DBGKD_CONTINUE2, *PDBGKD_CONTINUE2; #include <poppack.h> +typedef struct _DBGKD_READ_WRITE_IO32 +{ + ULONG IoAddress; + ULONG DataSize; + ULONG DataValue; +} DBGKD_READ_WRITE_IO32, *PDBGKD_READ_WRITE_IO32; + typedef struct _DBGKD_READ_WRITE_IO64 { ULONG64 IoAddress; ULONG DataSize; ULONG DataValue; } DBGKD_READ_WRITE_IO64, *PDBGKD_READ_WRITE_IO64; + +typedef struct _DBGKD_READ_WRITE_IO_EXTENDED32 +{ + ULONG DataSize; + ULONG InterfaceType; + ULONG BusNumber; + ULONG AddressSpace; + ULONG IoAddress; + ULONG DataValue; +} DBGKD_READ_WRITE_IO_EXTENDED32, *PDBGKD_READ_WRITE_IO_EXTENDED32; typedef struct _DBGKD_READ_WRITE_IO_EXTENDED64 { @@ -377,16 +579,38 @@ ULONG NumberOfSpecialCalls; } DBGKD_QUERY_SPECIAL_CALLS, *PDBGKD_QUERY_SPECIAL_CALLS; +typedef struct _DBGKD_SET_SPECIAL_CALL32 +{ + ULONG SpecialCall; +} DBGKD_SET_SPECIAL_CALL32, *PDBGKD_SET_SPECIAL_CALL32; + typedef struct _DBGKD_SET_SPECIAL_CALL64 { ULONG64 SpecialCall; } DBGKD_SET_SPECIAL_CALL64, *PDBGKD_SET_SPECIAL_CALL64; + +typedef struct _DBGKD_SET_INTERNAL_BREAKPOINT32 +{ + ULONG BreakpointAddress; + ULONG Flags; +} DBGKD_SET_INTERNAL_BREAKPOINT32, *PDBGKD_SET_INTERNAL_BREAKPOINT32; typedef struct _DBGKD_SET_INTERNAL_BREAKPOINT64 { ULONG64 BreakpointAddress; ULONG Flags; } DBGKD_SET_INTERNAL_BREAKPOINT64, *PDBGKD_SET_INTERNAL_BREAKPOINT64; + +typedef struct _DBGKD_GET_INTERNAL_BREAKPOINT32 +{ + ULONG BreakpointAddress; + ULONG Flags; + ULONG Calls; + ULONG MaxCallsPerPeriod; + ULONG MinInstructions; + ULONG MaxInstructions; + ULONG TotalInstructions; +} DBGKD_GET_INTERNAL_BREAKPOINT32, *PDBGKD_GET_INTERNAL_BREAKPOINT32; typedef struct _DBGKD_GET_INTERNAL_BREAKPOINT64 { @@ -449,6 +673,41 @@ // // DBGKD Structure for Manipulate // +typedef struct _DBGKD_MANIPULATE_STATE32 +{ + ULONG ApiNumber; + USHORT ProcessorLevel; + USHORT Processor; + NTSTATUS ReturnStatus; + union + { + DBGKD_READ_MEMORY32 ReadMemory; + DBGKD_WRITE_MEMORY32 WriteMemory; + DBGKD_READ_MEMORY64 ReadMemory64; + DBGKD_WRITE_MEMORY64 WriteMemory64; + DBGKD_GET_CONTEXT GetContext; + DBGKD_SET_CONTEXT SetContext; + DBGKD_WRITE_BREAKPOINT32 WriteBreakPoint; + DBGKD_RESTORE_BREAKPOINT RestoreBreakPoint; + DBGKD_CONTINUE Continue; + DBGKD_CONTINUE2 Continue2; + DBGKD_READ_WRITE_IO32 ReadWriteIo; + DBGKD_READ_WRITE_IO_EXTENDED32 ReadWriteIoExtended; + DBGKD_QUERY_SPECIAL_CALLS QuerySpecialCalls; + DBGKD_SET_SPECIAL_CALL32 SetSpecialCall; + DBGKD_SET_INTERNAL_BREAKPOINT32 SetInternalBreakpoint; + DBGKD_GET_INTERNAL_BREAKPOINT32 GetInternalBreakpoint; + DBGKD_GET_VERSION32 GetVersion32; + DBGKD_BREAKPOINTEX BreakPointEx; + DBGKD_READ_WRITE_MSR ReadWriteMsr; + DBGKD_SEARCH_MEMORY SearchMemory; + DBGKD_GET_SET_BUS_DATA GetSetBusData; + DBGKD_FILL_MEMORY FillMemory; + DBGKD_QUERY_MEMORY QueryMemory; + DBGKD_SWITCH_PARTITION SwitchPartition; + } u; +} DBGKD_MANIPULATE_STATE32, *PDBGKD_MANIPULATE_STATE32; + typedef struct _DBGKD_MANIPULATE_STATE64 { ULONG ApiNumber; @@ -482,6 +741,99 @@ } u; } DBGKD_MANIPULATE_STATE64, *PDBGKD_MANIPULATE_STATE64; +// +// File I/O Structure +// +typedef struct _DBGKD_CREATE_FILE +{ + ULONG DesiredAccess; + ULONG FileAttributes; + ULONG ShareAccess; + ULONG CreateDisposition; + ULONG CreateOptions; + ULONG64 Handle; + ULONG64 Length; +} DBGKD_CREATE_FILE, *PDBGKD_CREATE_FILE; + +typedef struct _DBGKD_READ_FILE +{ + ULONG64 Handle; + ULONG64 Offset; + ULONG Length; +} DBGKD_READ_FILE, *PDBGKD_READ_FILE; + +typedef struct _DBGKD_WRITE_FILE +{ + ULONG64 Handle; + ULONG64 Offset; + ULONG Length; +} DBGKD_WRITE_FILE, *PDBGKD_WRITE_FILE; + +typedef struct _DBGKD_CLOSE_FILE +{ + ULONG64 Handle; +} DBGKD_CLOSE_FILE, *PDBGKD_CLOSE_FILE; + +typedef struct _DBGKD_FILE_IO +{ + ULONG ApiNumber; + ULONG Status; + union + { + ULONG64 ReserveSpace[7]; + DBGKD_CREATE_FILE CreateFile; + DBGKD_READ_FILE ReadFile; + DBGKD_WRITE_FILE WriteFile; + DBGKD_CLOSE_FILE CloseFile; + } u; +} DBGKD_FILE_IO, *PDBGKD_FILE_IO; + + +// +// Control Request Structure +// +typedef struct _DBGKD_REQUEST_BREAKPOINT +{ + ULONG HardwareBreakPointNumber; + ULONG Available; +} DBGKD_REQUEST_BREAKPOINT, *PDBGKD_REQUEST_BREAKPOINT; + +typedef struct _DBGKD_RELEASE_BREAKPOINT +{ + ULONG HardwareBreakPointNumber; + ULONG Released; +} DBGKD_RELEASE_BREAKPOINT, *PDBGKD_RELEASE_BREAKPOINT; + +typedef struct _DBGKD_CONTROL_REQUEST +{ + ULONG ApiNumber; + union + { + DBGKD_REQUEST_BREAKPOINT RequestBreakpoint; + DBGKD_RELEASE_BREAKPOINT ReleaseBreakpoint; + } u; +} DBGKD_CONTROL_REQUEST, *PDBGKD_CONTROL_REQUEST; + +// +// Trace I/O Structure +// +typedef struct _DBGKD_PRINT_TRACE +{ + ULONG LengthOfData; +} DBGKD_PRINT_TRACE, *PDBGKD_PRINT_TRACE; + +typedef struct _DBGKD_TRACE_IO +{ + ULONG ApiNumber; + USHORT ProcessorLevel; + USHORT Processor; + union + { + ULONG64 ReserveSpace[7]; + DBGKD_PRINT_TRACE PrintTrace; + } u; +} DBGKD_TRACE_IO, *PDBGKD_TRACE_IO; + FORCEINLINE VOID ExceptionRecord32To64(IN PEXCEPTION_RECORD32 Ex32,

1 0

[sginsberg] 38960: Fix the completely retarded implementation of KdComPortInUse. The original definition of this variable seems to have been based on the retarded type in the serial.sys source sample, which defines it as: extern PUCHAR *KdComPortInUse; This, somehow, works in MSVC, but gcc complains about the lack of import specifier (KdComPortInUse is exported by HAL). This was 'fixed' by adding the import specifier to ros. So instead of: PUCHAR *KdComPortInUse; We ended up with: NTHALAPI PUCHA
by sginsberg＠svn.reactos.org 19 Jan '09

19 Jan '09

Author: sginsberg Date: Mon Jan 19 17:22:22 2009 New Revision: 38960 URL: http://svn.reactos.org/svn/reactos?rev=38960&view=rev Log: Fix the completely retarded implementation of KdComPortInUse. The original definition of this variable seems to have been based on the retarded type in the serial.sys source sample, which defines it as: extern PUCHAR *KdComPortInUse; This, somehow, works in MSVC, but gcc complains about the lack of import specifier (KdComPortInUse is exported by HAL). This was 'fixed' by adding the import specifier to ros. So instead of: PUCHAR *KdComPortInUse; We ended up with: NTHALAPI PUCHAR *KdComPortInUse; Which becomes 3 dereferences instead of 2, which is incorrect. This was 'fixed' by hacking the variable in HAL too. Use "extern PUCHAR NTHALAPI KdComPortInUse" to be compatible with both compilers, remove the HAL hacks, and fix the usage of the variable. Fixes the serial.sys crash when booted with _WINKD_ + kdcom from Windows 2003, as kdcom would (due to the HAL hack) set the internal 'pointer' to the port value, and serial would end up dereferencing the port address Modified: trunk/reactos/drivers/base/kdcom/i386/kdbg.c trunk/reactos/drivers/bus/acpi/ospm/fdo.c trunk/reactos/drivers/serial/serial/pnp.c trunk/reactos/hal/hal/hal.c trunk/reactos/hal/hal/hal.pspec trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/hal/halarm/include/halp.h trunk/reactos/hal/halppc/generic/sysinfo.c trunk/reactos/hal/halppc/include/halp.h trunk/reactos/hal/halx86/generic/sysinfo.c trunk/reactos/include/ndk/haltypes.h trunk/reactos/ntoskrnl/kd/kdio.c Modified: trunk/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/i386/kd… ============================================================================== --- trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -231,7 +231,7 @@ return FALSE; /* set global info */ - *KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress; + KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress; return TRUE; } Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/fdo.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -402,7 +402,7 @@ case io: { IO_RESOURCE *io_data = (IO_RESOURCE*) &resource->data; - if (*KdComPortInUse == ULongToPtr(io_data->min_base_address)) + if (KdComPortInUse == (PUCHAR)io_data->min_base_address) { ExFreePool(Buffer.pointer); return TRUE; Modified: trunk/reactos/drivers/serial/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/pnp.… ============================================================================== --- trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -223,7 +223,8 @@ ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); /* Test if we are trying to start the serial port used for debugging */ - if (*KdComPortInUse == ULongToPtr(DeviceExtension->BaseAddress)) + DPRINT1("Comparing addresses: KdComPortInUse: %p, ComPortBase: %p\n", KdComPortInUse, ComPortBase); + if (KdComPortInUse == ComPortBase) { INFO_(SERIAL, "Failing IRP_MN_START_DEVICE as this serial port is used for debugging\n"); return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=38960&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.c [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -27,7 +27,7 @@ /* DATA **********************************************************************/ -ULONG _KdComPortInUse = 0; +PUCHAR KdComPortInUse; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/hal/hal/hal.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.pspec?rev=3896… ============================================================================== --- trunk/reactos/hal/hal/hal.pspec [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.pspec [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -78,7 +78,7 @@ @ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation @ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable @ stdcall KeAcquireSpinLock(ptr ptr) -@ extern KdComPortInUse _KdComPortInUse +@ extern KdComPortInUse @ stdcall KeFlushWriteBuffer() @ stdcall KeGetCurrentIrql() @ stdcall KeLowerIrql(long) Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -27,7 +27,7 @@ /* DATA **********************************************************************/ ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; -ULONG _KdComPortInUse = 0; +PUCHAR KdComPortInUse; ULONG HalpIrqlTable[HIGH_LEVEL + 1] = { Modified: trunk/reactos/hal/halarm/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halarm/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/include/halp.h [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -14,9 +14,4 @@ #include <peripherals/pl190.h> #include <peripherals/sp804.h> -// -// WDK Hack -// -#define KdComPortInUse _KdComPortInUse - #endif /* __INTERNAL_HAL_HAL_H */ Modified: trunk/reactos/hal/halppc/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halppc/generic/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/sysinfo.c [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -12,8 +12,7 @@ #define NDEBUG #include <debug.h> -#define KdComPortInUse _KdComPortInUse -ULONG KdComPortInUse = 0; +PUCHAR KdComPortInUse; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/hal/halppc/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halppc/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/include/halp.h [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -7,9 +7,6 @@ /* Temporary hack */ #define KPCR_BASE 0xFF000000 - -/* WDK Hack */ -#define KdComPortInUse _KdComPortInUse #define HAL_APC_REQUEST 0 #define HAL_DPC_REQUEST 1 Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/sysinfo.c [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -12,12 +12,7 @@ #define NDEBUG #include <debug.h> -#ifdef __GNUC__ -static PUCHAR realKdComPortInUse = 0; -PUCHAR *_KdComPortInUse = &realKdComPortInUse; -#else -PUCHAR _KdComPortInUse = 0; -#endif +PUCHAR KdComPortInUse; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/haltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/haltypes.h [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -223,12 +223,10 @@ // // HAL Exports // -#ifndef _NTHAL_ -extern NTHALAPI PUCHAR *KdComPortInUse; -#endif - -#endif -#endif - - - +extern PUCHAR NTHALAPI KdComPortInUse; + +#endif +#endif + + + Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=389… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Mon Jan 19 17:22:22 2009 @@ -97,7 +97,7 @@ if (BootPhase == 0) { - *KdComPortInUse = NULL; + KdComPortInUse = NULL; /* Write out the functions that we support for now */ DispatchTable->KdpInitRoutine = KdpInitDebugLog; @@ -182,7 +182,7 @@ KdpDebugMode.Serial = FALSE; return; } - *KdComPortInUse = (PUCHAR)(ULONG_PTR)SerialPortInfo.BaseAddress; + KdComPortInUse = (PUCHAR)(ULONG_PTR)SerialPortInfo.BaseAddress; /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList);

1 0

[tkreuzer] 38959: go back to no debugging channels in freeldr
by tkreuzer＠svn.reactos.org 19 Jan '09

19 Jan '09

Author: tkreuzer Date: Mon Jan 19 17:02:13 2009 New Revision: 38959 URL: http://svn.reactos.org/svn/reactos?rev=38959&view=rev Log: go back to no debugging channels in freeldr Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Mon Jan 19 17:02:13 2009 @@ -26,8 +26,8 @@ //#define DEBUG_ALL //#define DEBUG_INIFILE //#define DEBUG_REACTOS -#define DEBUG_CUSTOM -//#define DEBUG_NONE +//#define DEBUG_CUSTOM +#define DEBUG_NONE #if defined (DEBUG_ALL) ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | DPRINT_FILESYSTEM |

1 0

[sginsberg] 38958: - Re-add allowwarnings="true" for wrc too - Re-add the wmc header fix too, accidentally reverted in previous commit
by sginsberg＠svn.reactos.org 19 Jan '09

19 Jan '09

Author: sginsberg Date: Mon Jan 19 16:54:50 2009 New Revision: 38958 URL: http://svn.reactos.org/svn/reactos?rev=38958&view=rev Log: - Re-add allowwarnings="true" for wrc too - Re-add the wmc header fix too, accidentally reverted in previous commit Modified: trunk/reactos/tools/wmc/wmctypes.h trunk/reactos/tools/wrc/wrc.rbuild Modified: trunk/reactos/tools/wmc/wmctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmctypes.h?rev=3… ============================================================================== --- trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] Mon Jan 19 16:54:50 2009 @@ -22,6 +22,7 @@ #define __WMC_WMCTYPES_H #include <stdarg.h> +#include <string.h> #include <host/typedefs.h> /* Byteordering defines */ Modified: trunk/reactos/tools/wrc/wrc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.rbuild?rev=3… ============================================================================== --- trunk/reactos/tools/wrc/wrc.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/wrc.rbuild [iso-8859-1] Mon Jan 19 16:54:50 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="wrc" type="buildtool"> +<module name="wrc" type="buildtool" allowwarnings="true"> <define name="WINE_UNICODE_API">" "</define> <include base="unicode" /> <include base="wpp" />

1 0

[sginsberg] 38957: - Sorry, this broke build on certain Linux hosts
by sginsberg＠svn.reactos.org 19 Jan '09

19 Jan '09

Author: sginsberg Date: Mon Jan 19 16:19:00 2009 New Revision: 38957 URL: http://svn.reactos.org/svn/reactos?rev=38957&view=rev Log: - Sorry, this broke build on certain Linux hosts Modified: trunk/reactos/tools/widl/widl.rbuild trunk/reactos/tools/wmc/wmc.rbuild trunk/reactos/tools/wmc/wmctypes.h trunk/reactos/tools/wpp/wpp.rbuild Modified: trunk/reactos/tools/widl/widl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.rbuild?rev… ============================================================================== --- trunk/reactos/tools/widl/widl.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widl.rbuild [iso-8859-1] Mon Jan 19 16:19:00 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="widl" type="buildtool"> +<module name="widl" type="buildtool" allowwarnings="true"> <define name="INT16">SHORT</define> <define name="YYDEBUG">1</define> <include base="wpp">.</include> Modified: trunk/reactos/tools/wmc/wmc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.rbuild?rev=3… ============================================================================== --- trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] Mon Jan 19 16:19:00 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="wmc" type="buildtool"> +<module name="wmc" type="buildtool" allowwarnings="true"> <define name="WINE_UNICODE_API">" "</define> <include base="unicode">.</include> <library>unicode</library> Modified: trunk/reactos/tools/wmc/wmctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmctypes.h?rev=3… ============================================================================== --- trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] Mon Jan 19 16:19:00 2009 @@ -22,7 +22,6 @@ #define __WMC_WMCTYPES_H #include <stdarg.h> -#include <string.h> #include <host/typedefs.h> /* Byteordering defines */ Modified: trunk/reactos/tools/wpp/wpp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.rbuild?rev=3… ============================================================================== --- trunk/reactos/tools/wpp/wpp.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/wpp.rbuild [iso-8859-1] Mon Jan 19 16:19:00 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="wpp" type="hoststaticlibrary"> +<module name="wpp" type="hoststaticlibrary" allowwarnings="true"> <file>lex.yy.c</file> <file>preproc.c</file> <file>wpp.c</file>

1 0

[tkreuzer] 38956: crt update: - initial implementation of secure crt functions for vista compatibility (implement _get_invalid_parameter_handler, _set_invalid_parameter_handler, _invalid_parameter) - rewrite time apis, add TLS support, add 64bit time functions and secure crt function support
by tkreuzer＠svn.reactos.org 19 Jan '09

19 Jan '09

Author: tkreuzer Date: Mon Jan 19 16:05:27 2009 New Revision: 38956 URL: http://svn.reactos.org/svn/reactos?rev=38956&view=rev Log: crt update: - initial implementation of secure crt functions for vista compatibility (implement _get_invalid_parameter_handler, _set_invalid_parameter_handler, _invalid_parameter) - rewrite time apis, add TLS support, add 64bit time functions and secure crt function support Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/safecrt.h (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/time.h (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/ (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/getinvp.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/invalidp.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/setinvp.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/asctime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/bitsfixup.h (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/clock.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime32.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime64.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime32.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime64.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime32.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime64.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime32.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime64.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/gmtime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime32.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime64.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strdate.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strftime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strtime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time32.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time64.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/timezone.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/tzname.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime32.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime64.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wasctime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wcsftime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime32.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime64.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrdate.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrtime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime32.c (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime64.c (with props) Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/file.h branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/tls.h branches/ros-amd64-bringup/reactos/lib/sdk/crt/misc/tls.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/precomp.h Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -291,6 +291,11 @@ <file>lfind.c</file> <file>lsearch.c</file> </directory> + <directory name="securecrt"> + <file>getinvp.c</file> + <file>invalidp.c</file> + <file>setinvp.c</file> + </directory> <directory name="setjmp"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -437,7 +442,7 @@ <directory name="sys_stat"> <file>systime.c</file> </directory> - <directory name="time"> +  + <directory name="time_new"> + <file>asctime.c</file> + <file>clock.c</file> + <file>ctime32.c</file> + <file>ctime64.c</file> + <file>ctime.c</file> + <file>difftime32.c</file> + <file>difftime64.c</file> + <file>difftime.c</file> + <file>ftime32.c</file> + <file>ftime64.c</file> + <file>ftime.c</file> + <file>futime32.c</file> + <file>futime64.c</file> + <file>futime.c</file> + <file>gmtime.c</file> + <file>localtime32.c</file> + <file>localtime64.c</file> + <file>localtime.c</file> + <file>mktime.c</file> + <file>strdate.c</file> + <file>strftime.c</file> + <file>strtime.c</file> + <file>time32.c</file> + <file>time64.c</file> + <file>time.c</file> + <file>timezone.c</file> + <file>utime32.c</file> + <file>utime64.c</file> + <file>utime.c</file> + <file>wasctime.c</file> + <file>wctime32.c</file> + <file>wctime64.c</file> + <file>wctime.c</file> + <file>wutime32.c</file> + <file>wutime64.c</file> + <file>wutime.c</file> + <file>wcsftime.c</file> + <file>wstrdate.c</file> + <file>wstrtime.c</file> + </directory> <directory name="wstring"> <file>wcscoll.c</file> <file>wcscspn.c</file> Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/file.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/file.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/file.h [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -48,8 +48,8 @@ int __fileno_setmode(int _fd, int _newmode); void sigabort_handler(int sig); -void UnixTimeToFileTime(time_t unix_time, FILETIME* filetime, DWORD remainder); -time_t FileTimeToUnixTime(const FILETIME* filetime, DWORD *remainder); +//void UnixTimeToFileTime(time_t unix_time, FILETIME* filetime, DWORD remainder); +//time_t FileTimeToUnixTime(const FILETIME* filetime, DWORD *remainder); #define __FILE_REC_MAX 20 Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/safecrt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/safecrt.h (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/safecrt.h [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,10 @@ + +extern void * __pInvalidArgHandler; + +void _invalid_parameter( + const wchar_t * expression, + const wchar_t * function, + const wchar_t * file, + unsigned int line, + uintptr_t pReserved); + Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/safecrt.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/time.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/time.h (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/time.h [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,56 @@ + +#define DIFFTIME 0x19db1ded53e8000ULL +#define DIFFDAYS (3 * DAYSPER100YEARS + 17 * DAYSPER4YEARS + 1 * DAYSPERYEAR) + +#define DAYSPERYEAR 365 +#define DAYSPER4YEARS (4*DAYSPERYEAR+1) +#define DAYSPER100YEARS (25*DAYSPER4YEARS-1) +#define DAYSPER400YEARS (4*DAYSPER100YEARS+1) +#define SECONDSPERDAY (24*60*60) +#define SECONDSPERHOUR (60*60) +#define LEAPDAY 59 + +extern inline +__time64_t +FileTimeToUnixTime(const FILETIME *FileTime, USHORT *millitm) +{ + ULARGE_INTEGER ULargeInt; + __time64_t time; + + ULargeInt.LowPart = FileTime->dwLowDateTime; + ULargeInt.HighPart = FileTime->dwHighDateTime; + ULargeInt.QuadPart -= DIFFTIME; + + time = ULargeInt.QuadPart / 10000; + if (millitm) + *millitm = (ULargeInt.QuadPart % 10000) / 10; + + return time; +} + +static __inline +long leapyears_passed(long days) +{ + long quadcenturies, centuries, quadyears; + quadcenturies = days / DAYSPER400YEARS; + days -= quadcenturies; + centuries = days / DAYSPER100YEARS; + days += centuries; + quadyears = days / DAYSPER4YEARS; + return quadyears - centuries + quadcenturies; +} + +static __inline +long leapdays_passed(long days) +{ + return leapyears_passed(days + DAYSPERYEAR - LEAPDAY + 1); +} + +static __inline +long years_passed(long days) +{ + return (days - leapdays_passed(days)) / 365; +} + +extern long dst_begin; +extern long dst_end; Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/time.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/tls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/tls.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/tls.h [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -28,6 +28,10 @@ int fpecode; /* fp exception code */ EXCEPTION_RECORD *exc_record; /* Head of exception record list */ + + struct tm tmbuf; /* Used by gmtime, mktime, mkgmtime, localtime */ + char asctimebuf[26]; /* Buffer for asctime and ctime */ + wchar_t wasctimebuf[26]; /* Buffer for wasctime and wctime */ } THREADDATA, *PTHREADDATA; Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/misc/tls.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/misc/tls.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/misc/tls.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -15,6 +15,10 @@ ThreadData->fpecode = 0; ThreadData->tnext = 1; + + memset(&ThreadData->tmbuf, sizeof(struct tm), 0); + memset(&ThreadData->asctimebuf, 26 * sizeof(char), 0); + memset(&ThreadData->wasctimebuf, 26 * sizeof(wchar_t), 0); /* FIXME: init more thread local data */ Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/precomp.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/precomp.h [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -59,5 +59,7 @@ #include <internal/rterror.h> #include <internal/tls.h> #include <internal/printf.h> +#include <internal/time.h> +#include <internal/safecrt.h> #endif /* _CRT_PRECOMP_H */ Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/ ------------------------------------------------------------------------------ svn:mergeinfo = Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/getinvp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/getinvp.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/getinvp.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,17 @@ +#include <precomp.h> + +_invalid_parameter_handler +_get_invalid_parameter_handler(void) +{ + _invalid_parameter_handler oldhandler; + + if (__pInvalidArgHandler) + { + oldhandler = DecodePointer(__pInvalidArgHandler); + } + else + { + oldhandler = NULL; + } + return oldhandler; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/getinvp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/invalidp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/invalidp.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/invalidp.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,47 @@ +#include <precomp.h> + +void * __pInvalidArgHandler = NULL; + +void +_invalid_parameter_default( + const wchar_t * expression, + const wchar_t * function, + const wchar_t * file, + unsigned int line, + uintptr_t pReserved) +{ + // TODO: launch Doc Watson or something like that + UNIMPLEMENTED; + ExitProcess(-1); +} + + +// http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?Feedba… +void +_invalid_parameter( + const wchar_t * expression, + const wchar_t * function, + const wchar_t * file, + unsigned int line, + uintptr_t pReserved) +{ + _invalid_parameter_handler handler; + + if (__pInvalidArgHandler) + { + handler = DecodePointer(__pInvalidArgHandler); + } + else + { + handler = _invalid_parameter_default; + } + handler(expression, function, file, line, pReserved); +} + +// http://cowboyprogramming.com/2007/02/22/what-is-_invalid_parameter_noinfo-a… +void +invalid_parameter_noinfo(void) +{ + _invalid_parameter(0, 0, 0, 0, 0); +} + Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/invalidp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/setinvp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/setinvp.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/setinvp.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,27 @@ +#include <precomp.h> + +_invalid_parameter_handler +_set_invalid_parameter_handler(_invalid_parameter_handler newhandler) +{ + _invalid_parameter_handler oldhandler; + + if (__pInvalidArgHandler) + { + oldhandler = DecodePointer(__pInvalidArgHandler); + } + else + { + oldhandler = NULL; + } + + if (newhandler) + { + __pInvalidArgHandler = EncodePointer(newhandler); + } + else + { + __pInvalidArgHandler = 0; + } + + return oldhandler; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/setinvp.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 19 16:05:27 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/asctime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/asctime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/asctime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,162 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/ftime.c + * PURPOSE: Implementation of asctime(), _asctime_s() + * PROGRAMERS: Timo Kreuzer + */ +#include <precomp.h> +#include <tchar.h> +#include <time.h> +#include "bitsfixup.h" + +#define DAYSPERWEEK 7 +#define MONSPERYEAR 12 + +static const _TCHAR wday_name[DAYSPERWEEK][4] = +{ + _T("Sun "), _T("Mon "), _T("Tue "), _T("Wed "), + _T("Thu "), _T("Fri "), _T("Sat ") +}; + +static const _TCHAR mon_name[MONSPERYEAR][4] = +{ + _T("Jan "), _T("Feb "), _T("Mar "), _T("Apr "), _T("May "), _T("Jun "), + _T("Jul "), _T("Aug "), _T("Sep "), _T("Oct "), _T("Nov "), _T("Dec ") +}; + +#ifdef _UNICODE +typedef unsigned long long _TCHAR4; +typedef unsigned long _TCHAR2; +#else +typedef unsigned long _TCHAR4; +typedef unsigned short _TCHAR2; +#endif + +typedef union +{ + _TCHAR text[26]; + struct + { + _TCHAR4 WeekDay; + _TCHAR4 Month; + _TCHAR2 Day; + _TCHAR Space1; + _TCHAR2 Hour; + _TCHAR Sep1; + _TCHAR2 Minute; + _TCHAR Sep2; + _TCHAR2 Second; + _TCHAR Space2; + _TCHAR2 Year[2]; + _TCHAR lb; + _TCHAR zt; + }; +} timebuf_t; + +_TCHAR2 +static __inline__ +IntToChar2(int x) +{ + union + { + _TCHAR2 char2; + _TCHAR array[2]; + } u; + + u.array[0] = '0' + (x / 10); + u.array[1] = '0' + (x % 10); + + return u.char2; +} + +void +static __inline__ +FillBuf(timebuf_t *buf, const struct tm *ptm) +{ + /* Format looks like this: + * "Sun Mar 01 12:34:56 1902\n\0" */ + buf->WeekDay = *(_TCHAR4*)wday_name[ptm->tm_wday]; + buf->Month = *(_TCHAR4*)mon_name[ptm->tm_mon]; + buf->Day = IntToChar2(ptm->tm_mday); + buf->Space1 = ' '; + buf->Hour = IntToChar2(ptm->tm_mday); + buf->Sep1 = ':'; + buf->Minute = IntToChar2(ptm->tm_mday); + buf->Sep2 = ':'; + buf->Second = IntToChar2(ptm->tm_mday); + buf->Space2 = ' '; + buf->Year[0] = IntToChar2(ptm->tm_year / 100); + buf->Year[1] = IntToChar2(ptm->tm_year % 100); + buf->lb = '\n'; + buf->zt = '\0'; +} + +/****************************************************************************** + * \name _tasctime_s + * \brief Converts a local time into a string and returns a pointer to it. + * \param buffer Buffer that receives the string (26 characters). + * \param numberOfElements Size of the buffer in characters. + * \param time Pointer to the UTC time. + */ +errno_t +_tasctime_s( + _TCHAR* buffer, + size_t numberOfElements, + const struct tm *ptm) +{ + /* Validate parameters */ + if (!buffer || numberOfElements < 26 || !ptm || + (unsigned int)ptm->tm_sec > 59 || + (unsigned int)ptm->tm_min > 59 || + (unsigned int)ptm->tm_hour > 23 || + (unsigned int)ptm->tm_mday > 31 || + (unsigned int)ptm->tm_mon > 11 || + (unsigned int)ptm->tm_year > 2038 || + (unsigned int)ptm->tm_wday > 6 || + (unsigned int)ptm->tm_yday > 365) + { + _invalid_parameter(NULL, +#ifdef UNICODE + L"_wasctime", +#else + L"asctime", +#endif + _CRT_WIDE(__FILE__), + __LINE__, + 0); + return EINVAL; + } + + /* Fill the buffer */ + FillBuf((timebuf_t*)buffer, ptm); + + return 0; +} + +/****************************************************************************** + * \name _tasctime + * \brief Converts a UTC time into a string and returns a pointer to it. + * \param ptm Pointer to the UTC time. + * \remarks The string is stored in thread local buffer, shared between + * ctime, gmtime and localtime (32 and 64 bit versions). + */ +_TCHAR * +_tasctime(const struct tm *ptm) +{ + PTHREADDATA pThreadData; + _TCHAR *pstr; + + /* Get pointer to TLS buffer */ + pThreadData = GetThreadData(); +#ifndef _UNICODE + pstr = pThreadData->asctimebuf; +#else + pstr = pThreadData->wasctimebuf; +#endif + + /* Fill the buffer */ + FillBuf((timebuf_t*)pstr, ptm); + + return pstr; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/asctime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/bitsfixup.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/bitsfixup.h (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/bitsfixup.h [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,51 @@ + +#if defined(_USE_EXPLITIT_32BIT_TIME) || defined(_USE_EXPLITIT_64BIT_TIME) +#undef _timeb +#undef _ftime +#undef _tctime +#undef _ftime_s +#undef _tctime_s +#undef _tutime +#else +#define _time time +#endif + +#ifdef _USE_EXPLITIT_32BIT_TIME +#define time_t __time32_t +#define _timeb __timeb32 +#define _utimbuf __utimbuf32 + +#define difftime _difftime32 +#define localtime _localtime32 +#define localtime_s _localtime32_s +#define _time _time32 + +#define _ftime _ftime32 +#define _ftime_s _ftime32_s +#define _futime _futime32 +#define _tctime _tctime32 +#define _tctime_s _tctime32_s +#define _tutime _tutime32 +#define gmtime _gmtime32 + +#endif + +#ifdef _USE_EXPLITIT_64BIT_TIME +#define time_t __time64_t +#define _timeb __timeb64 +#define _utimbuf __utimbuf64 + +#define difftime _difftime64 +#define localtime _localtime64 +#define localtime_s _localtime64_s +#define _time _time64 + +#define _ftime _ftime64 +#define _ftime_s _ftime64_s +#define _futime _futime64 +#define _tctime _tctime64 +#define _tctime_s _tctime64_s +#define _tutime _tutime64 +#define gmtime _gmtime64 + +#endif Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/bitsfixup.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/clock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/clock.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/clock.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/clock.c + * PURPOSE: Implementation of clock() + * PROGRAMER: Timo Kreuzer + */ +#include <precomp.h> + +ULARGE_INTEGER g_StartupTime; + +void +initclock(void) +{ + GetSystemTimeAsFileTime((FILETIME*)&g_StartupTime); +} + +/****************************************************************************** + * \name clock + * \brief Returns the current process's elapsed time. + */ +clock_t +clock(void) +{ + ULARGE_INTEGER Time; + + GetSystemTimeAsFileTime((FILETIME*)&Time); + Time.QuadPart -= g_StartupTime.QuadPart; + return FileTimeToUnixTime((FILETIME*)&Time, NULL); +}; Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/clock.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,52 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/ctime.c + * PURPOSE: Implementation of ctime, _ctime_s + * PROGRAMERS: Timo Kreuzer + */ +#define MINGW_HAS_SECURE_API 1 + +#include <tchar.h> +#include <time.h> +#include "bitsfixup.h" + +#define EINVAL -1 + +/****************************************************************************** + * \name _tctime_s + * \brief Converts a time_t value into a string. + * \param buffer Buffer that receives the string (26 characters). + * \param numberOfElements Size of the buffer in characters. + * \param time Pointer to the UTC time. + */ +errno_t +_tctime_s(_TCHAR *buffer, size_t numberOfElements, const time_t *time) +{ + struct tm _tm; + + if (localtime_s(&_tm, time) == EINVAL) + { + return EINVAL; + } + return _tasctime_s(buffer, numberOfElements, &_tm); +} + +/****************************************************************************** + * \name _tctime + * \brief Converts a time_t value into a string and returns a pointer to it. + * \param time Pointer to the UTC time. + * \remarks The string is stored in thread local buffer, shared between + * ctime, gmtime and localtime (both 32 and 64 bit versions). + */ +_TCHAR * +_tctime(const time_t *ptime) +{ + struct tm *ptm = localtime(ptime); + if (!ptm) + { + return 0; + } + return _tasctime(ptm); +} + Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime32.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime32.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/ctime32.c + * PURPOSE: Implementation of _ctime32() + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_32BIT_TIME +#include "ctime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime64.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime64.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/ctime64.c + * PURPOSE: Implementation of _ctime64 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_64BIT_TIME +#include "ctime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/difftime.c + * PURPOSE: Implementation of difftime + * PROGRAMERS: Timo Kreuzer + */ +#include <time.h> +#include "bitsfixup.h" + +/** + * \name difftime + * \brief Retrurns the difference between two time_t values in seconds. + * \param time1 Beginning time. + * \param time2 Ending time. + */ +double +difftime( + time_t time1, /**< Beginning time */ + time_t time2) /**< Ending time */ +{ + return (double)(time1 - time2); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime32.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime32.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/difftime32.c + * PURPOSE: Implementation of _difftime32 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_32BIT_TIME +#include "difftime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime64.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime64.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/difftime64.c + * PURPOSE: Implementation of _difftime64 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_64BIT_TIME +#include "difftime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/difftime64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/ftime.c + * PURPOSE: Deprecated BSD library call + * PROGRAMERS: Timo Kreuzer + */ +#include <precomp.h> +#include <sec_api/time_s.h> +#include <sys/timeb.h> +#include "bitsfixup.h" + +/****************************************************************************** + * \name _ftime_s + * \brief Get the current time. + * \param [out] ptimeb Pointer to a structure of type struct _timeb that + * recieves the current time. + * \sa http://msdn.microsoft.com/en-us/library/95e68951.aspx + */ +errno_t +_ftime_s(struct _timeb *ptimeb) +{ + DWORD ret; + TIME_ZONE_INFORMATION TimeZoneInformation; + FILETIME SystemTime; + + /* Validate parameters */ + if (!ptimeb) + { + _invalid_parameter(0, + 0,//__FUNCTION__, + _CRT_WIDE(__FILE__), + __LINE__, + 0); + return EINVAL; + } + + ret = GetTimeZoneInformation(&TimeZoneInformation); + ptimeb->dstflag = (ret == TIME_ZONE_ID_DAYLIGHT) ? 1 : 0; + ptimeb->timezone = TimeZoneInformation.Bias; + + GetSystemTimeAsFileTime(&SystemTime); + ptimeb->time = FileTimeToUnixTime(&SystemTime, &ptimeb->millitm); + + return 0; +} + +/****************************************************************************** + * \name _ftime + * \brief Get the current time. + * \param [out] ptimeb Pointer to a structure of type struct _timeb that + * recieves the current time. + * \note This function is for compatability and simply calls the secure + * version _ftime_s(). + * \sa http://msdn.microsoft.com/en-us/library/z54t9z5f.aspx + */ +void +_ftime(struct _timeb *ptimeb) +{ + _ftime_s(ptimeb); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime32.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime32.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/ftime32.c + * PURPOSE: Implementation of _ftime32 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_32BIT_TIME +#include "ftime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime64.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime64.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/ftime64.c + * PURPOSE: Implementation of _ftime64 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_64BIT_TIME +#include "ftime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ftime64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/futime.c + * PURPOSE: Implementation of _futime + * PROGRAMERS: Timo Kreuzer + */ +#include <precomp.h> +#include <time.h> +#include <sys/utime.h> +#include "bitsfixup.h" + +HANDLE fdtoh(int fd); + +/****************************************************************************** + * \name _futime + * \brief Set a files modification time. + * \param [out] ptimeb Pointer to a structure of type struct _timeb that + * recieves the current time. + * \sa http://msdn.microsoft.com/en-us/library/95e68951.aspx + */ +int +_futime(int fd, struct _utimbuf *filetime) +{ + HANDLE handle; + FILETIME at, wt; + + handle = fdtoh(fd); + if (handle == INVALID_HANDLE_VALUE) + { + return -1; + } + + if (!filetime) + { + time_t currTime; + _time(&currTime); + RtlSecondsSince1970ToTime(currTime, (LARGE_INTEGER *)&at); + wt = at; + } + else + { + RtlSecondsSince1970ToTime(filetime->actime, (LARGE_INTEGER *)&at); + if (filetime->actime == filetime->modtime) + { + wt = at; + } + else + { + RtlSecondsSince1970ToTime(filetime->modtime, (LARGE_INTEGER *)&wt); + } + } + + if (!SetFileTime(handle, NULL, &at, &wt)) + { + __set_errno(GetLastError()); + return -1 ; + } + + return 0; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime32.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime32.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/futime32.c + * PURPOSE: Implementation of _futime32 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_32BIT_TIME +#include "futime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime64.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime64.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/futime64.c + * PURPOSE: Implementation of _futime64 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_64BIT_TIME +#include "futime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/futime64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/gmtime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/gmtime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/gmtime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,146 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/gmtime.c + * PURPOSE: Implementation of gmtime, _gmtime32, _gmtime64 + * PROGRAMERS: Timo Kreuzer + */ +#include <precomp.h> + +unsigned int g_monthdays[13] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365}; +unsigned int g_lpmonthdays[13] = {0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366}; + +struct tm * +_gmtime_worker(struct tm *ptm, __time64_t time, int do_dst) +{ + unsigned int days, daystoyear, dayinyear, leapdays, leapyears, years, month; + unsigned int secondinday, secondinhour; + unsigned int *padays; + + if (time < 0) + { + return 0; + } + + /* Divide into date and time */ + days = time / SECONDSPERDAY; + secondinday = time % SECONDSPERDAY; + + /* Shift to days from 1.1.1601 */ + days += DIFFDAYS; + + /* Calculate leap days passed till today */ + leapdays = leapdays_passed(days); + + /* Calculate number of full leap years passed */ + leapyears = leapyears_passed(days); + + /* Are more leap days passed than leap years? */ + if (leapdays > leapyears) + { + /* Yes, we're in a leap year */ + padays = g_lpmonthdays; + } + else + { + /* No, normal year */ + padays = g_monthdays; + } + + /* Calculate year */ + years = (days - leapdays) / 365; + ptm->tm_year = years - 299; + + /* Calculate number of days till 1.1. of this year */ + daystoyear = years * 365 + leapyears; + + /* Calculate the day in this year */ + dayinyear = days - daystoyear; + + /* Shall we do DST corrections? */ + ptm->tm_isdst = 0; + if (do_dst) + { + unsigned int yeartime = dayinyear * SECONDSPERDAY + secondinday ; + if (yeartime >= dst_begin && yeartime <= dst_end) // FIXME! DST in winter + { + time -= _dstbias; + days = time / SECONDSPERDAY + DIFFDAYS; + dayinyear = days - daystoyear; + ptm->tm_isdst = 1; + } + } + + ptm->tm_yday = dayinyear; + + /* dayinyear < 366 => terminates with i <= 11 */ + for (month = 0; dayinyear >= padays[month+1]; month++) + ; + + /* Set month and day in month */ + ptm->tm_mon = month; + ptm->tm_mday = 1 + dayinyear - padays[month]; + + /* Get weekday */ + ptm->tm_wday = (days + 4) % 7; + + /* Calculate hour and second in hour */ + ptm->tm_hour = secondinday / SECONDSPERHOUR; + secondinhour = secondinday % SECONDSPERHOUR; + + /* Calculate minute and second */ + ptm->tm_min = secondinhour / 60; + ptm->tm_sec = secondinhour % 60; + + return ptm; +} + +/****************************************************************************** + * \name _gmtime64 + * \brief + * \param ptime Pointer to a variable of type __time64_t containing the time. + */ +struct tm * +_gmtime64(const __time64_t * ptime) +{ + PTHREADDATA pThreadData; + struct tm *ptm; + __time64_t time = *ptime; + + /* Validate parameters */ + if (time < 0) + { + return 0; + } + + /* Get pointer to TLS tm buffer */ + pThreadData = GetThreadData(); + ptm = &pThreadData->tmbuf; + + /* Use _gmtime_worker to do the ral work */ + return _gmtime_worker(ptm, time, 0); +} + +/****************************************************************************** + * \name _gmtime32 + * \brief + * \param ptime Pointer to a variable of type __time32_t containing the time. + */ +struct tm * +_gmtime32(const __time32_t * ptime) +{ + __time64_t time64 = (__time64_t)*ptime; + return _gmtime64(&time64); +} + +/****************************************************************************** + * \name gmtime + * \brief + * \param ptime Pointer to a variable of type time_t containing the time. + */ +struct tm * +gmtime(const time_t * ptime) +{ + __time64_t time64 = (__time64_t)*ptime; + return _gmtime64(&time64); +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/gmtime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,65 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/localtime.c + * PURPOSE: Implementation of localtime, localtime_s + * PROGRAMERS: Timo Kreuzer + */ +#include <precomp.h> +#include <time.h> +#include "bitsfixup.h" + +errno_t +localtime_s(struct tm* _tm, const time_t *ptime) +{ + + /* Validate parameters */ + if (!_tm || !ptime) + { + _invalid_parameter(NULL, + 0,//__FUNCTION__, + _CRT_WIDE(__FILE__), + __LINE__, + 0); + return EINVAL; + } + + + return 0; +} + +extern char _tz_is_set; + +struct tm * +localtime(const time_t *ptime) +{ + time_t time = *ptime; + struct tm * ptm; + + /* Check for invalid time value */ + if (time < 0) + { + return 0; + } + + /* Never without */ + if (!_tz_is_set) + _tzset(); + + /* Check for overflow */ + + /* Correct for timezone */ + time -= _timezone; +#if 0 + /* Correct for daylight saving */ + if (_isdstime(time)) + { + ptm->tm_isdst = 1; + time -= _dstbias; + } +#endif + ptm = gmtime(&time); + + return ptm; +} + Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime32.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime32.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/localtime32.c + * PURPOSE: Implementation of _localtime32 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_32BIT_TIME +#include "localtime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime64.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime64.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/localtime64.c + * PURPOSE: Implementation of _localtime64 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_64BIT_TIME +#include "localtime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/localtime64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,124 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/mktime.c + * PURPOSE: Implementation of mktime, _mkgmtime + * PROGRAMERS: Timo Kreuzer + */ +#include <precomp.h> + +time_t +mktime_worker(struct tm * ptm, int utc) +{ + return 0; +} + +/* int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; +*/ + +static int g_monthdays[13] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365}; + + +/** + * \name _mkgmtime + * + */ +time_t +_mkgmtime(struct tm *ptm) +{ + struct tm *ptm2; + time_t time; + int mons, years, leapyears; + + /* Normalize year and month */ + if (ptm->tm_mon < 0) + { + mons = -ptm->tm_mon - 1; + ptm->tm_year -= 1 + mons / 12; + ptm->tm_mon = 11 - (mons % 12); + } + else if (ptm->tm_mon > 11) + { + mons = ptm->tm_mon; + ptm->tm_year += (mons / 12); + ptm->tm_mon = mons % 12; + } + + /* Is it inside margins */ + if (ptm->tm_year < 70 || ptm->tm_year > 139) // FIXME: max year for 64 bits + { + return -1; + } + + years = ptm->tm_year - 70; + + /* Number of leapyears passed since 1970 */ + leapyears = (years + 1) / 4; + + /* Calculate days up to 1st of Jan */ + time = years * 365 + leapyears; + + /* Calculate days up to 1st of month */ + time += g_monthdays[ptm->tm_mon]; + + /* Check if we need to add a leap day */ + if (((years + 2) % 4) == 0) + { + if (ptm->tm_mon > 2) + { + time++; + } + } + + time += ptm->tm_mday - 1; + + time *= 24; + time += ptm->tm_hour; + + time *= 60; + time += ptm->tm_min; + + time *= 60; + time += ptm->tm_sec; + + if (time < 0) + { + return -1; + } + + /* Finally get normalized tm struct */ + ptm2 = gmtime(&time); + if (!ptm2) + { + return -1; + } + *ptm = *ptm2; + + return time; +} + +time_t +mktime(struct tm *ptm) +{ + time_t time; + + /* Convert the time as if it was UTC */ + time = _mkgmtime(ptm); + + /* Apply offset */ + if (time != -1) + { + time += _timezone; + } + + return time; +} + Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strdate.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strdate.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strdate.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/msvcrt/time/strtime.c + * PURPOSE: Fills a buffer with a formatted date representation + * PROGRAMER: Ariadne + * UPDATE HISTORY: + * 28/12/98: Created + */ +#include <precomp.h> + +/* + * @implemented + */ +char* _strdate(char* date) +{ + static const char format[] = "MM'/'dd'/'yy"; + + GetDateFormatA(LOCALE_NEUTRAL, 0, NULL, format, date, 9); + + return date; + +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strdate.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strftime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strftime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strftime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,12 @@ +#include <precomp.h> +#include <tchar.h> + +size_t +_tcsftime(_TCHAR *strDest, + size_t maxsize, + const _TCHAR *format, + const struct tm *timeptr) +{ + return 0; +} + Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strftime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strtime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strtime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strtime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,22 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/msvcrt/time/strtime.c + * PURPOSE: Fills a buffer with a formatted time representation + * PROGRAMER: Ariadne + * UPDATE HISTORY: + * 28/12/98: Created + */ +#include <precomp.h> + +/* + * @implemented + */ +char* _strtime(char* time) +{ + static const char format[] = "HH':'mm':'ss"; + + GetTimeFormatA(LOCALE_NEUTRAL, 0, NULL, format, time, 9); + + return time; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/strtime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,24 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/sdk/crt/time/time.c + * PURPOSE: Implementation of _time (_tim32, _tim64) + * PROGRAMER: Timo Kreuzer + */ +#include <precomp.h> +#include <time.h> +#include "bitsfixup.h" + +time_t _time(time_t* ptime) +{ + FILETIME SystemTime; + time_t time = 0; + + if (ptime) + { + GetSystemTimeAsFileTime(&SystemTime); + time = FileTimeToUnixTime(&SystemTime, NULL); + *ptime = time; + } + return time; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time32.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time32.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,3 @@ + +#define _USE_EXPLITIT_32BIT_TIME +#include "time.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time64.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time64.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,3 @@ + +#define _USE_EXPLITIT_64BIT_TIME +#include "time.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/time64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/timezone.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/timezone.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/timezone.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,216 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/timezone.c + * PURPOSE: Implementation of time zone functions + * PROGRAMERS: Timo Kreuzer + */ +#include "precomp.h" + +char _tz_is_set = 0; + +/* buffers must hold 64 characters! */ +static char tz_name[64] = "PST"; +static char tz_dst_name[64] = "PDT"; + +long dst_begin = 0; +long dst_end = 0; + +/****************************************************************************** + * \var _tzname + */ +char * _tzname[2] = { + tz_name, + tz_dst_name, +}; + +/****************************************************************************** + * \var _daylight + */ +int _daylight = 1; + +/****************************************************************************** + * \name __p__daylight + * \brief Returns a pointer to the _daylight variable; + */ +void * +__p__daylight(void) +{ + return &_daylight; +} + +/****************************************************************************** + * \var _timezone + * \brief + */ +long _timezone = 28800; + +/****************************************************************************** + * \name __p__timezone + * \brief Returns a pointer to the _timezone variable; + */ +long * +__p__timezone(void) +{ + return &_timezone; +} + +/****************************************************************************** + * \var _dstbias + * \brief + */ +long _dstbias = 0; + +/****************************************************************************** + * \name __p__dstbias + * \brief Returns a pointer to the _dstbias variable; + */ +long * +__p__dstbias(void) +{ + return &_dstbias; +} + +/****************************************************************************** + * \name __p__tzname + * \brief Returns a pointer to the _tzname buffer; + */ +char ** +__p__tzname(void) +{ + return _tzname; +} + +/****************************************************************************** + * \name _tzset + * \brief Initializes the variables _daylight, _timezone, and _tzname from the + * "TZ" environment variable if available or else by calling + * GetTimeZoneInformation. + * \sa http://msdn.microsoft.com/en-us/library/90s5c885.aspx + */ +void +_tzset(void) +{ + const char * str; + + if (_tz_is_set) + { + return; + } + + /* Try to read the timezone from environment */ + str = getenv("TZ"); + if (str && str[0] != 0) + { + long hour = 0, min = 0, sec = 0; + int len = strnlen(str, 16); + int sign = 1; + + dst_begin = 0; + + for (;;) + { + /* Copy timezone name */ + strncpy(tz_name, str, 3); + str += 3; + len -= 3; + + if (len < 1) break; + + if (*str == '+' || *str == '-') + { + sign = *str == '-' ? -1 : 1; + str++; + len--; + } + + if (len < 1) break; + + hour = atol(str); + + while (*str != 0 && *str != ':') str++; + if (*str == 0) break; + + min = atol(++str); + + while (*str != 0 && *str != ':') str++; + if (*str == 0) break; + + sec = atol(++str); + + while (*str != 0 && *str <= '9') str++; + if (*str == 0) break; + + /* Copy DST name */ + strncpy(tz_dst_name, str, 3); + + // FIXME: set dst_begin etc + + /* We are finished */ + break; + } + + _timezone = sign * (((hour * 60) + min) * 60 + sec); + + } + else + { + TIME_ZONE_INFORMATION tzi; + DWORD ret; + + ret = GetTimeZoneInformation(&tzi); + if (ret == TIME_ZONE_ID_INVALID) + { + return; + } + + ret = WideCharToMultiByte(CP_ACP, + 0, + tzi.StandardName, + -1, + tz_name, + sizeof(tz_name), + NULL, + NULL); + + ret = WideCharToMultiByte(CP_ACP, + 0, + tzi.DaylightName, + -1, + tz_dst_name, + sizeof(tz_dst_name), + NULL, + NULL); + + _timezone = tzi.Bias * 60; + + if (tzi.DaylightDate.wMonth) + { + struct tm _tm; + + _daylight = 1; + _dstbias = (tzi.DaylightBias - tzi.StandardBias) * 60; + _tm.tm_year = 70; + _tm.tm_mon = tzi.DaylightDate.wMonth - 1; + _tm.tm_mday = tzi.DaylightDate.wDay; + _tm.tm_hour = tzi.DaylightDate.wHour; + _tm.tm_min = tzi.DaylightDate.wMinute; + _tm.tm_sec = tzi.DaylightDate.wSecond; + dst_begin = _mkgmtime(&_tm); + _tm.tm_mon = tzi.StandardDate.wMonth - 1; + _tm.tm_mday = tzi.StandardDate.wDay; + _tm.tm_hour = tzi.StandardDate.wHour; + _tm.tm_min = tzi.StandardDate.wMinute; + _tm.tm_sec = tzi.StandardDate.wSecond; + dst_end = _mkgmtime(&_tm); + } + else + { + _daylight = 0; + _dstbias = 0; + } + + } + _tz_is_set = 1; +} + Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/timezone.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/tzname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/tzname.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/tzname.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/ctime.c + * PURPOSE: Implementation of ctime + * PROGRAMERS: Timo Kreuzer + */ +#include <precomp.h> + Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/tzname.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,25 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/utime.c + * PURPOSE: Implementation of utime, _wutime + * PROGRAMERS: Timo Kreuzer + */ +#include <precomp.h> +#include <tchar.h> +#include <sys/utime.h> +#include "bitsfixup.h" + +int +_tutime(const _TCHAR* path, struct _utimbuf *t) +{ + int fd = _topen(path, _O_WRONLY | _O_BINARY); + + if (fd > 0) + { + int retVal = _futime(fd, t); + _close(fd); + return retVal; + } + return -1; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime32.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime32.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/utime32.c + * PURPOSE: Implementation of _utime32 + * PROGRAMERS: Timo Kreuzer + */ + +#define _USE_EXPLITIT_32BIT_TIME +#include "utime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime64.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime64.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/utime64.c + * PURPOSE: Implementation of _utime64 + * PROGRAMERS: Timo Kreuzer + */ +#define _USE_EXPLITIT_64BIT_TIME +#include "utime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/utime64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wasctime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wasctime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wasctime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/wasctime.c + * PURPOSE: Implementation of _wasctime + * PROGRAMERS: Timo Kreuzer + */ +#define UNICODE +#define _UNICODE + +#include "asctime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wasctime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wcsftime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wcsftime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wcsftime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/wcsftime.c + * PURPOSE: Implementation of _wcsftime + * PROGRAMERS: Timo Kreuzer + */ +#define UNICODE +#define _UNICODE + +#include "strftime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wcsftime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/wctime.c + * PURPOSE: Implementation of _wctime + * PROGRAMERS: Timo Kreuzer + */ +#define UNICODE +#define _UNICODE + +#include "ctime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime32.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime32.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/wctime32.c + * PURPOSE: Implementation of _wctime32 + * PROGRAMERS: Timo Kreuzer + */ +#define UNICODE +#define _UNICODE + +#define _USE_EXPLITIT_32BIT_TIME +#include "ctime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime64.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime64.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/wctime64.c + * PURPOSE: Implementation of _Wctime64 + * PROGRAMERS: Timo Kreuzer + */ +#define UNICODE +#define _UNICODE + +#define _USE_EXPLITIT_64BIT_TIME +#include "ctime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wctime64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrdate.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrdate.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrdate.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/msvcrt/time/strtime.c + * PURPOSE: Fills a buffer with a formatted date representation + * PROGRAMER: Ariadne + * UPDATE HISTORY: + * 28/12/98: Created + */ +#include <precomp.h> + +/* + * @implemented + */ +wchar_t* _wstrdate(wchar_t* date) +{ + static const WCHAR format[] = { 'M','M','\'','/','\'','d','d','\'','/','\'','y','y',0 }; + + GetDateFormatW(LOCALE_NEUTRAL, 0, NULL, format, (LPWSTR)date, 9); + + return date; + +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrdate.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrtime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrtime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrtime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,22 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/msvcrt/time/strtime.c + * PURPOSE: Fills a buffer with a formatted time representation + * PROGRAMER: Ariadne + * UPDATE HISTORY: + * 28/12/98: Created + */ +#include <precomp.h> + +/* + * @implemented + */ +wchar_t* _wstrtime(wchar_t* time) +{ + static const WCHAR format[] = { 'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0 }; + + GetTimeFormatW(LOCALE_NEUTRAL, 0, NULL, format, (LPWSTR)time, 9); + + return time; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wstrtime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/wutime.c + * PURPOSE: Implementation of _wutime + * PROGRAMERS: Timo Kreuzer + */ +#define UNICODE +#define _UNICODE + +#include "utime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime32.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime32.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/wutime32.c + * PURPOSE: Implementation of _wutime32 + * PROGRAMERS: Timo Kreuzer + */ +#define UNICODE +#define _UNICODE + +#define _USE_EXPLITIT_32BIT_TIME +#include "utime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime64.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime64.c [iso-8859-1] Mon Jan 19 16:05:27 2009 @@ -1,0 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/wutime64.c + * PURPOSE: Implementation of _wutime64 + * PROGRAMERS: Timo Kreuzer + */ +#define UNICODE +#define _UNICODE + +#define _USE_EXPLITIT_64BIT_TIME +#include "utime.c" Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/wutime64.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 38955: time.h: add asctime_s and localtime_s, remove sec_api include wchar.h: fix WTIME definitions
by tkreuzer＠svn.reactos.org 19 Jan '09

19 Jan '09

Author: tkreuzer Date: Mon Jan 19 15:53:26 2009 New Revision: 38955 URL: http://svn.reactos.org/svn/reactos?rev=38955&view=rev Log: time.h: add asctime_s and localtime_s, remove sec_api include wchar.h: fix WTIME definitions Modified: branches/ros-amd64-bringup/reactos/include/crt/time.h branches/ros-amd64-bringup/reactos/include/crt/wchar.h Modified: branches/ros-amd64-bringup/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/time.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/time.h [iso-8859-1] Mon Jan 19 15:53:26 2009 @@ -114,8 +114,10 @@ _CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _getsystime(struct tm *_Tm); _CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _setsystime(struct tm *_Tm,unsigned _MilliSec); + _CRTIMP errno_t __cdecl asctime_s(char *_Buf,size_t _SizeInWords,const struct tm *_Tm); _CRTIMP errno_t __cdecl _ctime32_s(char *_Buf,size_t _SizeInBytes,const __time32_t *_Time); _CRTIMP errno_t __cdecl _gmtime32_s(struct tm *_Tm,const __time32_t *_Time); + _CRTIMP errno_t __cdecl localtime_s(struct tm *_Tm,const time_t *_Time); _CRTIMP errno_t __cdecl _localtime32_s(struct tm *_Tm,const __time32_t *_Time); _CRTIMP errno_t __cdecl _strdate_s(char *_Buf,size_t _SizeInBytes); _CRTIMP errno_t __cdecl _strtime_s(char *_Buf ,size_t _SizeInBytes); @@ -214,7 +216,5 @@ #pragma pack(pop) -#include <sec_api/time_s.h> - #endif /* End _TIME_H_ */ Modified: branches/ros-amd64-bringup/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/wchar.h [iso-8859-1] Mon Jan 19 15:53:26 2009 @@ -733,26 +733,36 @@ #ifndef _WTIME_DEFINED #define _WTIME_DEFINED - - _CRTIMP wchar_t *__cdecl _wasctime(const struct tm *_Tm); - _CRTIMP wchar_t *__cdecl _wctime32(const __time32_t *_Time); - size_t __cdecl wcsftime(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm); + _CRTIMP _CRT_INSECURE_DEPRECATE(_wasctime_s) wchar_t *__cdecl _wasctime(const struct tm *_Tm); + _CRTIMP wchar_t *__cdecl _wctime(const time_t *_Time); + _CRTIMP _CRT_INSECURE_DEPRECATE(_wctime32_s) wchar_t *__cdecl _wctime32(const __time32_t *_Time); + _CRTIMP size_t __cdecl wcsftime(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm); _CRTIMP size_t __cdecl _wcsftime_l(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm,_locale_t _Locale); _CRTIMP wchar_t *__cdecl _wstrdate(wchar_t *_Buffer); _CRTIMP wchar_t *__cdecl _wstrtime(wchar_t *_Buffer); + + _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm); + _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time); + _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords); + _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords); #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP wchar_t *__cdecl _wctime64(const __time64_t *_Time); + _CRTIMP _CRT_INSECURE_DEPRECATE(_wctime64_s) wchar_t *__cdecl _wctime64(const __time64_t *_Time); + _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time); #endif #if !defined (RC_INVOKED) && !defined (_INC_WTIME_INL) #define _INC_WTIME_INL #ifdef _USE_32BIT_TIME_T -__CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime32(_Time); } +/* Do it like this to be compatible to msvcrt.dll on 32 bit windows XP and before */ +__CRT_INLINE wchar_t *__cdecl _wctime32(const time_t *_Time) { return _wctime(_Time); } +__CRT_INLINE errno_t _wctime32_s(wchar_t *_Buffer, size_t _SizeInWords,const __time32_t *_Time) { return _wctime32_s(_Buffer, _SizeInWords, _Time); } #else __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime64(_Time); } -#endif -#endif -#endif +__CRT_INLINE errno_t _wctime_s(wchar_t *_Buffer, size_t _SizeInWords,const time_t *_Time) { return _wctime64_s(_Buffer, _SizeInWords, _Time); } +#endif +#endif + +#endif /* !_WTIME_DEFINED */ typedef int mbstate_t; typedef wchar_t _Wint_t;

1 0

[tkreuzer] 38954: Update README.WINE
by tkreuzer＠svn.reactos.org 19 Jan '09

19 Jan '09

Author: tkreuzer Date: Mon Jan 19 14:45:08 2009 New Revision: 38954 URL: http://svn.reactos.org/svn/reactos?rev=38954&view=rev Log: Update README.WINE Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Jan 19 14:45:08 2009 @@ -162,11 +162,11 @@ reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 User32 - - reactos/dll/win32/user32/controls/button.c # Synced at Wine-1_1_12 - reactos/dll/win32/user32/controls/combo.c # Synced at Wine-1_1_12 - reactos/dll/win32/user32/controls/edit.c # Synced at 20071022 - reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 - reactos/dll/win32/user32/controls/listbox.c # Synced at 20071023 + reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_13 + reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_13 + reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_13 + reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_13 + reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/controls/scrollbar.c # Forked reactos/dll/win32/user32/controls/static.c # Synced at 20071024 @@ -176,7 +176,7 @@ reactos/dll/win32/user32/misc/exticon.c # Last sync date unknown reactos/dll/win32/user32/misc/resources.c # Forked? reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown - reactos/dll/win32/user32/misc/wsprintf.c # Synced at Wine-1_1_12 + reactos/dll/win32/user32/misc/wsprintf.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/windows/defwnd.c # Forked reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs