Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[tkreuzer] 53720: [NTOSKRNL/AMD64] - Fix KiGeneralProtectionFault - Don't bugcheck in KiUnexpectedInterrupt - Remove debugprint in KiEndInterrupt, and instead assert, its called from the clock inte...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 16 09:46:08 2011 New Revision: 53720 URL: http://svn.reactos.org/svn/reactos?rev=53720&view=rev Log: [NTOSKRNL/AMD64] - Fix KiGeneralProtectionFault - Don't bugcheck in KiUnexpectedInterrupt - Remove debugprint in KiEndInterrupt, and instead assert, its called from the clock interrupt, since thats the only instance we handle right now Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c trunk/reactos/ntoskrnl/ke/amd64/trap.S Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Fri Sep 16 09:46:08 2011 @@ -238,7 +238,8 @@ KiEndInterrupt(IN KIRQL Irql, IN PKTRAP_FRAME TrapFrame) { - DbgPrint("KiEndInterrupt is unimplemented\n"); + /* Make sure this is from the clock handler */ + ASSERT(TrapFrame->ErrorCode == 0xc10c4); } BOOLEAN Modified: trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/krnlinit… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c [iso-8859-1] Fri Sep 16 09:46:08 2011 @@ -79,6 +79,9 @@ /* Initialize PRCB pool lookaside pointers */ ExInitPoolLookasidePointers(); + + /* Lower to APC_LEVEL */ + KeLowerIrql(APC_LEVEL); /* Check if this is the boot cpu */ if (Prcb->Number == 0) @@ -153,9 +156,6 @@ /* Set the current MP Master KPRCB to the Boot PRCB */ Prcb->MultiThreadSetMaster = Prcb; - /* Lower to APC_LEVEL */ - KeLowerIrql(APC_LEVEL); - /* Initialize Bugcheck Callback data */ InitializeListHead(&KeBugcheckCallbackListHead); InitializeListHead(&KeBugcheckReasonCallbackListHead); Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Fri Sep 16 09:46:08 2011 @@ -637,12 +637,13 @@ /* We have an error code */ ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE OR TRAPFLAG_ALL) - TRAPINFO KiGeneralProtectionFault - mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, MsgGeneralProtFault[rip] - call qword ptr FrLdrDbgPrint[rip] + //TRAPINFO KiGeneralProtectionFault + //mov rdx, [rbp + KTRAP_FRAME_Rip] + //lea rcx, MsgGeneralProtFault[rip] + //call qword ptr FrLdrDbgPrint[rip] /* Call the C handler */ + mov rcx, rbp call KiGeneralProtectionFaultHandler /* Check for success */ @@ -890,9 +891,9 @@ PUBLIC KiUnexpectedInterrupt .PROC KiUnexpectedInterrupt /* The error code is the vector */ - cli - ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE OR TRAPFLAG_ALL) - + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE OR TRAPFLAG_ALL) + +#if 0 /* Set bugcheck parameters */ mov ecx, TRAP_CAUSE_UNKNOWN mov rdx, [rbp + KTRAP_FRAME_ErrorCode] // the vector @@ -901,8 +902,10 @@ sub rsp, 8 mov [rbp + KTRAP_FRAME_P5 + 8], rbp // trap frame call KeBugCheckWithTf - - jmp $ + jmp $ +#endif + LEAVE_TRAP_FRAME; + iretq .ENDP KiUnexpectedInterrupt #ifdef _MSC_VER

13 years

[tkreuzer] 53719: [HAL/APIC/AMD64] - add common amd64 asm trap macros - fix amd64 version of HackEoi - send EOI in amd64 trap exit code, so we avoid using HackEoi - modify HalpClockInterruptHandler...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 16 09:39:41 2011 New Revision: 53719 URL: http://svn.reactos.org/svn/reactos?rev=53719&view=rev Log: [HAL/APIC/AMD64] - add common amd64 asm trap macros - fix amd64 version of HackEoi - send EOI in amd64 trap exit code, so we avoid using HackEoi - modify HalpClockInterruptHandler for better portability - fix amd64 TscCalibrationISR Added: trunk/reactos/include/asm/trapamd64.inc Modified: trunk/reactos/hal/halx86/apic/apictrap.S trunk/reactos/hal/halx86/apic/rtctimer.c trunk/reactos/hal/halx86/apic/tsccal.S trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/apic/apictrap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apictrap.S… ============================================================================== --- trunk/reactos/hal/halx86/apic/apictrap.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apictrap.S [iso-8859-1] Fri Sep 16 09:39:41 2011 @@ -13,11 +13,10 @@ #ifdef _M_AMD64 #include <ksamd64.inc> #include <trapamd64.inc> -#define KI_PUSH_FAKE_ERROR_CODE TF_PUSH_FAKE_ERROR_CODE .code -TRAP_ENTRY HalpClockInterrupt, KI_PUSH_FAKE_ERROR_CODE -TRAP_ENTRY HalpProfileInterrupt, KI_PUSH_FAKE_ERROR_CODE +TRAP_ENTRY HalpClockInterrupt, (TF_VOLATILES OR TF_SEND_EOI) +TRAP_ENTRY HalpProfileInterrupt, (TF_VOLATILES OR TF_SEND_EOI) PUBLIC ApicSpuriousService ApicSpuriousService: @@ -37,6 +36,7 @@ mov dword ptr [HEX(0FFFFFFFFFFFE00B0)], 0 iretq HackEoiReturn: + add rsp, 8 // esp was changed by the iret to the pushed value ret #else Modified: trunk/reactos/hal/halx86/apic/rtctimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c… ============================================================================== --- trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] Fri Sep 16 09:39:41 2011 @@ -109,32 +109,36 @@ /* Enter trap */ KiEnterInterruptTrap(TrapFrame); +#ifdef _M_AMD64 + /* This is for debugging */ + TrapFrame->ErrorCode = 0xc10c4; +#endif /* Start the interrupt */ - if (HalBeginSystemInterrupt(CLOCK_LEVEL, HalpClockVector, &Irql)) + if (!HalBeginSystemInterrupt(CLOCK_LEVEL, HalpClockVector, &Irql)) { - /* Read register C, so that the next interrupt can happen */ - HalpReadCmos(RTC_REGISTER_C);; - - /* Save increment */ - LastIncrement = HalpCurrentTimeIncrement; - - /* Check if someone changed the time rate */ - if (HalpClockSetMSRate) - { - /* Set new clock rate */ - RtcSetClockRate(HalpCurrentRate); - - /* We're done */ - HalpClockSetMSRate = FALSE; - } - - /* Update the system time -- the kernel will exit this trap */ - KeUpdateSystemTime(TrapFrame, LastIncrement, Irql); + /* Spurious, just end the interrupt */ + KiEoiHelper(TrapFrame); } - /* Spurious, just end the interrupt */ - KiEoiHelper(TrapFrame); + /* Read register C, so that the next interrupt can happen */ + HalpReadCmos(RTC_REGISTER_C);; + + /* Save increment */ + LastIncrement = HalpCurrentTimeIncrement; + + /* Check if someone changed the time rate */ + if (HalpClockSetMSRate) + { + /* Set new clock rate */ + RtcSetClockRate(HalpCurrentRate); + + /* We're done */ + HalpClockSetMSRate = FALSE; + } + + /* Update the system time -- on x86 the kernel will exit this trap */ + KeUpdateSystemTime(TrapFrame, LastIncrement, Irql); } VOID Modified: trunk/reactos/hal/halx86/apic/tsccal.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/tsccal.S?r… ============================================================================== --- trunk/reactos/hal/halx86/apic/tsccal.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/tsccal.S [iso-8859-1] Fri Sep 16 09:39:41 2011 @@ -55,10 +55,12 @@ EXTERN TscCalibrationPhase:BYTE EXTERN TscCalibrationArray:DWORD +EXTERN HalpSendEOI:PROC PUBLIC TscCalibrationISR FUNC TscCalibrationISR push rax + push rbx push rcx push rdx .ENDPROLOG @@ -74,17 +76,28 @@ jnb CalibrationISR_Exit /* Store the current value */ - shl rcx, 1 - lea rax, [TscCalibrationArray] - mov dword ptr [rax + rcx], eax - mov dword ptr [rax + rcx + 4], edx + shl rcx, 3 + lea rbx, [TscCalibrationArray] + mov dword ptr [rbx + rcx], eax + mov dword ptr [rbx + rcx + 4], edx /* Advance phase */ inc byte ptr [TscCalibrationPhase] CalibrationISR_Exit: + /* Read CMOS register C */ + mov al, HEX(0C) + out HEX(70), al + jmp $+2 + in al, HEX(71) + jmp $+2 + + /* Send EOI */ + call HalpSendEOI + pop rdx pop rcx + pop rbx pop rax iretq ENDFUNC TscCalibrationISR Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Fri Sep 16 09:39:41 2011 @@ -846,7 +846,7 @@ #define KfLowerIrql KeLowerIrql #define KiEnterInterruptTrap(TrapFrame) /* We do all neccessary in asm code */ #define KiEoiHelper(TrapFrame) return /* Just return to the caller */ -#define HalBeginSystemInterrupt(Irql, Vector, OldIrql) (KeRaiseIrql(Irql, OldIrql), TRUE) +#define HalBeginSystemInterrupt(Irql, Vector, OldIrql) TRUE #ifndef CONFIG_SMP /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ #define KiAcquireSpinLock(SpinLock) Added: trunk/reactos/include/asm/trapamd64.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/trapamd64.inc?… ============================================================================== --- trunk/reactos/include/asm/trapamd64.inc (added) +++ trunk/reactos/include/asm/trapamd64.inc [iso-8859-1] Fri Sep 16 09:39:41 2011 @@ -1,0 +1,196 @@ + +APIC_EOI = HEX(0FFFFFFFFFFFE00B0) + +TF_VOLATILES = HEX(01) +TF_NONVOLATILES = HEX(02) +TF_XMM = HEX(04) +TF_SEGMENTS = HEX(08) +TF_DEBUG = HEX(10) +TF_IRQL = HEX(20) +TF_SAVE_ALL = (TF_VOLATILES OR TF_NONVOLATILES OR TF_XMM OR TF_SEGMENTS) +TF_HAS_ERROR_CODE = HEX(40) +TF_SEND_EOI = HEX(80) + +/* + * EnterTrap - Allocate KTRAP_FRAME_LENGTH and save registers to it + */ +MACRO(EnterTrap, Flags) + LOCAL dont_swap + + /* Save the trap flags for this trap */ + CurrentTrapFlags = VAL(Flags) + + /* Size of hardware trap frame */ + if (Flags AND TF_HAS_ERROR_CODE) + .pushframe code + SIZE_INITIAL_FRAME = 6 * 8 + else + .pushframe + SIZE_INITIAL_FRAME = 5 * 8 + endif + + /* Make room for a KTRAP_FRAME */ + sub rsp, (KTRAP_FRAME_LENGTH - SIZE_INITIAL_FRAME) + .allocstack (KTRAP_FRAME_LENGTH - SIZE_INITIAL_FRAME) + .endprolog + + /* Save rbp and rax */ + mov [rsp + KTRAP_FRAME_Rbp], rbp + mov [rsp + KTRAP_FRAME_Rax], rax + + /* Point rbp to the KTRAP_FRAME */ + lea rbp, [rsp] + + if (Flags AND TF_NONVOLATILES) + /* Save non-volatile registers */ + mov [rbp + KTRAP_FRAME_Rbx], rbx + mov [rbp + KTRAP_FRAME_Rdi], rdi + mov [rbp + KTRAP_FRAME_Rsi], rsi + endif + + if (Flags AND TF_VOLATILES) + /* Save volatile registers */ + mov [rbp + KTRAP_FRAME_Rcx], rcx + mov [rbp + KTRAP_FRAME_Rdx], rdx + mov [rbp + KTRAP_FRAME_R8], r8 + mov [rbp + KTRAP_FRAME_R9], r9 + mov [rbp + KTRAP_FRAME_R10], r10 + mov [rbp + KTRAP_FRAME_R11], r11 + endif + + if (Flags AND TF_XMM) + /* Save xmm registers */ + movdqa [rbp + KTRAP_FRAME_Xmm0], xmm0 + movdqa [rbp + KTRAP_FRAME_Xmm1], xmm1 + movdqa [rbp + KTRAP_FRAME_Xmm2], xmm2 + movdqa [rbp + KTRAP_FRAME_Xmm3], xmm3 + movdqa [rbp + KTRAP_FRAME_Xmm4], xmm4 + movdqa [rbp + KTRAP_FRAME_Xmm5], xmm5 + endif + + if (Flags AND TF_SEGMENTS) + /* Save segment selectors */ + mov [rbp + KTRAP_FRAME_SegDs], ds + mov [rbp + KTRAP_FRAME_SegEs], es + mov [rbp + KTRAP_FRAME_SegFs], fs + mov [rbp + KTRAP_FRAME_SegGs], gs + endif + + /* Save previous mode and swap gs when it was UserMode */ + mov ax, [rbp + KTRAP_FRAME_SegCs] + and al, 1 + mov [rbp + KTRAP_FRAME_PreviousMode], al + jz dont_swap + swapgs +dont_swap: + + if (Flags AND TF_IRQL) + /* Save previous irql */ + mov rax, cr8 + mov [rbp + KTRAP_FRAME_PreviousIrql], al + endif + + if (Flags AND TF_DEBUG) + /* Save debug registers */ + mov rax, dr0 + mov [rbp + KTRAP_FRAME_Dr0], rax + mov rax, dr1 + mov [rbp + KTRAP_FRAME_Dr1], rax + mov rax, dr2 + mov [rbp + KTRAP_FRAME_Dr2], rax + mov rax, dr3 + mov [rbp + KTRAP_FRAME_Dr3], rax + mov rax, dr6 + mov [rbp + KTRAP_FRAME_Dr6], rax + mov rax, dr7 + mov [rbp + KTRAP_FRAME_Dr7], rax + endif + + /* Make sure the direction flag is cleared */ + cld +ENDM + +/* + * ExitTrap - Restore registers and free stack space + */ +MACRO(ExitTrap, Flags) + LOCAL dont_swap_back + + if (Flags AND TF_SEGMENTS) + /* Restore segment selectors */ + mov ds, [rbp + KTRAP_FRAME_SegDs] + mov es, [rbp + KTRAP_FRAME_SegEs] + mov fs, [rbp + KTRAP_FRAME_SegFs] + endif + + if (Flags AND TF_IRQL) + /* Restore previous irql */ + movzx rax, byte ptr [rbp + KTRAP_FRAME_PreviousIrql] + mov cr8, rax + endif + + test byte ptr [rbp + KTRAP_FRAME_PreviousMode], 1 + jz dont_swap_back + swapgs +dont_swap_back: + + if (Flags AND TF_NONVOLATILES) + /* Restore non-volatile registers */ + mov rbx, [rbp + KTRAP_FRAME_Rbx] + mov rdi, [rbp + KTRAP_FRAME_Rdi] + mov rsi, [rbp + KTRAP_FRAME_Rsi] + endif + + if (Flags AND TF_VOLATILES) + /* Restore volatile registers */ + mov rax, [rbp + KTRAP_FRAME_Rax] + mov rcx, [rbp + KTRAP_FRAME_Rcx] + mov rdx, [rbp + KTRAP_FRAME_Rdx] + mov r8, [rbp + KTRAP_FRAME_R8] + mov r9, [rbp + KTRAP_FRAME_R9] + mov r10, [rbp + KTRAP_FRAME_R10] + mov r11, [rbp + KTRAP_FRAME_R11] + endif + + if (Flags AND TF_XMM) + /* Restore xmm registers */ + movdqa xmm0, [rbp + KTRAP_FRAME_Xmm0] + movdqa xmm1, [rbp + KTRAP_FRAME_Xmm1] + movdqa xmm2, [rbp + KTRAP_FRAME_Xmm2] + movdqa xmm3, [rbp + KTRAP_FRAME_Xmm3] + movdqa xmm4, [rbp + KTRAP_FRAME_Xmm4] + movdqa xmm5, [rbp + KTRAP_FRAME_Xmm5] + endif + + /* Restore rbp */ + mov rbp, [rbp + KTRAP_FRAME_Rbp] + + /* Adjust stack pointer */ + add rsp, KTRAP_FRAME_Rip + + if (Flags AND TF_SEND_EOI) + /* Write 0 to the local APIC EOI register */ + mov dword ptr [APIC_EOI], 0 + endif + + /* Return from the trap */ + iretq +ENDM + + +MACRO(TRAP_ENTRY, Trap, Flags) + EXTERN Trap&Handler :PROC + PUBLIC &Trap + FUNC &Trap + /* Common code to create the trap frame */ + EnterTrap Flags + + /* Call the C handler */ + mov rcx, rbp + call Trap&Handler + + /* Leave */ + ExitTrap Flags + ENDFUNC &Trap +ENDM +

13 years

[jgardou] 53718: [SHELL32] - it's right there, use quotes to include it

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 15 21:46:59 2011 New Revision: 53718 URL: http://svn.reactos.org/svn/reactos?rev=53718&view=rev Log: [SHELL32] - it's right there, use quotes to include it Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Thu Sep 15 21:46:59 2011 @@ -20,7 +20,7 @@ */ #include <precomp.h> -#include <reactos/version.h> +#include "version.h" WINE_DEFAULT_DEBUG_CHANNEL(shell);

13 years

[jgardou] 53717: [REACTOS] - wait patiently for rbuild going to Valhalla

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 15 21:26:32 2011 New Revision: 53717 URL: http://svn.reactos.org/svn/reactos?rev=53717&view=rev Log: [REACTOS] - wait patiently for rbuild going to Valhalla Modified: trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/ver.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/dll/win32/shell32/shell32_main.cpp Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Thu Sep 15 21:26:32 2011 @@ -1,6 +1,6 @@ #pragma once -#include <buildno.h> +#include <reactos/buildno.h> #include "lang/af-ZA.h" #include "lang/ar-AE.h" Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Thu Sep 15 21:26:32 2011 @@ -30,7 +30,7 @@ * utility but change the resources! */ -#include "../../../include/reactos/version.h" +#include <reactos/version.h> #include <windows.h> #include <string.h> #include <stdio.h> Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu Sep 15 21:26:32 2011 @@ -142,8 +142,8 @@ */ #include <precomp.h> -#include <buildno.h> -#include <version.h> +#include <reactos/buildno.h> +#include <reactos/version.h> #ifndef NT_SUCCESS #define NT_SUCCESS(StatCode) ((NTSTATUS)(StatCode) >= 0) Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Thu Sep 15 21:26:32 2011 @@ -22,8 +22,8 @@ */ #include <precomp.h> -#include <buildno.h> -#include <version.h> +#include <reactos/buildno.h> +#include <reactos/version.h> VOID ShortVersion (VOID) { Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Thu Sep 15 21:26:32 2011 @@ -19,7 +19,7 @@ #ifndef _M_ARM #include <freeldr.h> #include <debug.h> -#include <buildno.h> +#include <reactos/buildno.h> DBG_DEFAULT_CHANNEL(UI); Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Thu Sep 15 21:26:32 2011 @@ -20,7 +20,7 @@ */ #include <precomp.h> -#include <version.h> +#include <reactos/version.h> WINE_DEFAULT_DEBUG_CHANNEL(shell);

13 years

[jgardou] 53716: [REACTOS] - get version.h and buildno.h out of precompiled headers, to avoid rebuilding the whole module each time we reconfigure the build

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 15 21:03:39 2011 New Revision: 53716 URL: http://svn.reactos.org/svn/reactos?rev=53716&view=rev Log: [REACTOS] - get version.h and buildno.h out of precompiled headers, to avoid rebuilding the whole module each time we reconfigure the build Modified: trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/base/setup/usetup/usetup.h trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/precomp.h trunk/reactos/base/shell/cmd/ver.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shell32_main.cpp Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Thu Sep 15 21:03:39 2011 @@ -1,4 +1,6 @@ #pragma once + +#include <buildno.h> #include "lang/af-ZA.h" #include "lang/ar-AE.h" Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Thu Sep 15 21:03:39 2011 @@ -51,9 +51,6 @@ /* DDK Disk Headers */ #include <ntddscsi.h> - -/* ReactOS Version */ -#include <reactos/buildno.h> /* Internal Headers */ #include "interface/consup.h" Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu Sep 15 21:03:39 2011 @@ -142,6 +142,8 @@ */ #include <precomp.h> +#include <buildno.h> +#include <version.h> #ifndef NT_SUCCESS #define NT_SUCCESS(StatCode) ((NTSTATUS)(StatCode) >= 0) Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] Thu Sep 15 21:03:39 2011 @@ -34,9 +34,6 @@ #include "config.h" #include "batch.h" -#include <reactos/buildno.h> -#include <reactos/version.h> - #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(cmd); #ifdef UNICODE Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Thu Sep 15 21:03:39 2011 @@ -22,7 +22,8 @@ */ #include <precomp.h> - +#include <buildno.h> +#include <version.h> VOID ShortVersion (VOID) { 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] Thu Sep 15 21:03:39 2011 @@ -50,7 +50,7 @@ #include <ntdddisk.h> #include <internal/hal.h> #include <drivers/pci/pci.h> -#include <reactos/buildno.h> + #include <winerror.h> /* internal headers */ Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Thu Sep 15 21:03:39 2011 @@ -19,6 +19,7 @@ #ifndef _M_ARM #include <freeldr.h> #include <debug.h> +#include <buildno.h> DBG_DEFAULT_CHANNEL(UI); Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Thu Sep 15 21:03:39 2011 @@ -60,7 +60,6 @@ #include "cpanel.h" #include "enumidlist.h" #include "shfldr.h" -#include "version.h" #include "shellfolder.h" #include "xdg.h" #include "shellapi.h" Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Thu Sep 15 21:03:39 2011 @@ -20,6 +20,7 @@ */ #include <precomp.h> +#include <version.h> WINE_DEFAULT_DEBUG_CHANNEL(shell);

13 years

[jgardou] 53715: [CMAKE] - start documenting reactos specific stuff. Feel free to complete it :-)

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 15 20:14:34 2011 New Revision: 53715 URL: http://svn.reactos.org/svn/reactos?rev=53715&view=rev Log: [CMAKE] - start documenting reactos specific stuff. Feel free to complete it :-) Added: trunk/reactos/cmake/writing_CmakeLists_for_ReactOS.txt (with props) Added: trunk/reactos/cmake/writing_CmakeLists_for_ReactOS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/writing_CmakeLists_f… ============================================================================== --- trunk/reactos/cmake/writing_CmakeLists_for_ReactOS.txt (added) +++ trunk/reactos/cmake/writing_CmakeLists_for_ReactOS.txt [iso-8859-1] Thu Sep 15 20:14:34 2011 @@ -1,0 +1,22 @@ +CMake is used to build rectos. + +Here you will find what you'll need to write nice CMakeLists.txt files for ReactOS. +CMake standard functions are available too. See http://www.cmake.org/, or type cmake --help-html in your shell to get the full documentation. + +Optional arguments are marked with [brackets], input is marked with <comparison signs>. + +--------------------------------------------------------------------------------------------------------------------------------------------- +set_module_type(<target> <type> [UNICODE] [BASEADDRESS <baseaddress>] [ENTRYPOINT <entrypoint> <stacksize>]) + +This set the type of the module, and take cares of setting common linker options or definitions to the specified target, module file extension, etc. Please always use this when adding a module to reactos build. + +ARGUMENTS : +<target> : name of the target. The module must have been added with add_executable or add_library before calling this function. +<type> : one of win32gui, win32cui, win32dll, win32ocx, cpl, nativecui, nativedll, kernelmodedriver +UNICODE : provide this if the module was written for unicode API +<baseaddress> : provide this if you want your module to have a different base address than the defualt one (according to <type>). For win32dll modules, please use baseaddress.cmake instead. +<entrypoint> : name of the function which will be the entr point of the module. If it's not provided, it's guessed from the module type. +<stacksize> : Size of stack required for the parameters of <entrypoint>. + +TYPICAL USE : +set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12) Propchange: trunk/reactos/cmake/writing_CmakeLists_for_ReactOS.txt ------------------------------------------------------------------------------ svn:eol-style = native

13 years

[tkreuzer] 53714: [NTOSKRNL/AMD64] - Add portable kernel initialization code for amd64 only. - Modify amd64 init code accordingly

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 15 19:32:13 2011 New Revision: 53714 URL: http://svn.reactos.org/svn/reactos?rev=53714&view=rev Log: [NTOSKRNL/AMD64] - Add portable kernel initialization code for amd64 only. - Modify amd64 init code accordingly Added: trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c (with props) Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/ke/amd64/boot.S trunk/reactos/ntoskrnl/ke/amd64/cpu.c trunk/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Thu Sep 15 19:32:13 2011 @@ -312,6 +312,7 @@ ke/amd64/interrupt.c ke/amd64/irql.c ke/amd64/kiinit.c + ke/amd64/krnlinit.c ke/amd64/spinlock.c ke/amd64/stubs.c ke/amd64/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/boot.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] Thu Sep 15 19:32:13 2011 @@ -10,7 +10,7 @@ #include <asm.inc> #include <ksamd64.inc> -EXTERN KiInitializeKernelAndGotoIdleLoop:PROC +EXTERN KiSystemStartupBootStack:PROC /* GLOBALS *******************************************************************/ @@ -21,42 +21,22 @@ /** * VOID - * KiSetupStackAndInitializeKernel( - * IN PKPROCESS InitProcess, <rsp + 0x08, rcx> - * IN PKTHREAD InitThread, <rsp + 0x10, rdx> - * IN PVOID IdleStack, <rsp + 0x18, r8> - * IN PKPRCB Prcb, <rsp + 0x20, r9> - * IN CCHAR Number, <rsp + 0x28> - * IN PLOADER_PARAMETER_BLOCK LoaderBlock) <rsp + 0x30> + * KiSwitchToBootStack( + * IN ULONG_PTR InitialStack<rcx>) */ -PUBLIC KiSetupStackAndInitializeKernel -.PROC KiSetupStackAndInitializeKernel - - /* Save current stack */ - mov rsi, rsp +PUBLIC KiSwitchToBootStack +.PROC KiSwitchToBootStack /* Setup the new stack */ mov ax, HEX(18) mov ss, ax - mov rsp, r8 + mov rsp, rcx sub rsp, HEX(300) // FIXME - - /* Copy stack parameters to the new stack */ - sub rsp, HEX(38) .ENDPROLOG - mov rdi, rsp - movsq - movsq - movsq - movsq - movsq - movsq - movsq + jmp KiSystemStartupBootStack - jmp KiInitializeKernelAndGotoIdleLoop - -.ENDP KiSetupStackAndInitializeKernel +.ENDP KiSwitchToBootStack END Modified: trunk/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/cpu.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Thu Sep 15 19:32:13 2011 @@ -370,41 +370,6 @@ } VOID -FASTCALL -KiInitializeTss(IN PKTSS64 Tss, - IN UINT64 Stack) -{ - PKGDTENTRY64 TssEntry; - - /* Get pointer to the GDT entry */ - TssEntry = KiGetGdtEntry(KeGetPcr()->GdtBase, KGDT64_SYS_TSS); - - /* Initialize the GDT entry */ - KiInitGdtEntry(TssEntry, (ULONG64)Tss, sizeof(KTSS64), AMD64_TSS, 0); - - /* Zero out the TSS */ - RtlZeroMemory(Tss, sizeof(KTSS64)); - - /* FIXME: I/O Map? */ - Tss->IoMapBase = 0x68; - - /* Setup ring 0 stack pointer */ - Tss->Rsp0 = Stack; - - /* Setup a stack for Double Fault Traps */ - Tss->Ist[1] = (ULONG64)KiDoubleFaultStack; - - /* Setup a stack for CheckAbort Traps */ - Tss->Ist[2] = (ULONG64)KiDoubleFaultStack; - - /* Setup a stack for NMI Traps */ - Tss->Ist[3] = (ULONG64)KiDoubleFaultStack; - - /* Load the task register */ - __ltr(KGDT64_SYS_TSS); -} - -VOID NTAPI KeFlushCurrentTb(VOID) { Modified: trunk/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/kiinit.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Thu Sep 15 19:32:13 2011 @@ -69,256 +69,6 @@ /* FIXME: Support this */ DPRINT1("PAT support detected but not yet taken advantage of!\n"); } - - -} - -VOID -NTAPI -KiInitializePcr(IN PKIPCR Pcr, - IN ULONG ProcessorNumber, - IN PKTHREAD IdleThread, - IN PVOID DpcStack) -{ - KDESCRIPTOR GdtDescriptor = {{0},0,0}, IdtDescriptor = {{0},0,0}; - PKGDTENTRY64 TssEntry; - USHORT Tr = 0; - - /* Zero out the PCR */ - RtlZeroMemory(Pcr, PAGE_SIZE); - - /* Set pointers to ourselves */ - Pcr->Self = (PKPCR)Pcr; - Pcr->CurrentPrcb = &Pcr->Prcb; - - /* Set the PCR Version */ - Pcr->MajorVersion = PCR_MAJOR_VERSION; - Pcr->MinorVersion = PCR_MINOR_VERSION; - - /* Set the PRCB Version */ - Pcr->Prcb.MajorVersion = 1; - Pcr->Prcb.MinorVersion = 1; - - /* Set the Build Type */ - Pcr->Prcb.BuildType = 0; -#ifndef CONFIG_SMP - Pcr->Prcb.BuildType |= PRCB_BUILD_UNIPROCESSOR; -#endif -#ifdef DBG - Pcr->Prcb.BuildType |= PRCB_BUILD_DEBUG; -#endif - - /* Set the Processor Number and current Processor Mask */ - Pcr->Prcb.Number = (UCHAR)ProcessorNumber; - Pcr->Prcb.SetMember = 1 << ProcessorNumber; - - /* Get GDT and IDT descriptors */ - __sgdt(&GdtDescriptor.Limit); - __sidt(&IdtDescriptor.Limit); - Pcr->GdtBase = (PVOID)GdtDescriptor.Base; - Pcr->IdtBase = (PKIDTENTRY)IdtDescriptor.Base; - - /* Get TSS Selector */ - __str(&Tr); - ASSERT(Tr == KGDT64_SYS_TSS); - - /* Get TSS Entry */ - TssEntry = KiGetGdtEntry(Pcr->GdtBase, Tr); - - /* Get the KTSS itself */ - Pcr->TssBase = KiGetGdtDescriptorBase(TssEntry); - - Pcr->Prcb.RspBase = Pcr->TssBase->Rsp0; // FIXME - - /* Set DPC Stack */ - Pcr->Prcb.DpcStack = DpcStack; - - /* Setup the processor set */ - Pcr->Prcb.MultiThreadProcessorSet = Pcr->Prcb.SetMember; - - /* Clear DR6/7 to cleanup bootloader debugging */ - Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr6 = 0; - Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr7 = 0; - - /* Set the Current Thread */ - Pcr->Prcb.CurrentThread = IdleThread; - - /* Start us out at PASSIVE_LEVEL */ - Pcr->Irql = PASSIVE_LEVEL; - KeSetCurrentIrql(PASSIVE_LEVEL); - -} - -VOID -NTAPI -KiInitializeCpuFeatures(ULONG Cpu) -{ - ULONG FeatureBits; - - /* Get the processor features for this CPU */ - FeatureBits = KiGetFeatureBits(); - - /* Check if we support all needed features */ - if ((FeatureBits & REQUIRED_FEATURE_BITS) != REQUIRED_FEATURE_BITS) - { - /* If not, bugcheck system */ - FrLdrDbgPrint("CPU doesn't have needed features! Has: 0x%x, required: 0x%x\n", - FeatureBits, REQUIRED_FEATURE_BITS); - KeBugCheck(0); - } - - /* Set DEP to always on */ - SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSON; - FeatureBits |= KF_NX_ENABLED; - - /* Save feature bits */ - KeGetCurrentPrcb()->FeatureBits = FeatureBits; - - /* Enable fx save restore support */ - __writecr4(__readcr4() | CR4_FXSR); - - /* Enable XMMI exceptions */ - __writecr4(__readcr4() | CR4_XMMEXCPT); - - /* Enable Write-Protection */ - __writecr0(__readcr0() | CR0_WP); - - /* Disable fpu monitoring */ - __writecr0(__readcr0() & ~CR0_MP); - - /* Disable x87 fpu exceptions */ - __writecr0(__readcr0() & ~CR0_NE); - -} - -VOID -NTAPI -KiInitializeKernel(IN PKPROCESS InitProcess, - IN PKTHREAD InitThread, - IN PVOID IdleStack, - IN PKPRCB Prcb, - IN CCHAR Number, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - ULONG PageDirectory[2]; - PVOID DpcStack; - - /* Detect and set the CPU Type */ - KiSetProcessorType(); - - /* Initialize the Power Management Support for this PRCB */ -// PoInitializePrcb(Prcb); - - /* Save CPU state */ - KiSaveProcessorControlState(&Prcb->ProcessorState); - - /* Get cache line information for this CPU */ - KiGetCacheInformation(); - - /* Initialize spinlocks and DPC data */ - KiInitSpinLocks(Prcb, Number); - - /* Check if this is the Boot CPU */ - if (Number == 0) - { - /* Set Node Data */ - KeNodeBlock[0] = &KiNode0; - Prcb->ParentNode = KeNodeBlock[0]; - KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; - - /* Set boot-level flags */ - KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; - KeProcessorLevel = (USHORT)Prcb->CpuType; - if (Prcb->CpuID) KeProcessorRevision = Prcb->CpuStep; - - /* Set the current MP Master KPRCB to the Boot PRCB */ - Prcb->MultiThreadSetMaster = Prcb; - - /* Lower to APC_LEVEL */ - KeLowerIrql(APC_LEVEL); - - /* Initialize some spinlocks */ - KeInitializeSpinLock(&KiFreezeExecutionLock); - - /* Initialize portable parts of the OS */ - KiInitSystem(); - - /* Initialize the Idle Process and the Process Listhead */ - InitializeListHead(&KiProcessListHead); - PageDirectory[0] = 0; - PageDirectory[1] = 0; - KeInitializeProcess(InitProcess, - 0, - 0xFFFFFFFF, - PageDirectory, - FALSE); - InitProcess->QuantumReset = MAXCHAR; - } - else - { - /* FIXME */ - DPRINT1("SMP Boot support not yet present\n"); - } - - /* HACK for MmUpdatePageDir */ - ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess; - - /* Setup the Idle Thread */ - KeInitializeThread(InitProcess, - InitThread, - NULL, - NULL, - NULL, - NULL, - NULL, - IdleStack); - - InitThread->NextProcessor = Number; - InitThread->Priority = HIGH_PRIORITY; - InitThread->State = Running; - InitThread->Affinity = 1 << Number; - InitThread->WaitIrql = DISPATCH_LEVEL; - InitProcess->ActiveProcessors = 1 << Number; - - /* Set basic CPU Features that user mode can read */ - SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = - (KeFeatureBits & KF_MMX) ? TRUE: FALSE; - SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = - (KeFeatureBits & KF_CMPXCHG8B) ? TRUE: FALSE; - SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = - ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI)) ? TRUE: FALSE; - SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = - ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI64)) ? TRUE: FALSE; - SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - (KeFeatureBits & KF_3DNOW) ? TRUE: FALSE; - SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = - (KeFeatureBits & KF_RDTSC) ? TRUE: FALSE; - - /* Set up the thread-related fields in the PRCB */ - Prcb->CurrentThread = InitThread; - Prcb->NextThread = NULL; - Prcb->IdleThread = InitThread; - - /* Initialize the Kernel Executive */ - ExpInitializeExecutive(Number, LoaderBlock); - - /* Only do this on the boot CPU */ - if (Number == 0) - { - /* Calculate the time reciprocal */ - KiTimeIncrementReciprocal = - KiComputeReciprocal(KeMaximumIncrement, - &KiTimeIncrementShiftCount); - - /* Update DPC Values in case they got updated by the executive */ - Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; - Prcb->MinimumDpcRate = KiMinimumDpcRate; - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - - /* Allocate the DPC Stack */ - DpcStack = MmCreateKernelStack(FALSE, 0); - if (!DpcStack) KeBugCheckEx(NO_PAGES_AVAILABLE, 1, 0, 0, 0); - Prcb->DpcStack = DpcStack; /* Allocate the IOPM save area. */ // Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, @@ -329,29 +79,263 @@ // /* Bugcheck. We need this for V86/VDM support. */ // KeBugCheckEx(NO_PAGES_AVAILABLE, 2, PAGE_SIZE * 2, 0, 0); // } - } - - /* Raise to Dispatch */ - KfRaiseIrql(DISPATCH_LEVEL); - - /* Set the Idle Priority to 0. This will jump into Phase 1 */ - KeSetPriorityThread(InitThread, 0); - - /* If there's no thread scheduled, put this CPU in the Idle summary */ - KiAcquirePrcbLock(Prcb); - if (!Prcb->NextThread) KiIdleSummary |= 1 << Number; - KiReleasePrcbLock(Prcb); - - /* Raise back to HIGH_LEVEL and clear the PRCB for the loader block */ - KfRaiseIrql(HIGH_LEVEL); - LoaderBlock->Prcb = 0; + +} + +VOID +NTAPI +KiInitializePcr(IN PKIPCR Pcr, + IN ULONG ProcessorNumber, + IN PKTHREAD IdleThread, + IN PVOID DpcStack) +{ + KDESCRIPTOR GdtDescriptor = {{0},0,0}, IdtDescriptor = {{0},0,0}; + PKGDTENTRY64 TssEntry; + USHORT Tr = 0; + + /* Zero out the PCR */ + RtlZeroMemory(Pcr, PAGE_SIZE); + + /* Set pointers to ourselves */ + Pcr->Self = (PKPCR)Pcr; + Pcr->CurrentPrcb = &Pcr->Prcb; + + /* Set the PCR Version */ + Pcr->MajorVersion = PCR_MAJOR_VERSION; + Pcr->MinorVersion = PCR_MINOR_VERSION; + + /* Set the PRCB Version */ + Pcr->Prcb.MajorVersion = 1; + Pcr->Prcb.MinorVersion = 1; + + /* Set the Build Type */ + Pcr->Prcb.BuildType = 0; +#ifndef CONFIG_SMP + Pcr->Prcb.BuildType |= PRCB_BUILD_UNIPROCESSOR; +#endif +#ifdef DBG + Pcr->Prcb.BuildType |= PRCB_BUILD_DEBUG; +#endif + + /* Set the Processor Number and current Processor Mask */ + Pcr->Prcb.Number = (UCHAR)ProcessorNumber; + Pcr->Prcb.SetMember = 1ULL << ProcessorNumber; + + /* Get GDT and IDT descriptors */ + __sgdt(&GdtDescriptor.Limit); + __sidt(&IdtDescriptor.Limit); + Pcr->GdtBase = (PVOID)GdtDescriptor.Base; + Pcr->IdtBase = (PKIDTENTRY)IdtDescriptor.Base; + + /* Get TSS Selector */ + __str(&Tr); + ASSERT(Tr == KGDT64_SYS_TSS); + + /* Get TSS Entry */ + TssEntry = KiGetGdtEntry(Pcr->GdtBase, Tr); + + /* Get the KTSS itself */ + Pcr->TssBase = KiGetGdtDescriptorBase(TssEntry); + + Pcr->Prcb.RspBase = Pcr->TssBase->Rsp0; // FIXME + + /* Set DPC Stack */ + Pcr->Prcb.DpcStack = DpcStack; + + /* Setup the processor set */ + Pcr->Prcb.MultiThreadProcessorSet = Pcr->Prcb.SetMember; + + /* Clear DR6/7 to cleanup bootloader debugging */ + Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr6 = 0; + Pcr->Prcb.ProcessorState.SpecialRegisters.KernelDr7 = 0; + + /* Set the Current Thread */ + Pcr->Prcb.CurrentThread = IdleThread; + + /* Start us out at PASSIVE_LEVEL */ + Pcr->Irql = PASSIVE_LEVEL; + KeSetCurrentIrql(PASSIVE_LEVEL); + + /* Set GS base */ + __writemsr(X86_MSR_GSBASE, (ULONG64)Pcr); + __writemsr(X86_MSR_KERNEL_GSBASE, (ULONG64)Pcr); +} + +VOID +NTAPI +KiInitializeCpu(PKPRCB Prcb) +{ + ULONG FeatureBits; + + /* Detect and set the CPU Type */ + KiSetProcessorType(); + + /* Get the processor features for this CPU */ + FeatureBits = KiGetFeatureBits(); + + /* Check if we support all needed features */ + if ((FeatureBits & REQUIRED_FEATURE_BITS) != REQUIRED_FEATURE_BITS) + { + /* If not, bugcheck system */ + FrLdrDbgPrint("CPU doesn't have needed features! Has: 0x%x, required: 0x%x\n", + FeatureBits, REQUIRED_FEATURE_BITS); + KeBugCheck(0); + } + + /* Set DEP to always on */ + SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSON; + FeatureBits |= KF_NX_ENABLED; + + /* Save feature bits */ + Prcb->FeatureBits = FeatureBits; + + /* Enable fx save restore support */ + __writecr4(__readcr4() | CR4_FXSR); + + /* Enable XMMI exceptions */ + __writecr4(__readcr4() | CR4_XMMEXCPT); + + /* Enable Write-Protection */ + __writecr0(__readcr0() | CR0_WP); + + /* Disable fpu monitoring */ + __writecr0(__readcr0() & ~CR0_MP); + + /* Disable x87 fpu exceptions */ + __writecr0(__readcr0() & ~CR0_NE); + + /* LDT is unused */ + __lldt(0); +} + +VOID +FASTCALL +KiInitializeTss(IN PKTSS64 Tss, + IN UINT64 Stack) +{ + PKGDTENTRY64 TssEntry; + + /* Get pointer to the GDT entry */ + TssEntry = KiGetGdtEntry(KeGetPcr()->GdtBase, KGDT64_SYS_TSS); + + /* Initialize the GDT entry */ + KiInitGdtEntry(TssEntry, (ULONG64)Tss, sizeof(KTSS64), AMD64_TSS, 0); + + /* Zero out the TSS */ + RtlZeroMemory(Tss, sizeof(KTSS64)); + + /* FIXME: I/O Map? */ + Tss->IoMapBase = 0x68; + + /* Setup ring 0 stack pointer */ + Tss->Rsp0 = Stack; + + /* Setup a stack for Double Fault Traps */ + Tss->Ist[1] = (ULONG64)KiDoubleFaultStack; + + /* Setup a stack for CheckAbort Traps */ + Tss->Ist[2] = (ULONG64)KiDoubleFaultStack; + + /* Setup a stack for NMI Traps */ + Tss->Ist[3] = (ULONG64)KiDoubleFaultStack; + + /* Load the task register */ + __ltr(KGDT64_SYS_TSS); +} + +VOID +NTAPI +INIT_FUNCTION +KiInitializeKernelMachineDependent( + IN PKPRCB Prcb, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + /* Set boot-level flags */ + KeI386CpuType = Prcb->CpuType; + KeI386CpuStep = Prcb->CpuStep; + KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; + KeProcessorLevel = (USHORT)Prcb->CpuType; + if (Prcb->CpuID) KeProcessorRevision = Prcb->CpuStep; + + /* Set basic CPU Features that user mode can read */ + SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = + (Prcb->FeatureBits & KF_MMX) ? TRUE: FALSE; + SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; + SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = + ((Prcb->FeatureBits & KF_FXSR) && (Prcb->FeatureBits & KF_XMMI)) ? TRUE: FALSE; + SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = + ((Prcb->FeatureBits & KF_FXSR) && (Prcb->FeatureBits & KF_XMMI64)) ? TRUE: FALSE; + SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = + (Prcb->FeatureBits & KF_3DNOW) ? TRUE: FALSE; + SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; + + /* Set the default NX policy (opt-in) */ + SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; + + /* Check if NPX is always on */ + if (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=ALWAYSON")) + { + /* Set it always on */ + SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSON; + Prcb->FeatureBits |= KF_NX_ENABLED; + } + else if (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTOUT")) + { + /* Set it in opt-out mode */ + SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTOUT; + Prcb->FeatureBits |= KF_NX_ENABLED; + } + else if ((strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTIN")) || + (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE"))) + { + /* Set the feature bits */ + Prcb->FeatureBits |= KF_NX_ENABLED; + } + else if ((strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=ALWAYSOFF")) || + (strstr(KeLoaderBlock->LoadOptions, "EXECUTE"))) + { + /* Set disabled mode */ + SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSOFF; + Prcb->FeatureBits |= KF_NX_DISABLED; + } + +} + +static LDR_DATA_TABLE_ENTRY LdrCoreEntries[3]; + +void +KiInitModuleList(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry; + PLIST_ENTRY Entry; + ULONG i; + + /* Initialize the list head */ + InitializeListHead(&PsLoadedModuleList); + + /* Loop the first 3 entries */ + for (Entry = LoaderBlock->LoadOrderListHead.Flink, i = 0; + Entry != &LoaderBlock->LoadOrderListHead && i < 3; + Entry = Entry->Flink, i++) + { + /* Get the data table entry */ + LdrEntry = CONTAINING_RECORD(Entry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Copy the entry */ + LdrCoreEntries[i] = *LdrEntry; + + /* Insert the copy into the list */ + InsertTailList(&PsLoadedModuleList, &LdrCoreEntries[i].InLoadOrderLinks); + } } VOID NTAPI KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG Cpu; + CCHAR Cpu; PKTHREAD InitialThread; ULONG64 InitialStack; PKIPCR Pcr; @@ -367,11 +351,12 @@ KeLoaderBlock = LoaderBlock; /* Get the current CPU number */ - Cpu = KeNumberProcessors++; // FIXME + Cpu = (CCHAR)KeNumberProcessors++; // FIXME /* LoaderBlock initialization for Cpu 0 */ if (Cpu == 0) { + FrLdrDbgPrint("LoaderBlock->Prcb=%p\n", LoaderBlock->Prcb); /* Set the initial stack, idle thread and process */ LoaderBlock->KernelStack = (ULONG_PTR)P0BootStack; LoaderBlock->Thread = (ULONG_PTR)&KiInitialThread; @@ -385,13 +370,6 @@ /* Set the PRCB for this Processor */ KiProcessorBlock[Cpu] = &Pcr->Prcb; - /* Set GS base */ - __writemsr(X86_MSR_GSBASE, (ULONG64)Pcr); - __writemsr(X86_MSR_KERNEL_GSBASE, (ULONG64)Pcr); - - /* LDT is unused */ - __lldt(0); - /* Align stack to 16 bytes */ LoaderBlock->KernelStack &= ~(16 - 1); @@ -399,9 +377,6 @@ InitialStack = LoaderBlock->KernelStack; // Checkme InitialThread = (PKTHREAD)LoaderBlock->Thread; - /* Clean the APC List Head */ - InitializeListHead(&InitialThread->ApcState.ApcListHead[KernelMode]); - /* Set us as the current process */ InitialThread->ApcState.Process = (PVOID)LoaderBlock->Process; @@ -409,34 +384,34 @@ KiInitializePcr(Pcr, Cpu, InitialThread, (PVOID)KiDoubleFaultStack); /* Initialize the CPU features */ - KiInitializeCpuFeatures(Cpu); + KiInitializeCpu(&Pcr->Prcb); /* Initial setup for the boot CPU */ if (Cpu == 0) { + /* Initialize the module list (ntos, hal, kdcom) */ + KiInitModuleList(LoaderBlock); + /* Setup the TSS descriptors and entries */ KiInitializeTss(Pcr->TssBase, InitialStack); /* Setup the IDT */ KeInitExceptions(); - /* HACK: misuse this function to pass a function pointer to kdcom */ - KdDebuggerInitialize1((PVOID)FrLdrDbgPrint); - - /* Initialize debugging system */ + /* Initialize debugging system */ KdInitSystem(0, KeLoaderBlock); /* Check for break-in */ if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); /* Hack! Wait for the debugger! */ -#ifdef _WINKD_ +#ifdef _WINKD_x while (!KdPollBreakIn()); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); #endif } - DPRINT("Pcr = %p, Gdt = %p, Idt = %p, Tss = %p\n", + DPRINT1("Pcr = %p, Gdt = %p, Idt = %p, Tss = %p\n", Pcr, Pcr->GdtBase, Pcr->IdtBase, Pcr->TssBase); /* Acquire lock */ @@ -444,13 +419,13 @@ { /* Loop until lock is free */ while ((*(volatile KSPIN_LOCK*)&KiFreezeExecutionLock) & 1); - } + } /* Initialize the Processor with HAL */ HalInitializeProcessor(Cpu, KeLoaderBlock); /* Set processor as active */ - KeActiveProcessors |= 1 << Cpu; + KeActiveProcessors |= 1ULL << Cpu; /* Release lock */ InterlockedAnd64((PLONG64)&KiFreezeExecutionLock, 0); @@ -458,45 +433,10 @@ /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); + /* Machine specific kernel initialization */ + if (Cpu == 0) KiInitializeKernelMachineDependent(&Pcr->Prcb, LoaderBlock); + /* Switch to new kernel stack and start kernel bootstrapping */ - KiSetupStackAndInitializeKernel(&KiInitialProcess.Pcb, - InitialThread, - (PVOID)InitialStack, - &Pcr->Prcb, - (CCHAR)Cpu, - KeLoaderBlock); -} - - -VOID -NTAPI -KiInitializeKernelAndGotoIdleLoop(IN PKPROCESS InitProcess, - IN PKTHREAD InitThread, - IN PVOID IdleStack, - IN PKPRCB Prcb, - IN CCHAR Number, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ -// DbgBreakPointWithStatus(0); - - /* Initialize kernel */ - KiInitializeKernel(InitProcess, - InitThread, - IdleStack, - Prcb, - Number, - KeLoaderBlock); - - /* Set the priority of this thread to 0 */ - InitThread->Priority = 0; - - /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ - _enable(); - KeLowerIrql(DISPATCH_LEVEL); - - /* Set the right wait IRQL */ - InitThread->WaitIrql = DISPATCH_LEVEL; - - /* Jump into the idle loop */ - KiIdleLoop(); -} + KiSwitchToBootStack(InitialStack & ~3); +} + Added: trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/krnlinit… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c (added) +++ trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c [iso-8859-1] Thu Sep 15 19:32:13 2011 @@ -1,0 +1,235 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/krnlinit.c + * PURPOSE: Portable part of kernel initialization + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +extern ULONG_PTR MainSSDT[]; +extern UCHAR MainSSPT[]; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +INIT_FUNCTION +KiInitializeKernel(IN PKPROCESS InitProcess, + IN PKTHREAD InitThread, + IN PVOID IdleStack, + IN PKPRCB Prcb, + IN PLOADER_PARAMETER_BLOCK LoaderBlock); + + +VOID +NTAPI +KiInitalizeHandBuiltThread( + IN PKTHREAD Thread, + IN PKPROCESS Process, + IN PVOID Stack) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Setup the Thread */ + KeInitializeThread(Process, Thread, NULL, NULL, NULL, NULL, NULL, Stack); + + Thread->NextProcessor = Prcb->Number; + Thread->Priority = HIGH_PRIORITY; + Thread->State = Running; + Thread->Affinity = (ULONG_PTR)1 << Prcb->Number; + Thread->WaitIrql = DISPATCH_LEVEL; + Process->ActiveProcessors |= (ULONG_PTR)1 << Prcb->Number; + +} + +VOID +NTAPI +INIT_FUNCTION +KiSystemStartupBootStack(VOID) +{ + PLOADER_PARAMETER_BLOCK LoaderBlock = KeLoaderBlock; // hack + PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD Thread = (PKTHREAD)KeLoaderBlock->Thread; + PKPROCESS Process = Thread->ApcState.Process; + PVOID KernelStack = (PVOID)KeLoaderBlock->KernelStack; + + /* Initialize the Power Management Support for this PRCB */ + PoInitializePrcb(Prcb); + + /* Save CPU state */ + KiSaveProcessorControlState(&Prcb->ProcessorState); + + /* Get cache line information for this CPU */ + KiGetCacheInformation(); + + /* Initialize spinlocks and DPC data */ + KiInitSpinLocks(Prcb, Prcb->Number); + + /* Set up the thread-related fields in the PRCB */ + Prcb->CurrentThread = Thread; + Prcb->NextThread = NULL; + Prcb->IdleThread = Thread; + + /* Initialize PRCB pool lookaside pointers */ + ExInitPoolLookasidePointers(); + + /* Check if this is the boot cpu */ + if (Prcb->Number == 0) + { + /* Initialize the kernel */ + KiInitializeKernel(Process, Thread, KernelStack, Prcb, LoaderBlock); + } + else + { + /* Initialize the startup thread */ + KiInitalizeHandBuiltThread(Thread, Process, KernelStack); + + /* Initialize cpu with HAL */ + if (!HalInitSystem(0, LoaderBlock)) + { + /* Initialization failed */ + KeBugCheck(HAL_INITIALIZATION_FAILED); + } + } + + /* Raise to Dispatch */ + KfRaiseIrql(DISPATCH_LEVEL); + + /* Set the Idle Priority to 0. This will jump into Phase 1 */ + KeSetPriorityThread(Thread, 0); + + /* If there's no thread scheduled, put this CPU in the Idle summary */ + KiAcquirePrcbLock(Prcb); + if (!Prcb->NextThread) KiIdleSummary |= (ULONG_PTR)1 << Prcb->Number; + KiReleasePrcbLock(Prcb); + + /* Raise back to HIGH_LEVEL and clear the PRCB for the loader block */ + KfRaiseIrql(HIGH_LEVEL); + LoaderBlock->Prcb = 0; + + /* Set the priority of this thread to 0 */ + Thread = KeGetCurrentThread(); + Thread->Priority = 0; + + /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ + _enable(); + KeLowerIrql(DISPATCH_LEVEL); + + /* Set the right wait IRQL */ + Thread->WaitIrql = DISPATCH_LEVEL; + + /* Jump into the idle loop */ + KiIdleLoop(); +} + +VOID +NTAPI +INIT_FUNCTION +KiInitializeKernel(IN PKPROCESS InitProcess, + IN PKTHREAD InitThread, + IN PVOID IdleStack, + IN PKPRCB Prcb, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + ULONG PageDirectory[2]; + PVOID DpcStack; + ULONG i; + + /* Set Node Data */ + KeNodeBlock[0] = &KiNode0; + Prcb->ParentNode = KeNodeBlock[0]; + KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; + + /* Set boot-level flags */ + KeFeatureBits = Prcb->FeatureBits; + + /* Set the current MP Master KPRCB to the Boot PRCB */ + Prcb->MultiThreadSetMaster = Prcb; + + /* Lower to APC_LEVEL */ + KeLowerIrql(APC_LEVEL); + + /* Initialize Bugcheck Callback data */ + InitializeListHead(&KeBugcheckCallbackListHead); + InitializeListHead(&KeBugcheckReasonCallbackListHead); + KeInitializeSpinLock(&BugCheckCallbackLock); + + /* Initialize the Timer Expiration DPC */ + KeInitializeDpc(&KiTimerExpireDpc, KiTimerExpiration, NULL); + KeSetTargetProcessorDpc(&KiTimerExpireDpc, 0); + + /* Initialize Profiling data */ + KeInitializeSpinLock(&KiProfileLock); + InitializeListHead(&KiProfileListHead); + InitializeListHead(&KiProfileSourceListHead); + + /* Loop the timer table */ + for (i = 0; i < TIMER_TABLE_SIZE; i++) + { + /* Initialize the list and entries */ + InitializeListHead(&KiTimerTableListHead[i].Entry); + KiTimerTableListHead[i].Time.HighPart = 0xFFFFFFFF; + KiTimerTableListHead[i].Time.LowPart = 0; + } + + /* Initialize the Swap event and all swap lists */ + KeInitializeEvent(&KiSwapEvent, SynchronizationEvent, FALSE); + InitializeListHead(&KiProcessInSwapListHead); + InitializeListHead(&KiProcessOutSwapListHead); + InitializeListHead(&KiStackInSwapListHead); + + /* Initialize the mutex for generic DPC calls */ + ExInitializeFastMutex(&KiGenericCallDpcMutex); + + /* Initialize the syscall table */ + KeServiceDescriptorTable[0].Base = MainSSDT; + KeServiceDescriptorTable[0].Count = NULL; + KeServiceDescriptorTable[0].Limit = KiServiceLimit; + KeServiceDescriptorTable[1].Limit = 0; + KeServiceDescriptorTable[0].Number = MainSSPT; + + /* Copy the the current table into the shadow table for win32k */ + RtlCopyMemory(KeServiceDescriptorTableShadow, + KeServiceDescriptorTable, + sizeof(KeServiceDescriptorTable)); + + /* Initialize the Idle Process and the Process Listhead */ + InitializeListHead(&KiProcessListHead); + PageDirectory[0] = 0; + PageDirectory[1] = 0; + KeInitializeProcess(InitProcess, + 0, + 0xFFFFFFFF, + PageDirectory, + FALSE); + InitProcess->QuantumReset = MAXCHAR; + + /* Initialize the startup thread */ + KiInitalizeHandBuiltThread(InitThread, InitProcess, IdleStack); + + /* Initialize the Kernel Executive */ + ExpInitializeExecutive(0, LoaderBlock); + + /* Calculate the time reciprocal */ + KiTimeIncrementReciprocal = + KiComputeReciprocal(KeMaximumIncrement, + &KiTimeIncrementShiftCount); + + /* Update DPC Values in case they got updated by the executive */ + Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; + Prcb->MinimumDpcRate = KiMinimumDpcRate; + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + + /* Allocate the DPC Stack */ + DpcStack = MmCreateKernelStack(FALSE, 0); + if (!DpcStack) KeBugCheckEx(NO_PAGES_AVAILABLE, 1, 0, 0, 0); + Prcb->DpcStack = DpcStack; +} + Propchange: trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years

[tkreuzer] 53713: [CRT] - Implement MSVC versions of call_copy_ctor, call_dtor, continue_after_catch, __CxxFrameHandler - Fix amd64 versions of _control87 and _statusfp - Fix MSVC and amd64 warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 15 17:11:53 2011 New Revision: 53713 URL: http://svn.reactos.org/svn/reactos?rev=53713&view=rev Log: [CRT] - Implement MSVC versions of call_copy_ctor, call_dtor, continue_after_catch, __CxxFrameHandler - Fix amd64 versions of _control87 and _statusfp - Fix MSVC and amd64 warnings Added: trunk/reactos/lib/sdk/crt/float/amd64/getsetfpcw.S (with props) Modified: trunk/reactos/include/reactos/wine/exception.h trunk/reactos/lib/sdk/crt/conio/cputs.c trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/except/cpp.c trunk/reactos/lib/sdk/crt/except/cppexcept.c trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c trunk/reactos/lib/sdk/crt/float/i386/statfp.c trunk/reactos/lib/sdk/crt/include/internal/time.h trunk/reactos/lib/sdk/crt/math/cos.c trunk/reactos/lib/sdk/crt/math/sin.c trunk/reactos/lib/sdk/crt/mbstring/mbsstr.c trunk/reactos/lib/sdk/crt/misc/assert.c trunk/reactos/lib/sdk/crt/misc/environ.c trunk/reactos/lib/sdk/crt/misc/getargs.c trunk/reactos/lib/sdk/crt/misc/i10output.c trunk/reactos/lib/sdk/crt/printf/_sxprintf.c trunk/reactos/lib/sdk/crt/printf/streamout.c trunk/reactos/lib/sdk/crt/process/process.c trunk/reactos/lib/sdk/crt/search/bsearch.c trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c trunk/reactos/lib/sdk/crt/stdio/file.c trunk/reactos/lib/sdk/crt/stdio/findgen.c trunk/reactos/lib/sdk/crt/stdio/stat.c trunk/reactos/lib/sdk/crt/stdio/stat64.c trunk/reactos/lib/sdk/crt/stdlib/atexit.c trunk/reactos/lib/sdk/crt/stdlib/fullpath.c trunk/reactos/lib/sdk/crt/stdlib/getenv.c trunk/reactos/lib/sdk/crt/stdlib/makepath.c trunk/reactos/lib/sdk/crt/stdlib/makepath_s.c trunk/reactos/lib/sdk/crt/stdlib/qsort.c trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c trunk/reactos/lib/sdk/crt/stdlib/wmakpath_s.c trunk/reactos/lib/sdk/crt/string/itow.c trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c trunk/reactos/lib/sdk/crt/string/scanf.h trunk/reactos/lib/sdk/crt/string/strtol.c trunk/reactos/lib/sdk/crt/string/strtoul.c trunk/reactos/lib/sdk/crt/string/strtoull.c trunk/reactos/lib/sdk/crt/string/wcs.c trunk/reactos/lib/sdk/crt/string/wcstol.c trunk/reactos/lib/sdk/crt/string/wcstombs_nt.c trunk/reactos/lib/sdk/crt/string/wcstoul.c trunk/reactos/lib/sdk/crt/string/wtol.c trunk/reactos/lib/sdk/crt/time/clock.c trunk/reactos/lib/sdk/crt/time/ftime.c trunk/reactos/lib/sdk/crt/time/futime.c trunk/reactos/lib/sdk/crt/time/gmtime.c trunk/reactos/lib/sdk/crt/time/mktime.c trunk/reactos/lib/sdk/crt/time/time.c trunk/reactos/lib/sdk/crt/time/timezone.c trunk/reactos/lib/sdk/crt/wine/heap.c trunk/reactos/lib/sdk/crt/wine/undname.c Modified: trunk/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/excep… ============================================================================== --- trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -74,6 +74,11 @@ #define siglongjmp(buf,val) longjmp(buf,val) #endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4733) +#endif + static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { #ifdef __i386__ @@ -101,6 +106,10 @@ #endif } +#ifdef _MSC_VER +#pragma warning(pop) +#endif + extern void __wine_enter_vm86( CONTEXT *context ); #ifdef __cplusplus Modified: trunk/reactos/lib/sdk/crt/conio/cputs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/conio/cputs.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/conio/cputs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/conio/cputs.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -26,7 +26,7 @@ UNLOCK_CONSOLE; return retval; #else - int len = strlen(_str); + int len = (int)strlen(_str); DWORD written = 0; if (!WriteFile( fdesc[stdout->_file].hFile ,_str,len,&written,NULL)) return -1; Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -379,6 +379,7 @@ except/amd64/seh.s except/amd64/ehandler.c float/amd64/clearfp.S + float/amd64/getsetfpcw.S float/i386/cntrlfp.c float/amd64/fpreset.S float/amd64/logb.S Modified: trunk/reactos/lib/sdk/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cpp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -132,7 +132,7 @@ _this->vtable = &MSVCRT_exception_vtable; if (*name) { - unsigned int name_len = strlen(*name) + 1; + size_t name_len = strlen(*name) + 1; _this->name = MSVCRT_malloc(name_len); memcpy(_this->name, *name, name_len); _this->do_free = TRUE; @@ -608,7 +608,7 @@ if (name) { - unsigned int len = strlen(name); + size_t len = strlen(name); /* It seems _unDName may leave blanks at the end of the demangled name */ while (len && name[--len] == ' ') Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cppexce… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -81,7 +81,25 @@ { TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); #ifdef _MSC_VER -#pragma message ("call_copy_ctor is unimplemented for MSC") + if (has_vbase) + { + __asm + { + mov ecx, this + push 1 + push src + call func + } + } + else + { + __asm + { + mov ecx, this + push src + call func + } + } #else if (has_vbase) /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ @@ -97,23 +115,42 @@ static inline void call_dtor( void *func, void *object ) { #ifdef _MSC_VER -#pragma message ("call_dtor is unimplemented for MSC") + __asm + { + mov ecx, object + call func + } #else __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); #endif } +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4731) +/* continue execution to the specified address after exception is caught */ +__forceinline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) +{ + __asm + { + mov eax, addr + mov edx, frame + mov esp, [edx-4] + lea ebp, [edx+12] + jmp eax + } + for (;;) ; /* unreached */ +} +#pragma warning(pop) +#else /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) { -#ifdef _MSC_VER -#pragma message ("continue_after_catch is unimplemented for MSC") -#else __asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1" : : "r" (frame), "a" (addr) ); -#endif for (;;) ; /* unreached */ } +#endif static inline void dump_type( const cxx_type_info *type ) { @@ -235,7 +272,7 @@ while (trylevel != last_level) { - if (trylevel < 0 || trylevel >= descr->unwind_count) + if (trylevel < 0 || (unsigned)trylevel >= descr->unwind_count) { ERR( "invalid trylevel %d\n", trylevel ); MSVCRT_terminate(); @@ -448,11 +485,22 @@ extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); #ifdef _MSC_VER -#pragma message ("__CxxFrameHandler is unimplemented for MSC") -DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, +DWORD _declspec(naked) __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ) { - return 0; + __asm + { + push 0 + push 0 + push eax + push [esp + 28] + push [esp + 28] + push [esp + 28] + push [esp + 28] + call cxx_frame_handler + add esp, 28 + ret + } } #else __ASM_GLOBAL_FUNC( __CxxFrameHandler, Added: trunk/reactos/lib/sdk/crt/float/amd64/getsetfpcw.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/amd64/ge… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/amd64/getsetfpcw.S (added) +++ trunk/reactos/lib/sdk/crt/float/amd64/getsetfpcw.S [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -1,0 +1,24 @@ + +#include <asm.inc> + +.code64 + +PUBLIC __getfpcw87 +FUNC __getfpcw87 + sub rsp, 8 + .ENDPROLOG + stmxcsr [rsp] + mov rax, [rsp] + add rsp, 8 + ret +ENDFUNC __getfpcw87 + +PUBLIC __setfpcw87 +FUNC __setfpcw87 + mov qword ptr [rsp + 8], rcx + .ENDPROLOG + ldmxcsr [rsp + 8] + ret +ENDFUNC __setfpcw87 + +END Propchange: trunk/reactos/lib/sdk/crt/float/amd64/getsetfpcw.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/cnt… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -23,6 +23,11 @@ #define X87_CW_IC (1<<12) /* infinity control flag */ +#ifdef _M_AMD64 +unsigned int __getfpcw87(void); +void __setfpcw87(unsigned int); +#endif + /* * @implemented */ @@ -43,12 +48,12 @@ TRACE("(%08x, %08x): Called\n", newval, mask); /* Get fp control word */ -#if defined(__GNUC__) +#ifdef _M_AMD64 + fpword = __getfpcw87(); +#elif defined(__GNUC__) __asm__ __volatile__( "fstcw %0" : "=m" (fpword) : ); -#elif defined(_M_IX86) +#else __asm fstcw [fpword]; -#else - #pragma message("FIXME: _control87 is halfplemented") #endif TRACE("Control word before : %08x\n", fpword); @@ -98,12 +103,12 @@ TRACE("Control word after : %08x\n", fpword); /* Put fp control word */ -#if defined(__GNUC__) +#ifdef _M_AMD64 + __setfpcw87(fpword); +#elif defined(__GNUC__) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); -#elif defined(_M_IX86) +#else __asm fldcw [fpword]; -#else - #pragma message("FIXME: _control87 is halfplemented") #endif return flags; Modified: trunk/reactos/lib/sdk/crt/float/i386/statfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/sta… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/statfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/statfp.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -26,12 +26,13 @@ { unsigned int retVal = 0; unsigned int fpword; -#if defined(__GNUC__) + +#ifdef _M_AMD64 + fpword = _mm_getcsr(); +#elif defined(__GNUC__) __asm__ __volatile__( "fstsw %0" : "=m" (fpword) : ); -#elif defined(_M_IX86) +#else // _MSC_VER __asm fstsw [fpword]; -#else - #pragma message("FIXME: _statusfp is halfplemented") #endif if (fpword & 0x1) retVal |= _SW_INVALID; if (fpword & 0x2) retVal |= _SW_DENORMAL; Modified: trunk/reactos/lib/sdk/crt/include/internal/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/time.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/time.h [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -10,17 +10,17 @@ #define LEAPDAY 59 static __inline -time_t +__time64_t FileTimeToUnixTime(const FILETIME *FileTime, USHORT *millitm) { ULARGE_INTEGER ULargeInt; - time_t time; + __time64_t time; ULargeInt.LowPart = FileTime->dwLowDateTime; ULargeInt.HighPart = FileTime->dwHighDateTime; ULargeInt.QuadPart -= DIFFTIME; - time = (time_t)(ULargeInt.QuadPart / 10000000); + time = ULargeInt.QuadPart / 10000000; if (millitm) *millitm = (USHORT)((ULargeInt.QuadPart % 10000000) / 10000); Modified: trunk/reactos/lib/sdk/crt/math/cos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/cos.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/cos.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/cos.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -19,7 +19,7 @@ double x2, result; /* Calculate the quadrant */ - quadrant = x * (2./M_PI); + quadrant = (int)(x * (2./M_PI)); /* Get offset inside quadrant */ x = x - quadrant * (M_PI/2.); @@ -33,7 +33,7 @@ /* Calculate the negative of the square of x */ x2 = - (x * x); - /* This is an unrolled taylor series using <PRECISION> iterations + /* This is an unrolled taylor series using <PRECISION> iterations * Example with 4 iterations: * result = 1 - x^2/2! + x^4/4! - x^6/6! + x^8/8! * To save multiplications and to keep the precision high, it's performed Modified: trunk/reactos/lib/sdk/crt/math/sin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sin.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sin.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/sin.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -19,7 +19,7 @@ double x2, result; /* Calculate the quadrant */ - quadrant = x * (2./M_PI); + quadrant = (int)(x * (2./M_PI)); /* Get offset inside quadrant */ x = x - quadrant * (M_PI/2.); @@ -33,7 +33,7 @@ /* Calculate the negative of the square of x */ x2 = - (x * x); - /* This is an unrolled taylor series using <PRECISION> iterations + /* This is an unrolled taylor series using <PRECISION> iterations * Example with 4 iterations: * result = 1 - x^2/2! + x^4/4! - x^6/6! + x^8/8! * To save multiplications and to keep the precision high, it's performed Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsst… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbsstr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbsstr.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -6,7 +6,7 @@ */ unsigned char *_mbsstr(const unsigned char *src1,const unsigned char *src2) { - int len; + size_t len; if (src2 ==NULL || *src2 == 0) return (unsigned char *)src1; Modified: trunk/reactos/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/assert.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -5,7 +5,7 @@ #include <stdlib.h> #include <signal.h> -static const char formatstr[] = +static const char formatstr[] = "Assertion failed!\n\n" "Program: %s\n" "File: %s\n" @@ -23,7 +23,7 @@ HMODULE hmodUser32; char achProgram[40]; char *pszBuffer; - int len; + size_t len; int iResult; /* Assertion failed at foo.c line 45: x<y */ @@ -40,7 +40,7 @@ /* Get the file name of the module */ len = GetModuleFileNameA(NULL, achProgram, 40); - + /* Calculate full length of the message */ len += sizeof(formatstr) + len + strlen(exp) + strlen(file); @@ -51,8 +51,8 @@ _snprintf(pszBuffer, len, formatstr, achProgram, file, line, exp); /* Display a message box */ - iResult = pMessageBoxA(NULL, - pszBuffer, + iResult = pMessageBoxA(NULL, + pszBuffer, "ReactOS C Runtime Library", MB_ABORTRETRYIGNORE | MB_ICONERROR); Modified: trunk/reactos/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/environ.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/environ.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/environ.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -40,7 +40,8 @@ { char *ptr, *environment_strings; char **envptr; - int count = 1, len; + int count = 1; + size_t len; TRACE("BlockEnvToEnvironA()\n"); @@ -91,7 +92,8 @@ { wchar_t *ptr, *environment_strings; wchar_t **envptr; - int count = 1, len; + int count = 1; + size_t len; TRACE("BlockEnvToEnvironW()\n"); Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/getargs.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -71,7 +71,7 @@ HANDLE hFile; BOOLEAN first = TRUE; wchar_t buffer[256]; - int pos; + uintptr_t pos; if (expand_wildcards && (s = wcspbrk(name, L"*?"))) { @@ -136,7 +136,7 @@ HANDLE hFile; BOOLEAN first = TRUE; char buffer[256]; - int pos; + uintptr_t pos; if (expand_wildcards && (s = strpbrk(name, "*?"))) { @@ -181,7 +181,8 @@ */ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, int* new_mode) { - int i, afterlastspace, ignorespace, len, doexpand; + int i, afterlastspace, ignorespace, doexpand; + size_t len; /* missing threading init */ @@ -262,7 +263,8 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv, int expand_wildcards, int* new_mode) { - int i, afterlastspace, ignorespace, len, doexpand; + int i, afterlastspace, ignorespace, doexpand; + size_t len; /* missing threading init */ Modified: trunk/reactos/lib/sdk/crt/misc/i10output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/i10output… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/i10output.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/i10output.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -59,7 +59,7 @@ } if(flag&1) { - int exp = 1+floor(log10(d)); + int exp = (int)(1+floor(log10(d))); prec += exp; if(exp < 0) @@ -83,7 +83,7 @@ data->pos++; for(p = buf+prec+1; p>buf+1 && *p=='0'; p--); - data->len = p-buf; + data->len = (BYTE)(p - buf); memcpy(data->str, buf+1, data->len); data->str[data->len] = '\0'; Modified: trunk/reactos/lib/sdk/crt/printf/_sxprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_sxprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_sxprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_sxprintf.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -47,7 +47,7 @@ stream._ptr = stream._base; stream._charbuf = 0; #if USE_COUNT - stream._cnt = count * sizeof(TCHAR); + stream._cnt = (int)(count * sizeof(TCHAR)); #else stream._cnt = INT_MAX; #endif Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -67,7 +67,7 @@ (flags & FLAG_LONGDOUBLE) ? va_arg(argptr, long double) : \ va_arg(argptr, double) -#define get_exp(f) floor(f == 0 ? 0 : (f >= 0 ? log10(f) : log10(-f))) +#define get_exp(f) (int)floor(f == 0 ? 0 : (f >= 0 ? log10(f) : log10(-f))) #define round(x) floor((x) + 0.5) #ifndef _USER32_WSPRINTF @@ -244,7 +244,7 @@ static int -streamout_astring(FILE *stream, const char *string, int count) +streamout_astring(FILE *stream, const char *string, size_t count) { TCHAR chr; int written = 0; @@ -267,7 +267,7 @@ static int -streamout_wstring(FILE *stream, const wchar_t *string, int count) +streamout_wstring(FILE *stream, const wchar_t *string, size_t count) { wchar_t chr; int written = 0; @@ -317,7 +317,8 @@ TCHAR chr, *string; STRING *nt_string; const TCHAR *digits, *prefix; - int base, len, prefixlen, fieldwidth, precision, padding; + int base, fieldwidth, precision, padding; + size_t prefixlen, len; int written = 1, written_all = 0; unsigned int flags; unsigned __int64 val64; @@ -510,7 +511,7 @@ len = wcslen((wchar_t*)string); else len = strlen((char*)string); - if (precision >= 0 && len > precision) len = precision; + if (precision >= 0 && len > (unsigned)precision) len = precision; precision = 0; break; @@ -611,7 +612,7 @@ /* Calculate padding */ prefixlen = prefix ? _tcslen(prefix) : 0; if (precision < 0) precision = 0; - padding = fieldwidth - len - prefixlen - precision; + padding = (int)(fieldwidth - len - prefixlen - precision); if (padding < 0) padding = 0; /* Optional left space padding */ Modified: trunk/reactos/lib/sdk/crt/process/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/proces… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -117,7 +117,8 @@ static _TCHAR* argvtosT(const _TCHAR* const* argv, _TCHAR delim) { - int i, len; + int i; + size_t len; _TCHAR *ptr, *str; if (argv == NULL) @@ -149,7 +150,7 @@ { va_list alist2 = alist; _TCHAR *ptr, *str; - int len; + size_t len; if (arg0 == NULL) return NULL; @@ -327,7 +328,7 @@ { va_list argp; _TCHAR* args; - int ret = -1; + intptr_t ret = -1; TRACE(MK_STR(_tspawnl)"('%"sT"')\n", cmdname); @@ -348,7 +349,7 @@ intptr_t _tspawnv(int mode, const _TCHAR *cmdname, const _TCHAR* const* argv) { _TCHAR* args; - int ret = -1; + intptr_t ret = -1; TRACE(MK_STR(_tspawnv)"('%"sT"')\n", cmdname); @@ -371,7 +372,7 @@ _TCHAR* args; _TCHAR* envs; _TCHAR const * const* ptr; - int ret = -1; + intptr_t ret = -1; TRACE(MK_STR(_tspawnle)"('%"sT"')\n", cmdname); @@ -404,7 +405,7 @@ { _TCHAR *args; _TCHAR *envs; - int ret = -1; + intptr_t ret = -1; TRACE(MK_STR(_tspawnve)"('%"sT"')\n", cmdname); @@ -442,7 +443,7 @@ { va_list argp; _TCHAR* args; - int ret = -1; + intptr_t ret = -1; _TCHAR pathname[FILENAME_MAX]; TRACE(MK_STR(_tspawnlp)"('%"sT"')\n", cmdname); @@ -467,7 +468,7 @@ _TCHAR* args; _TCHAR* envs; _TCHAR const* const * ptr; - int ret = -1; + intptr_t ret = -1; _TCHAR pathname[FILENAME_MAX]; TRACE(MK_STR(_tspawnlpe)"('%"sT"')\n", cmdname); @@ -512,7 +513,7 @@ { _TCHAR* args; va_list argp; - int ret = -1; + intptr_t ret = -1; TRACE(MK_STR(_texecl)"('%"sT"')\n", cmdname); @@ -545,7 +546,7 @@ _TCHAR* args; _TCHAR* envs; _TCHAR const* const* ptr; - int ret = -1; + intptr_t ret = -1; TRACE(MK_STR(_texecle)"('%"sT"')\n", cmdname); @@ -586,7 +587,7 @@ { _TCHAR* args; va_list argp; - int ret = -1; + intptr_t ret = -1; _TCHAR pathname[FILENAME_MAX]; TRACE(MK_STR(_texeclp)"('%"sT"')\n", cmdname); @@ -620,7 +621,7 @@ _TCHAR* args; _TCHAR* envs; _TCHAR const* const* ptr; - int ret = -1; + intptr_t ret = -1; _TCHAR pathname[FILENAME_MAX]; TRACE(MK_STR(_texeclpe)"('%"sT"')\n", cmdname); Modified: trunk/reactos/lib/sdk/crt/search/bsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/bsearch… ============================================================================== --- trunk/reactos/lib/sdk/crt/search/bsearch.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/search/bsearch.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -9,7 +9,8 @@ size_t size, int (__cdecl *cmp)(const void *ck, const void *ce)) { char *base = (char *)base0; - int lim, cmpval; + size_t lim; + int cmpval; void *p; for (lim = nelem; lim != 0; lim >>= 1) Modified: trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/_flsbuf.… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -56,7 +56,7 @@ if (stream->_base && !(stream->_flag & _IONBF)) { /* We can, check if there is something to write */ - count = stream->_ptr - stream->_base; + count = (int)(stream->_ptr - stream->_base); if (count > 0) written = _write(stream->_file, stream->_base, count); else Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -267,7 +267,7 @@ char* wxflag_ptr; HANDLE* handle_ptr; - *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * fdend; + *size = (WORD)(sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * fdend); *block = calloc(*size, 1); if (!*block) { @@ -302,7 +302,7 @@ void msvcrt_init_io(void) { STARTUPINFOA si; - int i; + unsigned int i; InitializeCriticalSection(&FILE_cs); FILE_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FILE_cs"); @@ -397,7 +397,7 @@ static int flush_buffer(FILE* file) { if(file->_bufsiz) { - int cnt=file->_ptr-file->_base; + int cnt = (int)(file->_ptr - file->_base); if(cnt>0 && _write(file->_file, file->_base, cnt) != cnt) { file->_flag |= _IOERR; return EOF; @@ -839,7 +839,7 @@ */ LONG CDECL _lseek(int fd, LONG offset, int whence) { - return _lseeki64(fd, offset, whence); + return (LONG)_lseeki64(fd, offset, whence); } /********************************************************************* @@ -1056,7 +1056,7 @@ */ FILE* CDECL _wfdopen(int fd, const wchar_t *mode) { - unsigned mlen = strlenW(mode); + unsigned mlen = (unsigned)strlenW(mode); char *modea = calloc(mlen + 1, 1); FILE* file = NULL; int open_flags, stream_flags; @@ -1409,7 +1409,7 @@ */ int CDECL _wsopen( const wchar_t* path, int oflags, int shflags, ... ) { - const unsigned int len = strlenW(path); + const unsigned int len = (unsigned)strlenW(path); char *patha = calloc(len + 1,1); va_list ap; int pmode; @@ -1453,7 +1453,7 @@ */ int CDECL _wopen(const wchar_t *path,int flags,...) { - const unsigned int len = strlenW(path); + const unsigned int len = (unsigned)strlenW(path); char *patha = calloc(len + 1,1); va_list ap; int pmode; @@ -1793,7 +1793,7 @@ *_errno() = ENOSPC; if(nr_lf) free(p); - return s - buf_start; + return (int)(s - buf_start); } else { @@ -2071,7 +2071,7 @@ */ size_t CDECL fwrite(const void *ptr, size_t size, size_t nmemb, FILE* file) { - size_t wrcnt=size * nmemb; + int wrcnt=(int)(size * nmemb); int written = 0; if (size == 0) return 0; @@ -2184,7 +2184,7 @@ */ FILE * CDECL _wfsopen(const wchar_t *path, const wchar_t *mode, int share) { - const unsigned int plen = strlenW(path), mlen = strlenW(mode); + const unsigned int plen = (unsigned)strlenW(path), mlen = (unsigned)strlenW(mode); char *patha = calloc(plen + 1, 1); char *modea = calloc(mlen + 1, 1); @@ -2256,7 +2256,7 @@ * fread (MSVCRT.@) */ size_t CDECL fread(void *ptr, size_t size, size_t nmemb, FILE* file) -{ size_t rcnt=size * nmemb; +{ int rcnt=(int)(size * nmemb); size_t read=0; int pread=0; @@ -2431,7 +2431,7 @@ if(pos == -1) return -1; if(file->_bufsiz) { if( file->_flag & _IOWRT ) { - off = file->_ptr - file->_base; + off = (int)(file->_ptr - file->_base); } else { off = -file->_cnt; if (fdesc[file->_file].wxflag & WX_TEXT) { @@ -2457,7 +2457,7 @@ if(*pos == -1) return -1; if(file->_bufsiz) { if( file->_flag & _IOWRT ) { - off = file->_ptr - file->_base; + off = (int)(file->_ptr - file->_base); } else { off = -file->_cnt; if (fdesc[file->_file].wxflag & WX_TEXT) { @@ -2664,7 +2664,7 @@ file->_flag &= ~_IONBF; file->_base = file->_ptr = buf; if(buf) { - file->_bufsiz = size; + file->_bufsiz = (int)size; } } else { file->_flag |= _IONBF; Modified: trunk/reactos/lib/sdk/crt/stdio/findgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/findgen.… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/findgen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/findgen.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -14,9 +14,9 @@ } result->attrib = FindFileData.dwFileAttributes; - result->time_create = FileTimeToUnixTime(&FindFileData.ftCreationTime,NULL); - result->time_access = FileTimeToUnixTime(&FindFileData.ftLastAccessTime,NULL); - result->time_write = FileTimeToUnixTime(&FindFileData.ftLastWriteTime,NULL); + result->time_create = (time_t)FileTimeToUnixTime(&FindFileData.ftCreationTime,NULL); + result->time_access = (time_t)FileTimeToUnixTime(&FindFileData.ftLastAccessTime,NULL); + result->time_write = (time_t)FileTimeToUnixTime(&FindFileData.ftLastWriteTime,NULL); result->size = (((__int64)FindFileData.nFileSizeHigh)<<32) + FindFileData.nFileSizeLow; _tcsncpy(result->name,FindFileData.cFileName,MAX_PATH); @@ -36,9 +36,9 @@ } result->attrib = FindFileData.dwFileAttributes; - result->time_create = FileTimeToUnixTime(&FindFileData.ftCreationTime,NULL); - result->time_access = FileTimeToUnixTime(&FindFileData.ftLastAccessTime,NULL); - result->time_write = FileTimeToUnixTime(&FindFileData.ftLastWriteTime,NULL); + result->time_create = (time_t)FileTimeToUnixTime(&FindFileData.ftCreationTime,NULL); + result->time_access = (time_t)FileTimeToUnixTime(&FindFileData.ftLastAccessTime,NULL); + result->time_write = (time_t)FileTimeToUnixTime(&FindFileData.ftLastWriteTime,NULL); result->size = (((__int64)FindFileData.nFileSizeHigh)<<32) + FindFileData.nFileSizeLow; _tcsncpy(result->name,FindFileData.cFileName, MAX_PATH); Modified: trunk/reactos/lib/sdk/crt/stdio/stat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/stat.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/stat.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/stat.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -9,10 +9,10 @@ buf->st_uid = (buf64)->st_uid; \ buf->st_gid = (buf64)->st_gid; \ buf->st_rdev = (buf64)->st_rdev; \ - buf->st_size = (buf64)->st_size; \ - buf->st_atime = (buf64)->st_atime; \ - buf->st_mtime = (buf64)->st_mtime; \ - buf->st_ctime = (buf64)->st_ctime; \ + buf->st_size = (_off_t)(buf64)->st_size; \ + buf->st_atime = (time_t)(buf64)->st_atime; \ + buf->st_mtime = (time_t)(buf64)->st_mtime; \ + buf->st_ctime = (time_t)(buf64)->st_ctime; \ int CDECL _tstat(const _TCHAR* path, struct _stat * buf) { Modified: trunk/reactos/lib/sdk/crt/stdio/stat64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/stat64.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -2,7 +2,7 @@ #include <tchar.h> #include <direct.h> -HANDLE fdtoh(int fd); +HANDLE fdtoh(int fd); #define ALL_S_IREAD (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) #define ALL_S_IWRITE (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) @@ -27,7 +27,7 @@ DWORD dw; WIN32_FILE_ATTRIBUTE_DATA hfi; unsigned short mode = ALL_S_IREAD; - int plen; + size_t plen; TRACE(":file (%s) buf(%p)\n",path,buf); @@ -136,7 +136,7 @@ buf->st_atime = dw; RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastWriteTime, &dw); buf->st_mtime = buf->st_ctime = dw; - buf->st_nlink = hfi.nNumberOfLinks; + buf->st_nlink = (short)hfi.nNumberOfLinks; } TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",hfi.dwFileAttributes, buf->st_mode); Modified: trunk/reactos/lib/sdk/crt/stdlib/atexit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/atexit.… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/atexit.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/atexit.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -23,7 +23,7 @@ _onexit_t __dllonexit(_onexit_t func, _onexit_t **start, _onexit_t **end) { _onexit_t *tmp; - int len; + size_t len; if (!start || !*start || !end || !*end) return NULL; Modified: trunk/reactos/lib/sdk/crt/stdlib/fullpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/fullpat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/fullpath.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/fullpath.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -25,7 +25,7 @@ absPath = malloc(maxLength); } - copied = GetFullPathName(relPath,maxLength,absPath,&lpFilePart); + copied = GetFullPathName(relPath,(DWORD)maxLength,absPath,&lpFilePart); if (copied == 0 || copied > maxLength) return NULL; Modified: trunk/reactos/lib/sdk/crt/stdlib/getenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/getenv.… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/getenv.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/getenv.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -17,7 +17,7 @@ char *getenv(const char *name) { char **environ; - unsigned int length = strlen(name); + size_t length = strlen(name); for (environ = *__p__environ(); *environ; environ++) { @@ -35,7 +35,7 @@ wchar_t *_wgetenv(const wchar_t *name) { wchar_t **environ; - unsigned int length = wcslen(name); + size_t length = wcslen(name); for (environ = *__p__wenviron(); *environ; environ++) { Modified: trunk/reactos/lib/sdk/crt/stdlib/makepath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/makepat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/makepath.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/makepath.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -34,7 +34,7 @@ } if (dir && dir[0]) { - unsigned int len = strlen(dir); + size_t len = strlen(dir); memmove(p, dir, len); p += len; if (p[-1] != '/' && p[-1] != '\\') @@ -42,7 +42,7 @@ } if (fname && fname[0]) { - unsigned int len = strlen(fname); + size_t len = strlen(fname); memmove(p, fname, len); p += len; } Modified: trunk/reactos/lib/sdk/crt/stdlib/makepath_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/makepat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/makepath_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/makepath_s.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -44,9 +44,9 @@ if (directory && directory[0]) { - unsigned int len = strlen(directory); + size_t len = strlen(directory); unsigned int needs_separator = directory[len - 1] != '/' && directory[len - 1] != '\\'; - unsigned int copylen = min(size - 1, len); + size_t copylen = min(size - 1, len); if (size < 2) goto range; @@ -71,8 +71,8 @@ if (filename && filename[0]) { - unsigned int len = strlen(filename); - unsigned int copylen = min(size - 1, len); + size_t len = strlen(filename); + size_t copylen = min(size - 1, len); if (size < 2) goto range; @@ -88,9 +88,9 @@ if (extension && extension[0]) { - unsigned int len = strlen(extension); + size_t len = strlen(extension); unsigned int needs_period = extension[0] != '.'; - unsigned int copylen; + size_t copylen; if (size < 2) goto range; Modified: trunk/reactos/lib/sdk/crt/stdlib/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/qsort.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -53,9 +53,9 @@ qst(size_t size, int (__cdecl *compar)(const void*, const void*), char *base, char *max) { char c, *i, *j, *jj; - int ii; + size_t ii; char *mid, *tmp; - int lo, hi; + size_t lo, hi; size_t thresh; size_t mthresh; Modified: trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/wmakpat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -32,7 +32,7 @@ } if (dir && dir[0]) { - unsigned int len = strlenW(dir); + size_t len = strlenW(dir); memmove(p, dir, len * sizeof(wchar_t)); p += len; if (p[-1] != '/' && p[-1] != '\\') @@ -40,7 +40,7 @@ } if (fname && fname[0]) { - unsigned int len = strlenW(fname); + size_t len = strlenW(fname); memmove(p, fname, len * sizeof(wchar_t)); p += len; } Modified: trunk/reactos/lib/sdk/crt/stdlib/wmakpath_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/wmakpat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/wmakpath_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/wmakpath_s.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -44,9 +44,9 @@ if (directory && directory[0]) { - unsigned int len = strlenW(directory); + size_t len = strlenW(directory); unsigned int needs_separator = directory[len - 1] != '/' && directory[len - 1] != '\\'; - unsigned int copylen = min(size - 1, len); + size_t copylen = min(size - 1, len); if (size < 2) goto range; @@ -71,8 +71,8 @@ if (filename && filename[0]) { - unsigned int len = strlenW(filename); - unsigned int copylen = min(size - 1, len); + size_t len = strlenW(filename); + size_t copylen = min(size - 1, len); if (size < 2) goto range; @@ -88,9 +88,9 @@ if (extension && extension[0]) { - unsigned int len = strlenW(extension); + size_t len = strlenW(extension); unsigned int needs_period = extension[0] != '.'; - unsigned int copylen; + size_t copylen; if (size < 2) goto range; Modified: trunk/reactos/lib/sdk/crt/string/itow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/itow.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/itow.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/itow.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -34,7 +34,7 @@ *pos = '\0'; do { - digit = val % radix; + digit = (WCHAR)(val % radix); val = val / radix; if (digit < 10) { *--pos = '0' + digit; @@ -68,7 +68,7 @@ *pos = '\0'; do { - digit = value % radix; + digit = (WCHAR)(value % radix); value = value / radix; if (digit < 10) { *--pos = '0' + digit; @@ -120,7 +120,7 @@ *pos = '\0'; do { - digit = val % radix; + digit = (WCHAR)(val % radix); val = val / radix; if (digit < 10) { *--pos = '0' + digit; @@ -155,7 +155,7 @@ *pos = '\0'; do { - digit = value % radix; + digit = (WCHAR)(value % radix); value = value / radix; if (digit < 10) { *--pos = '0' + digit; Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -32,7 +32,7 @@ *wchar = wc; - return mbs - mbarr; + return (int)(mbs - mbarr); } /* @@ -44,7 +44,7 @@ ULONG Size; ULONG Length; - Length = strlen (mbstr); + Length = (ULONG)strlen (mbstr); if (wcstr == NULL) { @@ -56,7 +56,7 @@ } Status = RtlMultiByteToUnicodeN (wcstr, - count * sizeof(WCHAR), + (ULONG)count * sizeof(WCHAR), &Size, mbstr, Length); Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -170,7 +170,7 @@ base = 0; number: { /* read an integer */ - ULONGLONG cur = 0; + __int64 cur = 0; int negative = 0; int seendigit=0; /* skip initial whitespace */ @@ -224,7 +224,7 @@ if (!seendigit) break; /* not a valid number */ st = 1; if (!suppress) { -#define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur +#define _SET_NUMBER_(type) *va_arg(ap, type*) = (type)(negative ? -cur : cur) if (I64_prefix) _SET_NUMBER_(LONGLONG); else if (l_prefix) _SET_NUMBER_(LONG); else if (h_prefix) _SET_NUMBER_(short int); @@ -296,7 +296,7 @@ if (width>0) width--; } /* update 'cur' with this exponent. */ - expcnt = negexp ? .1 : 10; + expcnt = negexp ? 0.1f : 10.0f; while (exponent!=0) { if (exponent&1) cur*=expcnt; Modified: trunk/reactos/lib/sdk/crt/string/strtol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtol.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtol.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -54,7 +54,7 @@ * Set any if any `digits' consumed; make it negative to indicate * overflow. */ - cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX; + cutoff = neg ? ((unsigned long)LONG_MAX+1) : LONG_MAX; cutlim = cutoff % (unsigned long)base; cutoff /= (unsigned long)base; for (acc = 0, any = 0;; c = *s++) @@ -84,7 +84,7 @@ #endif } else if (neg) - acc = -acc; + acc = 0-acc; if (endptr != 0) *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; Modified: trunk/reactos/lib/sdk/crt/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoul.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoul.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -68,7 +68,7 @@ #endif } else if (neg) - acc = -acc; + acc = 0-acc; if (endptr != 0) *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; Modified: trunk/reactos/lib/sdk/crt/string/strtoull.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoull.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoull.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -59,7 +59,7 @@ #endif } else if (neg) - acc = -acc; + acc = 0-acc; if (endptr != 0) *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -60,7 +60,7 @@ wchar_t* ret = NULL; if (str) { - int size = (strlenW(str) + 1) * sizeof(wchar_t); + size_t size = (strlenW(str) + 1) * sizeof(wchar_t); ret = malloc( size ); if (ret) memcpy( ret, str, size ); } @@ -386,7 +386,7 @@ */ INT CDECL wcscpy_s( wchar_t* wcDest, size_t numElement, const wchar_t *wcSrc) { - INT size = 0; + size_t size = 0; if(!wcDest || !numElement) return EINVAL; Modified: trunk/reactos/lib/sdk/crt/string/wcstol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstol.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstol.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -63,7 +63,7 @@ * Set any if any `digits' consumed; make it negative to indicate * overflow. */ - cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX; + cutoff = neg ? ((unsigned long)LONG_MAX+1) : LONG_MAX; cutlim = cutoff % (unsigned long)base; cutoff /= (unsigned long)base; for (acc = 0, any = 0;; c = *s++) @@ -90,7 +90,7 @@ acc = neg ? LONG_MIN : LONG_MAX; } else if (neg) - acc = -acc; + acc = 0-acc; if (endptr != 0) *endptr = any ? (wchar_t *)((size_t)(s - 1)) : (wchar_t *)((size_t)nptr); return acc; Modified: trunk/reactos/lib/sdk/crt/string/wcstombs_nt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstomb… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstombs_nt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstombs_nt.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -34,7 +34,7 @@ ULONG Size; ULONG Length; - Length = wcslen (wcstr); + Length = (ULONG)wcslen (wcstr); if (mbstr == NULL) { @@ -46,7 +46,7 @@ } Status = RtlUnicodeToMultiByteN (mbstr, - count, + (ULONG)count, &Size, (wchar_t*)((size_t)wcstr), Length * sizeof(WCHAR)); Modified: trunk/reactos/lib/sdk/crt/string/wcstoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstoul.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstoul.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -65,7 +65,7 @@ acc = ULONG_MAX; } else if (neg) - acc = -acc; + acc = 0-acc; if (endptr != 0) *endptr = any ? (wchar_t *)((size_t)(s - 1)) : (wchar_t *)((size_t)nptr); return acc; Modified: trunk/reactos/lib/sdk/crt/string/wtol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wtol.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wtol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wtol.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -32,7 +32,7 @@ str++; } /* while */ - return bMinus ? -RunningTotal : RunningTotal; + return bMinus ? 0-RunningTotal : RunningTotal; } Modified: trunk/reactos/lib/sdk/crt/time/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/clock.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/clock.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/clock.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -26,5 +26,5 @@ GetSystemTimeAsFileTime((FILETIME*)&Time); Time.QuadPart -= g_StartupTime.QuadPart; - return FileTimeToUnixTime((FILETIME*)&Time, NULL); + return (clock_t)FileTimeToUnixTime((FILETIME*)&Time, NULL); }; Modified: trunk/reactos/lib/sdk/crt/time/ftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ftime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/ftime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/ftime.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -13,7 +13,7 @@ /****************************************************************************** * \name _ftime_s * \brief Get the current time. - * \param [out] ptimeb Pointer to a structure of type struct _timeb that + * \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 */ @@ -39,10 +39,10 @@ ret = GetTimeZoneInformation(&TimeZoneInformation); ptimeb->dstflag = (ret == TIME_ZONE_ID_DAYLIGHT) ? 1 : 0; - ptimeb->timezone = TimeZoneInformation.Bias; + ptimeb->timezone = (short)TimeZoneInformation.Bias; GetSystemTimeAsFileTime(&SystemTime); - ptimeb->time = FileTimeToUnixTime(&SystemTime, &ptimeb->millitm); + ptimeb->time = (time_t)FileTimeToUnixTime(&SystemTime, &ptimeb->millitm); return 0; } @@ -50,9 +50,9 @@ /****************************************************************************** * \name _ftime * \brief Get the current time. - * \param [out] ptimeb Pointer to a structure of type struct _timeb that + * \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 + * \note This function is for compatability and simply calls the secure * version _ftime_s(). * \sa http://msdn.microsoft.com/en-us/library/z54t9z5f.aspx */ Modified: trunk/reactos/lib/sdk/crt/time/futime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/futime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -44,7 +44,7 @@ /****************************************************************************** * \name _futime - * \brief Set a files modification time. + * \brief Set a file's 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 @@ -65,19 +65,22 @@ { time_t currTime; _time(&currTime); - RtlSecondsSince1970ToTime(currTime, (LARGE_INTEGER *)&at); + RtlSecondsSince1970ToTime((ULONG)currTime, + (LARGE_INTEGER *)&at); wt = at; } else { - RtlSecondsSince1970ToTime(filetime->actime, (LARGE_INTEGER *)&at); + RtlSecondsSince1970ToTime((ULONG)filetime->actime, + (LARGE_INTEGER *)&at); if (filetime->actime == filetime->modtime) { wt = at; } else { - RtlSecondsSince1970ToTime(filetime->modtime, (LARGE_INTEGER *)&wt); + RtlSecondsSince1970ToTime((ULONG)filetime->modtime, + (LARGE_INTEGER *)&wt); } } Modified: trunk/reactos/lib/sdk/crt/time/gmtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/gmtime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/gmtime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/gmtime.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -23,7 +23,7 @@ } /* Divide into date and time */ - days = time / SECONDSPERDAY; + days = (unsigned int)(time / SECONDSPERDAY); secondinday = time % SECONDSPERDAY; /* Shift to days from 1.1.1601 */ @@ -61,11 +61,11 @@ ptm->tm_isdst = 0; if (do_dst) { - unsigned int yeartime = dayinyear * SECONDSPERDAY + secondinday ; + int yeartime = dayinyear * SECONDSPERDAY + secondinday ; if (yeartime >= dst_begin && yeartime <= dst_end) // FIXME! DST in winter { time -= _dstbias; - days = time / SECONDSPERDAY + DIFFDAYS; + days = (unsigned int)(time / SECONDSPERDAY + DIFFDAYS); dayinyear = days - daystoyear; ptm->tm_isdst = 1; } @@ -97,7 +97,7 @@ /****************************************************************************** * \name _gmtime64 - * \brief + * \brief * \param ptime Pointer to a variable of type __time64_t containing the time. */ struct tm * @@ -123,7 +123,7 @@ /****************************************************************************** * \name _gmtime32 - * \brief + * \brief * \param ptime Pointer to a variable of type __time32_t containing the time. */ struct tm * @@ -135,7 +135,7 @@ /****************************************************************************** * \name gmtime - * \brief + * \brief * \param ptime Pointer to a variable of type time_t containing the time. */ struct tm * Modified: trunk/reactos/lib/sdk/crt/time/mktime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/mktime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/mktime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/mktime.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -106,36 +106,36 @@ int tm_isdst; */ -/** +/** * \name _mkgmtime - * + * */ time_t _mkgmtime(struct tm *ptm) { - time_t time = mktime_worker(ptm, 1); - return (time > MAX_32BIT_TIME) ? -1 : time; + __time64_t time = mktime_worker(ptm, 1); + return (time_t)((time > MAX_32BIT_TIME) ? -1 : time); } time_t mktime(struct tm *ptm) { - time_t time = mktime_worker(ptm, 0); - return (time > MAX_32BIT_TIME) ? -1 : time; + __time64_t time = mktime_worker(ptm, 0); + return (time_t)((time > MAX_32BIT_TIME) ? -1 : time); } __time32_t _mkgmtime32(struct tm *ptm) { - time_t time = mktime_worker(ptm, 1); - return (time > MAX_32BIT_TIME) ? -1 : time; + __time64_t time = mktime_worker(ptm, 1); + return (__time32_t)((time > MAX_32BIT_TIME) ? -1 : time); } __time32_t _mktime32(struct tm *ptm) { - time_t time = mktime_worker(ptm, 0); - return (time > MAX_32BIT_TIME) ? -1 : time; + __time64_t time = mktime_worker(ptm, 0); + return (__time32_t)((time > MAX_32BIT_TIME) ? -1 : time); } __time64_t Modified: trunk/reactos/lib/sdk/crt/time/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/time.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/time.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/time.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -15,7 +15,7 @@ time_t time = 0; GetSystemTimeAsFileTime(&SystemTime); - time = FileTimeToUnixTime(&SystemTime, NULL); + time = (time_t)FileTimeToUnixTime(&SystemTime, NULL); if (ptime) { Modified: trunk/reactos/lib/sdk/crt/time/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/timezone.… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/timezone.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/timezone.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -65,7 +65,7 @@ * \name __p__dstbias * \brief Returns a pointer to the _dstbias variable; */ -long * +long * __p__dstbias(void) { return &_dstbias; @@ -103,7 +103,7 @@ if (str && str[0] != 0) { long hour = 0, min = 0, sec = 0; - int len = strnlen(str, 16); + size_t len = strnlen(str, 16); int sign = 1; dst_begin = 0; @@ -143,7 +143,7 @@ /* Copy DST name */ strncpy(tz_dst_name, str, 3); - + // FIXME: set dst_begin etc /* We are finished */ @@ -151,7 +151,7 @@ } _timezone = sign * (((hour * 60) + min) * 60 + sec); - + } else { @@ -163,7 +163,7 @@ { return; } - + ret = WideCharToMultiByte(CP_ACP, 0, tzi.StandardName, @@ -196,13 +196,13 @@ _tm.tm_hour = tzi.DaylightDate.wHour; _tm.tm_min = tzi.DaylightDate.wMinute; _tm.tm_sec = tzi.DaylightDate.wSecond; - dst_begin = _mkgmtime(&_tm); + dst_begin = (long)_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); + dst_end = (long)_mkgmtime(&_tm); } else { Modified: trunk/reactos/lib/sdk/crt/wine/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/heap.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/heap.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -40,7 +40,7 @@ static MSVCRT_new_handler_func MSVCRT_new_handler; static int MSVCRT_new_mode; -/* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */ +/* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */ static unsigned int MSVCRT_amblksiz = 16; /* FIXME - According to documentation it should be 480 bytes, at runtime default is 0 */ static size_t MSVCRT_sbh_threshold = 0; @@ -148,7 +148,7 @@ */ void* CDECL _expand(void* mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, mem, size); + return HeapReAlloc(GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, mem, (DWORD)size); } /********************************************************************* @@ -187,7 +187,7 @@ LOCK_HEAP; phe.lpData = next->_pentry; - phe.cbData = next->_size; + phe.cbData = (DWORD)next->_size; phe.wFlags = next->_useflag == _USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0; if (phe.lpData && phe.wFlags & PROCESS_HEAP_ENTRY_BUSY && @@ -303,7 +303,7 @@ void* CDECL realloc(void* ptr, size_t size) { if (!ptr) return malloc(size); - if (size) return HeapReAlloc(GetProcessHeap(), 0, ptr, size); + if (size) return HeapReAlloc(GetProcessHeap(), 0, ptr, (DWORD)size); free(ptr); return NULL; } Modified: trunk/reactos/lib/sdk/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/undname.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] Thu Sep 15 17:11:53 2011 @@ -53,7 +53,7 @@ #define UNDNAME_NO_COMPLEX_TYPE (0x8000) /* How data types modifiers are stored: - * M (in the following definitions) is defined for + * M (in the following definitions) is defined for * 'A', 'B', 'C' and 'D' as follows * {<A>}: "" * {<B>}: "const " @@ -67,7 +67,7 @@ * in data fields: * same as for arguments and also the following * ?<M>x {<M>}x - * + * */ struct array @@ -127,7 +127,7 @@ sym->avail_in_first = 0; ptr = (char*)sym->alloc_list + sizeof(void*); } - else + else { if (len > sym->avail_in_first) { @@ -201,14 +201,14 @@ a->alloc *= 2; a->elts = new; } - if (len == -1) len = strlen(ptr); + if (len == -1) len = (int)strlen(ptr); a->elts[a->num] = und_alloc(sym, len + 1); assert(a->elts[a->num]); memcpy(a->elts[a->num], ptr, len); - a->elts[a->num][len] = '\0'; + a->elts[a->num][len] = '\0'; if (++a->num >= a->max) a->max = a->num; { - int i; + unsigned int i; char c; for (i = a->max - 1; i >= 0; i--) @@ -234,18 +234,18 @@ assert(cref); if (cref->start + idx >= cref->max) { - WARN("Out of bounds: %p %d + %d >= %d\n", + WARN("Out of bounds: %p %d + %d >= %d\n", cref, cref->start, idx, cref->max); return NULL; } - TRACE("Returning %p[%d] => %s\n", + TRACE("Returning %p[%d] => %s\n", cref, idx, cref->elts[cref->start + idx]); return cref->elts[cref->start + idx]; } /****************************************************************** * str_printf - * Helper for printf type of command (only %s and %c are implemented) + * Helper for printf type of command (only %s and %c are implemented) * while dynamically allocating the buffer */ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) @@ -263,7 +263,7 @@ { switch (format[++i]) { - case 's': t = va_arg(args, char*); if (t) len += strlen(t); break; + case 's': t = va_arg(args, char*); if (t) len += (int)strlen(t); break; case 'c': (void)va_arg(args, int); len++; break; default: i--; /* fall thru */ case '%': len++; break; @@ -284,7 +284,7 @@ t = va_arg(args, char*); if (t) { - sz = strlen(t); + sz = (int)strlen(t); memcpy(p, t, sz); p += sz; } @@ -358,7 +358,7 @@ * Parses a list of function/method arguments, creates a string corresponding * to the arguments' list. */ -static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_term, +static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_term, char open_char, char close_char) { @@ -393,8 +393,8 @@ */ if (z_term && *sym->current++ != 'Z') return NULL; - if (arg_collect.num == 0 || - (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) + if (arg_collect.num == 0 || + (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) return str_printf(sym, "%cvoid%c", open_char, close_char); for (i = 1; i < arg_collect.num; i++) { @@ -403,12 +403,12 @@ last = args_str ? args_str : arg_collect.elts[0]; if (close_char == '>' && last[strlen(last) - 1] == '>') - args_str = str_printf(sym, "%c%s%s %c", + args_str = str_printf(sym, "%c%s%s %c", open_char, arg_collect.elts[0], args_str, close_char); else - args_str = str_printf(sym, "%c%s%s%c", + args_str = str_printf(sym, "%c%s%s%c", open_char, arg_collect.elts[0], args_str, close_char); - + return args_str; } @@ -516,7 +516,7 @@ } } while (*++sym->current != '@'); sym->current++; - if (!str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->names)) + if (!str_array_push(sym, ptr, (int)(sym->current - 1 - ptr), &sym->names)) return NULL; return str_array_get_ref(&sym->names, sym->names.num - sym->names.start - 1); @@ -582,7 +582,7 @@ name = str_array_get_ref(&sym->names, *sym->current++ - '0'); break; case '?': - if (*++sym->current == '$') + if (*++sym->current == '$') { sym->current++; if ((name = get_template_name(sym)) && @@ -613,15 +613,15 @@ char* ret; struct array *a = &sym->stack; - for (len = 0, i = start; i < a->num; i++) + for (len = 0, i = start; i < (int)a->num; i++) { assert(a->elts[i]); - len += 2 + strlen(a->elts[i]); + len += 2 + (int)strlen(a->elts[i]); } if (!(ret = und_alloc(sym, len - 1))) return NULL; for (len = 0, i = a->num - 1; i >= start; i--) { - sz = strlen(a->elts[i]); + sz = (int)strlen(a->elts[i]); memcpy(ret + len, a->elts[i], sz); len += sz; if (i > start) @@ -702,7 +702,7 @@ static const char* get_simple_type(char c) { const char* type_string; - + switch (c) { case 'C': type_string = "signed char"; break; @@ -731,7 +731,7 @@ static const char* get_extended_type(char c) { const char* type_string; - + switch (c) { case 'D': type_string = "__int8"; break; @@ -766,7 +766,7 @@ assert(ct); ct->left = ct->right = NULL; - + switch (dt = *sym->current++) { case '_': @@ -791,7 +791,7 @@ if (!(struct_name = get_class_name(sym))) goto done; - if (!(sym->flags & UNDNAME_NO_COMPLEX_TYPE)) + if (!(sym->flags & UNDNAME_NO_COMPLEX_TYPE)) { switch (dt) { @@ -839,7 +839,7 @@ unsigned mark = sym->stack.num; if (!get_calling_convention(*sym->current++, - &call_conv, &exported, + &call_conv, &exported, sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE) || !demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; @@ -848,7 +848,7 @@ if (!args) goto done; sym->stack.num = mark; - ct->left = str_printf(sym, "%s%s (%s*", + ct->left = str_printf(sym, "%s%s (%s*", sub_ct.left, sub_ct.right, call_conv); ct->right = str_printf(sym, ")%s", args); } @@ -944,7 +944,7 @@ return FALSE; } done: - + return ct->left != NULL; } @@ -980,7 +980,7 @@ case '0': access = "private: "; break; case '1': access = "protected: "; break; case '2': access = "public: "; break; - } + } } if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) @@ -1028,8 +1028,8 @@ if (sym->flags & UNDNAME_NAME_ONLY) ct.left = ct.right = modifier = NULL; sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s", access, - member_type, ct.left, - modifier && ct.left ? " " : NULL, modifier, + member_type, ct.left, + modifier && ct.left ? " " : NULL, modifier, modifier || ct.left ? " " : NULL, name, ct.right); ret = TRUE; done: @@ -1163,10 +1163,10 @@ * Yet!!! FIXME */ sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s%s", - access, member_type, ct_ret.left, + access, member_type, ct_ret.left, (ct_ret.left && !ct_ret.right) ? " " : NULL, call_conv, call_conv ? " " : NULL, exported, - name, args_str, modifier, + name, args_str, modifier, modifier ? " " : NULL, ct_ret.right); ret = TRUE; done: @@ -1446,7 +1446,7 @@ TRACE("(%p,%s,%d,%p,%p,%p,%x)\n", buffer, mangled, buflen, memget, memfree, unknown, flags); - + /* The flags details is not documented by MS. However, it looks exactly * like the UNDNAME_ manifest constants from imagehlp.h and dbghelp.h * So, we copied those (on top of the file)

13 years

[tfaber] 53712: [KMTESTS] - MmSection: properly clean up on failure - Some more x64 build fixing

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Sep 15 16:49:22 2011 New Revision: 53712 URL: http://svn.reactos.org/svn/reactos?rev=53712&view=rev Log: [KMTESTS] - MmSection: properly clean up on failure - Some more x64 build fixing Modified: trunk/rostests/kmtests/ntos_ke/KeSpinLock.c trunk/rostests/kmtests/ntos_mm/MmSection.c Modified: trunk/rostests/kmtests/ntos_ke/KeSpinLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeSpinLoc… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] Thu Sep 15 16:49:22 2011 @@ -88,8 +88,13 @@ DEFINE_ACQUIRE(AcquireNormal, TRUE, KeAcquireSpinLock(SpinLock, &CheckData->Irql)) DEFINE_RELEASE(ReleaseNormal, TRUE, KeReleaseSpinLock(SpinLock, CheckData->Irql)) +#ifdef _X86_ DEFINE_ACQUIRE(AcquireExp, TRUE, (KeAcquireSpinLock)(SpinLock, &CheckData->Irql)) DEFINE_RELEASE(ReleaseExp, TRUE, (KeReleaseSpinLock)(SpinLock, CheckData->Irql)) +#else +DEFINE_ACQUIRE(AcquireExp, TRUE, KeAcquireSpinLock(SpinLock, &CheckData->Irql)) +DEFINE_RELEASE(ReleaseExp, TRUE, KeReleaseSpinLock(SpinLock, CheckData->Irql)) +#endif DEFINE_ACQUIRE(AcquireSynch, TRUE, CheckData->Irql = KeAcquireSpinLockRaiseToSynch(SpinLock)) DEFINE_ACQUIRE(AcquireInStackQueued, TRUE, KeAcquireInStackQueuedSpinLock(SpinLock, &CheckData->QueueHandle)) Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Thu Sep 15 16:49:22 2011 @@ -14,7 +14,7 @@ { NTSTATUS Status = STATUS_SUCCESS; NTSTATUS ExceptionStatus; - const PVOID InvalidPointer = (PVOID)0x5555555555555555LLU; + const PVOID InvalidPointer = (PVOID)0x5555555555555555ULL; PVOID SectionObject; LARGE_INTEGER MaximumSize; @@ -42,6 +42,9 @@ ok_eq_hex(Status, STATUS_INVALID_PAGE_PROTECTION); ok_eq_pointer(SectionObject, InvalidPointer); + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + StartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, PAGE_READONLY, SEC_RESERVE, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); @@ -52,6 +55,21 @@ EndSeh(STATUS_ACCESS_VIOLATION); ok_eq_pointer(SectionObject, InvalidPointer); + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 0; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, NULL); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_INVALID_FILE_FOR_SECTION); + ok_eq_longlong(MaximumSize.QuadPart, 0LL); + ok_eq_pointer(SectionObject, InvalidPointer); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + MaximumSize.QuadPart = 0; StartSeh() Status = MmCreateSection(NULL, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); @@ -59,11 +77,17 @@ ok_eq_hex(Status, STATUS_INVALID_PARAMETER_4); ok_eq_longlong(MaximumSize.QuadPart, 0LL); + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + MaximumSize.QuadPart = 1; StartSeh() Status = MmCreateSection(NULL, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); ok_eq_longlong(MaximumSize.QuadPart, 1LL); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); SectionObject = InvalidPointer; MaximumSize.QuadPart = 0; @@ -73,6 +97,9 @@ ok_eq_hex(Status, STATUS_INVALID_PARAMETER_4); ok_eq_longlong(MaximumSize.QuadPart, 0LL); ok_eq_pointer(SectionObject, InvalidPointer); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); SectionObject = InvalidPointer; MaximumSize.QuadPart = 1; @@ -86,13 +113,4 @@ if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); - - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() - Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, NULL); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_INVALID_FILE_FOR_SECTION); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok_eq_pointer(SectionObject, InvalidPointer); }

13 years

[tkreuzer] 53711: [HAL/APIC] - Fix some stuff that gcc complains about. It doesn't like to use static data in non-static inline functions for some unknown reason. - Implement support for level trig...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 15 11:34:21 2011 New Revision: 53711 URL: http://svn.reactos.org/svn/reactos?rev=53711&view=rev Log: [HAL/APIC] - Fix some stuff that gcc complains about. It doesn't like to use static data in non-static inline functions for some unknown reason. - Implement support for level triggered interrupts, when using lazy irql Modified: trunk/reactos/hal/halx86/apic/apic.c trunk/reactos/hal/halx86/apic/tsc.c Modified: trunk/reactos/hal/halx86/apic/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] Thu Sep 15 11:34:21 2011 @@ -28,7 +28,7 @@ UCHAR HalpVectorToIndex[256]; #ifndef _M_AMD64 -static const UCHAR +const UCHAR HalpIRQLtoTPR[32] = { 0x00, /* 0 PASSIVE_LEVEL */ @@ -65,7 +65,7 @@ 0xff, /* 31 HIGH_LEVEL */ }; -static const KIRQL +const KIRQL HalVectorToIRQL[16] = { 0, /* 00 PASSIVE_LEVEL */ @@ -132,7 +132,7 @@ VOID FORCEINLINE -ApicRequestInterrupt(IN UCHAR Vector) +ApicRequestInterrupt(IN UCHAR Vector, UCHAR TriggerMode) { APIC_COMMAND_REGISTER CommandRegister; @@ -140,7 +140,7 @@ CommandRegister.Long0 = 0; CommandRegister.Vector = Vector; CommandRegister.MessageType = APIC_MT_Fixed; - CommandRegister.TriggerMode = APIC_TGM_Edge; + CommandRegister.TriggerMode = TriggerMode; CommandRegister.DestinationShortHand = APIC_DSH_Self; /* Write the low dword to send the interrupt */ @@ -653,7 +653,7 @@ HalRequestSoftwareInterrupt(IN KIRQL Irql) { /* Convert irql to vector and request an interrupt */ - ApicRequestInterrupt(IrqlToTpr(Irql)); + ApicRequestInterrupt(IrqlToTpr(Irql), APIC_TGM_Edge); } VOID @@ -700,15 +700,17 @@ ReDirReg.DeliveryMode = APIC_MT_LowestPriority; ReDirReg.DestinationMode = APIC_DM_Logical; ReDirReg.Destination = 0; - ReDirReg.TriggerMode = 1 - InterruptMode; } /* Check if the destination is logical */ - if (ReDirReg.DestinationMode = APIC_DM_Logical) + if (ReDirReg.DestinationMode == APIC_DM_Logical) { /* Set the bit for this cpu */ ReDirReg.Destination |= ApicLogicalId(Prcb->Number); } + + /* Set the trigger mode */ + ReDirReg.TriggerMode = 1 - InterruptMode; /* Now unmask it */ ReDirReg.Mask = FALSE; @@ -758,6 +760,9 @@ /* Check if this interrupt is allowed */ if (CurrentIrql >= Irql) { + IOAPIC_REDIRECTION_REGISTER RedirReg; + UCHAR Index; + /* It is not, set the real Irql in the TPR! */ ApicWrite(APIC_TPR, IrqlToTpr(CurrentIrql)); @@ -767,9 +772,23 @@ /* End this interrupt */ ApicSendEOI(); - // FIXME: level interrupts - /* Re-request the interrupt to be handled later */ - ApicRequestInterrupt(Vector); + /* Get the irq for this vector */ + Index = HalpVectorToIndex[Vector]; + + /* Check if its valid */ + if (Index != 0xff) + { + /* Read the I/O redirection entry */ + RedirReg = ApicReadIORedirectionEntry(Index); + + /* Re-request the interrupt to be handled later */ + ApicRequestInterrupt(Vector, (UCHAR)RedirReg.TriggerMode); + } + else + { + /* Re-request the interrupt to be handled later */ + ApicRequestInterrupt(Vector, APIC_TGM_Edge); + } /* Pretend it was a spurious interrupt */ return FALSE; Modified: trunk/reactos/hal/halx86/apic/tsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/tsc.c?rev=… ============================================================================== --- trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] Thu Sep 15 11:34:21 2011 @@ -14,7 +14,7 @@ #include "tsc.h" -LARGE_INTEGER HalpCpuClockFrequency = {INITIAL_STALL_COUNT * 1000000}; +LARGE_INTEGER HalpCpuClockFrequency = {{INITIAL_STALL_COUNT * 1000000}}; UCHAR TscCalibrationPhase; ULONG64 TscCalibrationArray[NUM_SAMPLES];

13 years

← Newer
1
...
17
18
19
20
21
22
23
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2011