Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 25967: - Remove DbgPrint committed in FreeLDR by accident. - Fix a hack in DbgLoadImageSymbols.
by ion＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: ion Date: Sat Mar 3 08:44:58 2007 New Revision: 25967 URL: http://svn.reactos.org/svn/reactos?rev=25967&view=rev Log: - Remove DbgPrint committed in FreeLDR by accident. - Fix a hack in DbgLoadImageSymbols. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/lib/rtl/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Sat Mar 3 08:44:58 2007 @@ -628,7 +628,7 @@ NextModuleBase = ROUND_UP(NextModuleBase + ImageSize, PAGE_SIZE); /* Successful load! */ - DbgPrint("Image: %s loaded at: %p\n", Name, ImageBase); + //DbgPrint("Image: %s loaded at: %p\n", Name, ImageBase); /* Load HAL if this is the kernel */ if (ImageType == 1) FrLdrLoadImage("hal.dll", 10, FALSE); Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=25967&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Sat Mar 3 08:44:58 2007 @@ -324,7 +324,7 @@ SymbolInfo.ProcessId = (ULONG)ProcessId; /* Get NT Headers */ - NtHeader = NULL; //RtlImageNtHeader(Base); + NtHeader = RtlImageNtHeader(Base); if (NtHeader) { /* Get the rest of the data */

1 0

[ion] 25966: - Copy the entire drivers in memory, not just their mappable sections, since WinDBG (and probably other things) use "SizeOfImage" in the header to figure out when the image ends, but we map considerably less, creating overlaps.
by ion＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: ion Date: Sat Mar 3 08:41:14 2007 New Revision: 25966 URL: http://svn.reactos.org/svn/reactos?rev=25966&view=rev Log: - Copy the entire drivers in memory, not just their mappable sections, since WinDBG (and probably other things) use "SizeOfImage" in the header to figure out when the image ends, but we map considerably less, creating overlaps. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Sat Mar 3 08:41:14 2007 @@ -545,29 +545,13 @@ NtHeader = RtlImageNtHeader(Base); Section = IMAGE_FIRST_SECTION(NtHeader); - /* Determine the size of the module */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Skip this section if we're not supposed to load it */ - if (!(Section[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - /* Add the size of this section into the total size */ - Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; - DriverSize = max(DriverSize, Size); - } - } - - /* Round up the driver size to section alignment */ - DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment); - /* Allocate memory for the driver */ + DriverSize = NtHeader->OptionalHeader.SizeOfImage; LoadBase = MmAllocateMemoryAtAddress(DriverSize, LoadBase); ASSERT(LoadBase); /* Copy headers over */ - RtlMoveMemory(LoadBase, - Base, - NtHeader->OptionalHeader.SizeOfHeaders); + RtlMoveMemory(LoadBase, Base, NtHeader->OptionalHeader.SizeOfHeaders); /* Copy image sections into virtual section */ for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) @@ -644,7 +628,7 @@ NextModuleBase = ROUND_UP(NextModuleBase + ImageSize, PAGE_SIZE); /* Successful load! */ - //DbgPrint("Image: %s loaded at: %p\n", Name, ImageBase); + DbgPrint("Image: %s loaded at: %p\n", Name, ImageBase); /* Load HAL if this is the kernel */ if (ImageType == 1) FrLdrLoadImage("hal.dll", 10, FALSE);

1 0

[ion] 25965: - Remove KD APIs from stub HAL, they've been in kdcom for a while (merge from kd-branch). - DebugPrint/DebugPrompt should have an int3 after the int2d, and the int2d handler should ++ the trap frame's EIP to compensate (merge from kd-branch). - Remove KDB symbol hooks (merge from kd-branch). - Make PSEH compialble in MSVC again after Greatlord's break. - Fix KiSaveProcessorControlState/KiRestoreProcessorControlState (merge from kd-branch). - Disable GDB hook/hacks (merge from kd-bra
by ion＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: ion Date: Sat Mar 3 07:39:25 2007 New Revision: 25965 URL: http://svn.reactos.org/svn/reactos?rev=25965&view=rev Log: - Remove KD APIs from stub HAL, they've been in kdcom for a while (merge from kd-branch). - DebugPrint/DebugPrompt should have an int3 after the int2d, and the int2d handler should ++ the trap frame's EIP to compensate (merge from kd-branch). - Remove KDB symbol hooks (merge from kd-branch). - Make PSEH compialble in MSVC again after Greatlord's break. - Fix KiSaveProcessorControlState/KiRestoreProcessorControlState (merge from kd-branch). - Disable GDB hook/hacks (merge from kd-branch). - Add KD64 directory from kd-branch with SharedUserData access enabled (no other code changed). It's not currently compiled though, just putting it here. Added: trunk/reactos/ntoskrnl/kd64/ trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kdbreak.c trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/kd64/kdinit.c trunk/reactos/ntoskrnl/kd64/kdlock.c trunk/reactos/ntoskrnl/kd64/kdprint.c trunk/reactos/ntoskrnl/kd64/kdtrap.c Modified: trunk/reactos/hal/hal/hal.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/include/reactos/libs/pseh/framebased.h trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/i386/debug_asm.S trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=25965&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Sat Mar 3 07:39:25 2007 @@ -17,7 +17,6 @@ #include <ndk/halfuncs.h> #include <ndk/iofuncs.h> #include <ndk/kdfuncs.h> -#include <internal/kd.h> #define NDEBUG #include <debug.h> @@ -727,132 +726,6 @@ } -BOOLEAN -NTAPI -KdPortGetByte( - PUCHAR ByteRecieved) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortGetByteEx( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortInitialize( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortInitializeEx( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortPollByte( - PUCHAR ByteRecieved) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -KdPortPollByteEx( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -KdPortPutByte( - UCHAR ByteToSend) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -KdPortPutByteEx( - PKD_PORT_INFORMATION PortInformation, - UCHAR ByteToSend) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -KdPortRestore(VOID) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -KdPortSave(VOID) -{ - UNIMPLEMENTED; -} - - -BOOLEAN -NTAPI -KdPortDisableInterrupts() -{ - UNIMPLEMENTED; - - return FALSE; -} - - -BOOLEAN -NTAPI -KdPortEnableInterrupts() -{ - UNIMPLEMENTED; - - return FALSE; -} - #undef KeAcquireSpinLock VOID NTAPI Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c (original) +++ trunk/reactos/hal/halx86/generic/misc.c Sat Mar 3 07:39:25 2007 @@ -77,7 +77,7 @@ /* Halt the system */ HalDisplayString("\n*** The system has halted ***\n"); - KeEnterKernelDebugger(); + //KeEnterKernelDebugger(); } /* Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/framebased.h (original) +++ trunk/reactos/include/reactos/libs/pseh/framebased.h Sat Mar 3 07:39:25 2007 @@ -73,14 +73,8 @@ _SEHPortableTryLevel_t * trylevel ) { - /* - * help detetct if pseh going into endless loop - * if we see this debug msg repet never break - * we known something cause pseh going into - * endless loop, but it should never happen - */ + _SEHTryLevel_t * mytrylevel; DbgPrint("_SEHCompilerSpecificHandler(%p)\n", trylevel); - _SEHTryLevel_t * mytrylevel; mytrylevel = _SEH_CONTAINING_RECORD(trylevel, _SEHTryLevel_t, ST_Header); _SEHLongJmp(mytrylevel->ST_JmpBuf, 1); } Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=25965&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Sat Mar 3 07:39:25 2007 @@ -23,6 +23,7 @@ IN ULONG Level) { /* Call the INT2D Service */ + //return STATUS_SUCCESS; return DebugService(BREAKPOINT_PRINT, DebugString->Buffer, DebugString->Length, Modified: trunk/reactos/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/debug_asm.S?r… ============================================================================== --- trunk/reactos/lib/rtl/i386/debug_asm.S (original) +++ trunk/reactos/lib/rtl/i386/debug_asm.S Sat Mar 3 07:39:25 2007 @@ -54,7 +54,7 @@ mov ecx, [ebp+8] mov edx, [ebp+12] int 0x2D - //int 3 + int 3 /* Restore stack */ pop ebp @@ -82,7 +82,7 @@ mov ebx, [ebp+20] mov edi, [ebp+24] int 0x2D - //int 3 + int 3 /* Restore registers */ pop ebx Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Sat Mar 3 07:39:25 2007 @@ -151,6 +151,7 @@ extern UCHAR KiDebugRegisterContextOffsets[9]; extern ULONG KeTimeIncrement; extern ULONG_PTR KiBugCheckData[5]; +extern ULONG KiFreezeFlag; /* MACROS *************************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sat Mar 3 07:39:25 2007 @@ -874,9 +874,6 @@ } #endif - /* Load symbols */ - KDB_SYMBOLFILE_HOOK(ModuleName); - /* * Strip the file extension from ServiceName */ @@ -926,9 +923,6 @@ { PLIST_ENTRY ListHead, NextEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; -#ifdef DBG - UNICODE_STRING NtosSymName = RTL_CONSTANT_STRING(L"ntoskrnl.sym"); -#endif PDEVICE_NODE DeviceNode; PDRIVER_OBJECT DriverObject; LDR_DATA_TABLE_ENTRY ModuleObject; @@ -973,9 +967,6 @@ IopFreeDeviceNode(DeviceNode); return; } - - /* Hack for NTOSKRNL.SYM */ - KDB_SYMBOLFILE_HOOK(&NtosSymName); /* Loop the boot modules */ ListHead = &KeLoaderBlock->LoadOrderListHead; Added: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c (added) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c Sat Mar 3 07:39:25 2007 @@ -1,0 +1,1158 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdapi.c + * PURPOSE: KD64 Public Routines and Internal Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, + IN PCONTEXT Context) +{ + PKPRCB Prcb; + ULONG i; + + /* Check for success */ + if (NT_SUCCESS(State->u.Continue2.ContinueStatus)) + { + /* Check if we're tracing */ + if (State->u.Continue2.ControlSet.TraceFlag) + { + /* Enable TF */ + Context->EFlags |= EFLAGS_TF; + } + else + { + /* Remove it */ + Context->EFlags &= ~EFLAGS_TF; + } + + /* Loop all processors */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Get the PRCB and update DR7 and DR6 */ + Prcb = KiProcessorBlock[i]; + Prcb->ProcessorState.SpecialRegisters.KernelDr7 = + State->u.Continue2.ControlSet.Dr7; + Prcb->ProcessorState.SpecialRegisters.KernelDr6 = 0; + } + + /* Check if we have new symbol information */ + if (State->u.Continue2.ControlSet.CurrentSymbolStart != 1) + { + /* Update it */ + KdpCurrentSymbolStart = + State->u.Continue2.ControlSet.CurrentSymbolStart; + KdpCurrentSymbolEnd= State->u.Continue2.ControlSet.CurrentSymbolEnd; + } + } +} + +VOID +NTAPI +KdpSetCommonState(IN ULONG NewState, + IN PCONTEXT Context, + IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange) +{ + USHORT InstructionCount; + BOOLEAN HadBreakpoints; + + /* Setup common stuff available for all CPU architectures */ + WaitStateChange->NewState = NewState; + WaitStateChange->ProcessorLevel = KeProcessorLevel; + WaitStateChange->Processor = (USHORT)KeGetCurrentPrcb()->Number; + WaitStateChange->NumberProcessors = (ULONG)KeNumberProcessors; + WaitStateChange->Thread = (ULONG)(LONG_PTR)KeGetCurrentThread(); + WaitStateChange->ProgramCounter = (ULONG)(LONG_PTR)Context->Eip; + + /* Zero out the Control Report */ + RtlZeroMemory(&WaitStateChange->ControlReport, + sizeof(DBGKD_CONTROL_REPORT)); + + /* Now copy the instruction stream and set the count */ + RtlCopyMemory(&WaitStateChange->ControlReport.InstructionStream[0], + (PVOID)(ULONG_PTR)WaitStateChange->ProgramCounter, + DBGKD_MAXSTREAM); + InstructionCount = DBGKD_MAXSTREAM; + WaitStateChange->ControlReport.InstructionCount = InstructionCount; + + /* Clear all the breakpoints in this region */ + HadBreakpoints = FALSE; +#if 0 + KdpDeleteBreakpointRange((PVOID)WaitStateChange->ProgramCounter, + (PVOID)(WaitStateChange->ProgramCounter + + WaitStateChange->ControlReport. + InstructionCount - 1)); +#endif + if (HadBreakpoints) + { + /* Copy the instruction stream again, this time without breakpoints */ + RtlCopyMemory(&WaitStateChange->ControlReport.InstructionStream[0], + (PVOID)(ULONG_PTR)WaitStateChange->ProgramCounter, + WaitStateChange->ControlReport.InstructionCount); + } +} + +VOID +NTAPI +KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, + IN PCONTEXT Context) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Copy i386 specific debug registers */ + WaitStateChange->ControlReport.Dr6 = Prcb->ProcessorState.SpecialRegisters. + KernelDr6; + WaitStateChange->ControlReport.Dr7 = Prcb->ProcessorState.SpecialRegisters. + KernelDr7; + + /* Copy i386 specific segments */ + WaitStateChange->ControlReport.SegCs = (USHORT)Context->SegCs; + WaitStateChange->ControlReport.SegDs = (USHORT)Context->SegDs; + WaitStateChange->ControlReport.SegEs = (USHORT)Context->SegEs; + WaitStateChange->ControlReport.SegFs = (USHORT)Context->SegFs; + + /* Copy EFlags */ + WaitStateChange->ControlReport.EFlags = Context->EFlags; + + /* Set Report Flags */ + WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; + if (WaitStateChange->ControlReport.SegCs == KGDT_R0_CODE) + { + WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_CS; + } +} + +VOID +NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +{ + /* Copy the version block */ + RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); +} + +VOID +NTAPI +KdpGetVersion(IN PDBGKD_MANIPULATE_STATE64 State) +{ + STRING Header; + + /* Fill out the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Get the version block */ + KdpSysGetVersion(&State->u.GetVersion64); + + /* Fill out the state */ + State->ApiNumber = DbgKdGetVersionApi; + State->ReturnStatus = STATUS_SUCCESS; + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI +KdpReadVirtualMemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + ULONG Length = State->u.ReadMemory.TransferCount; + NTSTATUS Status = STATUS_SUCCESS; + + /* Validate length */ + if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) + { + /* Overflow, set it to maximum possible */ + Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64); + } + +#if 0 + if (!MmIsAddressValid((PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress)) + { + Ke386SetCr2(State->u.ReadMemory.TargetBaseAddress); + while (TRUE); + } +#endif + + if ((ULONG_PTR)State->u.ReadMemory.TargetBaseAddress < KSEG0_BASE) + { + Length = 0; + Status = STATUS_UNSUCCESSFUL; + } + else if ((ULONG_PTR)State->u.ReadMemory.TargetBaseAddress >= (ULONG_PTR)SharedUserData) + { + Length = 0; + Status = STATUS_UNSUCCESSFUL; + } + else + { + RtlCopyMemory(Data->Buffer, + (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress, + Length); + } + + /* Fill out the header */ + Data->Length = Length; + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Fill out the state */ + State->ReturnStatus = Status; + State->u.ReadMemory.ActualBytesRead = Length; + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpReadControlSpace(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + PDBGKD_READ_MEMORY64 ReadMemory = &State->u.ReadMemory; + STRING Header; + ULONG Length, RealLength; + PVOID ControlStart; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Check the length requested */ + Length = ReadMemory->TransferCount; + if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) + { + /* Use maximum allowed */ + Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64); + } + + /* Make sure that this is a valid request */ + if (((ULONG)ReadMemory->TargetBaseAddress < sizeof(KPROCESSOR_STATE)) && + (State->Processor < KeNumberProcessors)) + { + /* Get the actual length */ + RealLength = sizeof(KPROCESSOR_STATE) - + (ULONG_PTR)ReadMemory->TargetBaseAddress; + if (RealLength < Length) Length = RealLength; + + /* Set the proper address */ + ControlStart = (PVOID)((ULONG_PTR)ReadMemory->TargetBaseAddress + + (ULONG_PTR)&KiProcessorBlock[State->Processor]-> + ProcessorState); + + /* Copy the memory */ + RtlCopyMemory(Data->Buffer, ControlStart, Length); + Data->Length = Length; + + /* Finish up */ + State->ReturnStatus = STATUS_SUCCESS; + ReadMemory->ActualBytesRead = Data->Length; + } + else + { + /* Invalid request */ + Data->Length = 0; + State->ReturnStatus = STATUS_UNSUCCESSFUL; + ReadMemory->ActualBytesRead = 0; + } + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpWriteControlSpace(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + PDBGKD_WRITE_MEMORY64 WriteMemory = &State->u.WriteMemory; + STRING Header; + ULONG Length; + PVOID ControlStart; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Make sure that this is a valid request */ + Length = WriteMemory->TransferCount; + if ((((ULONG)WriteMemory->TargetBaseAddress + Length) <= + sizeof(KPROCESSOR_STATE)) && + (State->Processor < KeNumberProcessors)) + { + /* Set the proper address */ + ControlStart = (PVOID)((ULONG_PTR)WriteMemory->TargetBaseAddress + + (ULONG_PTR)&KiProcessorBlock[State->Processor]-> + ProcessorState); + + /* Copy the memory */ + RtlCopyMemory(ControlStart, Data->Buffer, Data->Length); + Length = Data->Length; + + /* Finish up */ + State->ReturnStatus = STATUS_SUCCESS; + WriteMemory->ActualBytesWritten = Length; + } + else + { + /* Invalid request */ + Data->Length = 0; + State->ReturnStatus = STATUS_UNSUCCESSFUL; + WriteMemory->ActualBytesWritten = 0; + } + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpRestoreBreakpoint(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + PDBGKD_RESTORE_BREAKPOINT RestoreBp = &State->u.RestoreBreakPoint; + STRING Header; + + /* Fill out the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Get the version block */ + if (KdpDeleteBreakpoint(RestoreBp->BreakPointHandle)) + { + /* We're all good */ + State->ReturnStatus = STATUS_SUCCESS; + } + else + { + /* We failed */ + State->ReturnStatus = STATUS_UNSUCCESSFUL; + } + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); +} + +VOID +NTAPI +KdpGetContext(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PVOID ControlStart; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Make sure that this is a valid request */ + if (State->Processor < KeNumberProcessors) + { + /* Check if the request is for this CPU */ + if (State->Processor == KeGetCurrentPrcb()->Number) + { + /* We're just copying our own context */ + ControlStart = Context; + } + else + { + /* SMP not yet handled */ + ControlStart = NULL; + while (TRUE); + } + + /* Copy the memory */ + RtlCopyMemory(Data->Buffer, ControlStart, sizeof(CONTEXT)); + Data->Length = sizeof(CONTEXT); + + /* Finish up */ + State->ReturnStatus = STATUS_SUCCESS; + } + else + { + /* Invalid request */ + State->ReturnStatus = STATUS_UNSUCCESSFUL; + } + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpSetContext(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PVOID ControlStart; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == sizeof(CONTEXT)); + + /* Make sure that this is a valid request */ + if (State->Processor < KeNumberProcessors) + { + /* Check if the request is for this CPU */ + if (State->Processor == KeGetCurrentPrcb()->Number) + { + /* We're just copying our own context */ + ControlStart = Context; + } + else + { + /* SMP not yet handled */ + ControlStart = NULL; + while (TRUE); + } + + /* Copy the memory */ + RtlCopyMemory(ControlStart, Data->Buffer, sizeof(CONTEXT)); + + /* Finish up */ + State->ReturnStatus = STATUS_SUCCESS; + } + else + { + /* Invalid request */ + State->ReturnStatus = STATUS_UNSUCCESSFUL; + } + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +KCONTINUE_STATUS +NTAPI +KdpSendWaitContinue(IN ULONG PacketType, + IN PSTRING SendHeader, + IN PSTRING SendData OPTIONAL, + IN OUT PCONTEXT Context) +{ + STRING Data, Header; + DBGKD_MANIPULATE_STATE64 ManipulateState; + ULONG Length; + KDSTATUS RecvCode; + + /* Setup the Manipulate State structure */ + Header.MaximumLength = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)&ManipulateState; + Data.MaximumLength = sizeof(KdpMessageBuffer); + Data.Buffer = KdpMessageBuffer; + //KdpContextSent = FALSE; + +SendPacket: + /* Send the Packet */ + KdSendPacket(PacketType, SendHeader, SendData, &KdpContext); + + /* If the debugger isn't present anymore, just return success */ + if (KdDebuggerNotPresent) return ContinueSuccess; + + /* Main processing Loop */ + for (;;) + { + /* Receive Loop */ + do + { + /* Wait to get a reply to our packet */ + RecvCode = KdReceivePacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + &Data, + &Length, + &KdpContext); + + /* If we got a resend request, do it */ + if (RecvCode == KdPacketNeedsResend) goto SendPacket; + } while (RecvCode == KdPacketTimedOut); + + /* Now check what API we got */ + switch (ManipulateState.ApiNumber) + { + case DbgKdReadVirtualMemoryApi: + + /* Read virtual memory */ + KdpReadVirtualMemory(&ManipulateState, &Data, Context); + break; + + case DbgKdWriteVirtualMemoryApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdWriteVirtualMemoryApi); + while (TRUE); + break; + + case DbgKdGetContextApi: + + /* Get the current context */ + KdpGetContext(&ManipulateState, &Data, Context); + break; + + case DbgKdSetContextApi: + + /* Set a new context */ + KdpSetContext(&ManipulateState, &Data, Context); + break; + + case DbgKdWriteBreakPointApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdWriteBreakPointApi); + while (TRUE); + break; + + case DbgKdRestoreBreakPointApi: + + /* FIXME: TODO */ + KdpRestoreBreakpoint(&ManipulateState, &Data, Context); + break; + + case DbgKdContinueApi: + + /* Simply continue */ + return NT_SUCCESS(ManipulateState.u.Continue.ContinueStatus); + + case DbgKdReadControlSpaceApi: + + /* Read control space */ + KdpReadControlSpace(&ManipulateState, &Data, Context); + break; + + case DbgKdWriteControlSpaceApi: + + /* FIXME: TODO */ + KdpWriteControlSpace(&ManipulateState, &Data, Context); + break; + + case DbgKdReadIoSpaceApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdReadIoSpaceApi); + while (TRUE); + break; + + case DbgKdWriteIoSpaceApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdWriteIoSpaceApi); + while (TRUE); + break; + + case DbgKdRebootApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdRebootApi); + while (TRUE); + break; + + case DbgKdContinueApi2: + + /* Check if caller reports success */ + if (NT_SUCCESS(ManipulateState.u.Continue2.ContinueStatus)) + { + /* Update the state */ + KdpGetStateChange(&ManipulateState, Context); + return ContinueSuccess; + } + else + { + /* Return an error */ + return ContinueError; + } + break; + + case DbgKdReadPhysicalMemoryApi: + + /* FIXME: TODO */ + goto fail; + Ke386SetCr2(DbgKdReadPhysicalMemoryApi); + while (TRUE); + break; + + case DbgKdWritePhysicalMemoryApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdWritePhysicalMemoryApi); + while (TRUE); + break; + + case DbgKdQuerySpecialCallsApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdQuerySpecialCallsApi); + while (TRUE); + break; + + case DbgKdSetSpecialCallApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdSetSpecialCallApi); + while (TRUE); + break; + + case DbgKdClearSpecialCallsApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdClearSpecialCallsApi); + while (TRUE); + break; + + case DbgKdSetInternalBreakPointApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdSetInternalBreakPointApi); + while (TRUE); + break; + + case DbgKdGetInternalBreakPointApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdGetInternalBreakPointApi); + while (TRUE); + break; + + case DbgKdReadIoSpaceExtendedApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdReadIoSpaceExtendedApi); + while (TRUE); + break; + + case DbgKdWriteIoSpaceExtendedApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdWriteIoSpaceExtendedApi); + while (TRUE); + break; + + case DbgKdGetVersionApi: + + /* Get version data */ + KdpGetVersion(&ManipulateState); + break; + + case DbgKdWriteBreakPointExApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdWriteBreakPointExApi); + while (TRUE); + break; + + case DbgKdRestoreBreakPointExApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdRestoreBreakPointExApi); + while (TRUE); + break; + + case DbgKdCauseBugCheckApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdCauseBugCheckApi); + while (TRUE); + break; + + case DbgKdSwitchProcessor: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdSwitchProcessor); + while (TRUE); + break; + + case DbgKdPageInApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdPageInApi); + while (TRUE); + break; + + case DbgKdReadMachineSpecificRegister: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdReadMachineSpecificRegister); + while (TRUE); + break; + + case DbgKdWriteMachineSpecificRegister: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdWriteMachineSpecificRegister); + while (TRUE); + break; + + case OldVlm1: + + /* FIXME: TODO */ + Ke386SetCr2(OldVlm1); + while (TRUE); + break; + + case OldVlm2: + + /* FIXME: TODO */ + Ke386SetCr2(OldVlm2); + while (TRUE); + break; + + case DbgKdSearchMemoryApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdSearchMemoryApi); + while (TRUE); + break; + + case DbgKdGetBusDataApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdGetBusDataApi); + while (TRUE); + break; + + case DbgKdSetBusDataApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdSetBusDataApi); + while (TRUE); + break; + + case DbgKdCheckLowMemoryApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdCheckLowMemoryApi); + while (TRUE); + break; + + case DbgKdClearAllInternalBreakpointsApi: + + /* Just clear the counter */ + KdpNumInternalBreakpoints = 0; + break; + + case DbgKdFillMemoryApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdFillMemoryApi); + while (TRUE); + break; + + case DbgKdQueryMemoryApi: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdQueryMemoryApi); + while (TRUE); + break; + + case DbgKdSwitchPartition: + + /* FIXME: TODO */ + Ke386SetCr2(DbgKdSwitchPartition); + while (TRUE); + break; + + /* Unsupported Message */ + default: + + /* Setup an empty message, with failure */ + while (TRUE); +fail: + Data.Length = 0; + ManipulateState.ReturnStatus = STATUS_UNSUCCESSFUL; + + /* Send it */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + &Data, + &KdpContext); + break; + } + } +} + +BOOLEAN +NTAPI +KdpReportLoadSymbolsStateChange(IN PSTRING PathName, + IN PKD_SYMBOLS_INFO SymbolInfo, + IN BOOLEAN Unload, + IN OUT PCONTEXT Context) +{ + PSTRING ExtraData; + STRING Data, Header; + DBGKD_WAIT_STATE_CHANGE64 WaitStateChange; + KCONTINUE_STATUS Status; + + /* Start wait loop */ + do + { + /* Build the architecture common parts of the message */ + KdpSetCommonState(DbgKdLoadSymbolsStateChange, + Context, + &WaitStateChange); + + /* Now finish creating the structure */ + KdpSetContextState(&WaitStateChange, Context); + + /* Fill out load data */ + WaitStateChange.u.LoadSymbols.UnloadSymbols = Unload; + WaitStateChange.u.LoadSymbols.BaseOfDll = (ULONGLONG)(LONG_PTR)SymbolInfo->BaseOfDll; + WaitStateChange.u.LoadSymbols.ProcessId = SymbolInfo->ProcessId; + WaitStateChange.u.LoadSymbols.CheckSum = SymbolInfo->CheckSum; + WaitStateChange.u.LoadSymbols.SizeOfImage = SymbolInfo->SizeOfImage; + + /* Check if we have a symbol name */ + if (PathName) + { + /* Setup the information */ + WaitStateChange.u.LoadSymbols.PathNameLength = PathName->Length; + RtlCopyMemory(KdpPathBuffer, PathName->Buffer, PathName->Length); + Data.Buffer = KdpPathBuffer; + Data.Length = WaitStateChange.u.LoadSymbols.PathNameLength; + ExtraData = &Data; + } + else + { + /* No name */ + WaitStateChange.u.LoadSymbols.PathNameLength = 0; + ExtraData = NULL; + } + + /* Setup the header */ + Header.Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); + Header.Buffer = (PCHAR)&WaitStateChange; + + /* Send the packet */ + Status = KdpSendWaitContinue(PACKET_TYPE_KD_STATE_CHANGE64, + &Header, + ExtraData, + Context); + } while(Status == ContinueProcessorReselected); + + /* Return status */ + return Status; +} + +BOOLEAN +NTAPI +KdpReportExceptionStateChange(IN PEXCEPTION_RECORD ExceptionRecord, + IN OUT PCONTEXT Context, + IN BOOLEAN SecondChanceException) +{ + STRING Header, Data; + DBGKD_WAIT_STATE_CHANGE64 WaitStateChange; + BOOLEAN Status; + + /* Start report loop */ + do + { + /* Build the architecture common parts of the message */ + KdpSetCommonState(DbgKdExceptionStateChange, Context, &WaitStateChange); + + /* Convert the exception record to 64-bits and set First Chance flag */ + ExceptionRecord32To64((PEXCEPTION_RECORD32)ExceptionRecord, + &WaitStateChange.u.Exception.ExceptionRecord); + WaitStateChange.u.Exception.FirstChance = !SecondChanceException; + + /* Now finish creating the structure */ + KdpSetContextState(&WaitStateChange, Context); + + /* Setup the actual header to send to KD */ + Header.Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); + Header.Buffer = (PCHAR)&WaitStateChange; + + /* Send State Change packet and wait for a reply */ + Status = KdpSendWaitContinue(PACKET_TYPE_KD_STATE_CHANGE64, + &Header, + &Data, + Context); + } while (Status == KdPacketNeedsResend); + + /* Return */ + return Status; +} + +VOID +NTAPI +KdpTimeSlipDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + LONG OldSlip, NewSlip, PendingSlip; + + /* Get the current pending slip */ + PendingSlip = KdpTimeSlipPending; + do + { + /* Save the old value and either disable or enable it now. */ + OldSlip = PendingSlip; + NewSlip = OldSlip > 1 ? 1 : 0; + + /* Try to change the value */ + } while (InterlockedCompareExchange(&KdpTimeSlipPending, + NewSlip, + OldSlip) != OldSlip); + + /* If the New Slip value is 1, then do the Time Slipping */ + if (NewSlip) ExQueueWorkItem(&KdpTimeSlipWorkItem, DelayedWorkQueue); +} + +VOID +NTAPI +KdpTimeSlipWork(IN PVOID Context) +{ + KIRQL OldIrql; + LARGE_INTEGER DueTime; + + /* Update the System time from the CMOS */ + ExAcquireTimeRefreshLock(FALSE); + ExUpdateSystemTimeFromCmos(FALSE, 0); + ExReleaseTimeRefreshLock(); + + /* Check if we have a registered Time Slip Event and signal it */ + KeAcquireSpinLock(&KdpTimeSlipEventLock, &OldIrql); + if (KdpTimeSlipEvent) KeSetEvent(KdpTimeSlipEvent, 0, FALSE); + KeReleaseSpinLock(&KdpTimeSlipEventLock, OldIrql); + + /* Delay the DPC until it runs next time */ + DueTime.QuadPart = -1800000000; + KeSetTimer(&KdpTimeSlipTimer, DueTime, &KdpTimeSlipDpc); +} + +BOOLEAN +NTAPI +KdpSwitchProcessor(IN PEXCEPTION_RECORD ExceptionRecord, + IN OUT PCONTEXT ContextRecord, + IN BOOLEAN SecondChanceException) +{ + BOOLEAN Status; + + /* Save the port data */ + KdSave(FALSE); + + /* Report a state change */ +#if 0 + Status = KdpReportExceptionStateChange(ExceptionRecord, + ContextRecord, + SecondChanceException); +#else + Status = FALSE; +#endif + + /* Restore the port data and return */ + KdRestore(FALSE); + return Status; +} + +LARGE_INTEGER +NTAPI +KdpQueryPerformanceCounter(IN PKTRAP_FRAME TrapFrame) +{ + LARGE_INTEGER Null = {{0}}; + + /* Check if interrupts were disabled */ + if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) + { + /* Nothing to return */ + return Null; + } + + /* Otherwise, do the call */ + return KeQueryPerformanceCounter(NULL); +} + +BOOLEAN +NTAPI +KdEnterDebugger(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + BOOLEAN Entered; + + /* Check if we have a trap frame */ + if (TrapFrame) + { + /* Calculate the time difference for the enter */ + KdTimerStop = KdpQueryPerformanceCounter(TrapFrame); + KdTimerDifference.QuadPart = KdTimerStop.QuadPart - + KdTimerStart.QuadPart; + } + else + { + /* No trap frame, so can't calculate */ + KdTimerStop.QuadPart = 0; + } + + /* Save the current IRQL */ + KeGetCurrentPrcb()->DebuggerSavedIRQL = KeGetCurrentIrql(); + + /* Freeze all CPUs */ + Entered = KeFreezeExecution(TrapFrame, ExceptionFrame); + + /* Lock the port, save the state and set debugger entered */ + KdpPortLocked = KeTryToAcquireSpinLockAtDpcLevel(&KdpDebuggerLock); + KdSave(FALSE); + KdEnteredDebugger = TRUE; + + /* Check freeze flag */ + if (KiFreezeFlag & 1) + { + /* Print out errror */ + DbgPrint("FreezeLock was jammed! Backup SpinLock was used!\n"); + } + + /* Check processor state */ + if (KiFreezeFlag & 2) + { + /* Print out errror */ + DbgPrint("Some processors not frozen in debugger!\n"); + } + + /* Make sure we acquired the port */ + if (!KdpPortLocked) DbgPrint("Port lock was not acquired!\n"); + + /* Return enter state */ + return Entered; +} + +VOID +NTAPI +KdExitDebugger(IN BOOLEAN Entered) +{ + ULONG TimeSlip; + + /* Restore the state and unlock the port */ + KdRestore(FALSE); + if (KdpPortLocked) KdpPortUnlock(); + + /* Unfreeze the CPUs */ + KeThawExecution(Entered); + + /* Compare time with the one from KdEnterDebugger */ + if (!KdTimerStop.QuadPart) + { + /* We didn't get a trap frame earlier in so never got the time */ + KdTimerStart = KdTimerStop; + } + else + { + /* Query the timer */ + KdTimerStart = KeQueryPerformanceCounter(NULL); + } + + /* Check if a Time Slip was on queue */ + TimeSlip = InterlockedIncrement(&KdpTimeSlipPending); + if (TimeSlip == 1) + { + /* Queue a DPC for the time slip */ + InterlockedIncrement(&KdpTimeSlipPending); + KeInsertQueueDpc(&KdpTimeSlipDpc, NULL, NULL); + } +} + +NTSTATUS +NTAPI +KdEnableDebuggerWithLock(BOOLEAN NeedLock) +{ + KIRQL OldIrql = PASSIVE_LEVEL; + + /* Check if we need to acquire the lock */ + if (NeedLock) + { + /* Lock the port */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + KdpPortLock(); + } + + /* Check if we're not disabled */ + if (!KdDisableCount) + { + /* Check if we had locked the port before */ + if (NeedLock) + { + /* Do the unlock */ + KeLowerIrql(OldIrql); + KdpPortUnlock(); + } + + /* Fail: We're already enabled */ + return STATUS_INVALID_PARAMETER; + } + + /* Decrease the disable count */ + if (!(--KdDisableCount)) + { + /* We're now enabled again! Were we enabled before, too? */ + if (KdPreviouslyEnabled) + { + /* Reinitialize the Debugger */ + KdInitSystem(0, NULL) ; + KdpRestoreAllBreakpoints(); + } + } + + /* Check if we had locked the port before */ + if (NeedLock) + { + /* Yes, now unlock it */ + KeLowerIrql(OldIrql); + KdpPortUnlock(); + } + + /* We're done */ + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +KdEnableDebugger(VOID) +{ + /* Use the internal routine */ + while (TRUE); + return KdEnableDebuggerWithLock(TRUE); +} + Added: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c (added) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c Sat Mar 3 07:39:25 2007 @@ -1,0 +1,149 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdbreak.c + * PURPOSE: KD64 Breakpoint Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +KdpLowWriteContent(IN ULONG BpIndex) +{ + /* Make sure that the breakpoint is actually active */ + if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointPending) + { + /* So we have a valid breakpoint, but it hasn't been used yet... */ + KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointPending; + return TRUE; + } + + /* Is the original instruction an INT3 anyway? */ + if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) + { + /* Then leave it that way... */ + return TRUE; + } + + /* We have an active breakpoint with an instruction to bring back. Do it. */ + RtlCopyMemory(KdpBreakpointTable[BpIndex].Address, + &KdpBreakpointTable[BpIndex].Content, + sizeof(UCHAR)); + + /* Everything went fine, return */ + return TRUE; +} + +BOOLEAN +NTAPI +KdpLowRestoreBreakpoint(IN ULONG BpIndex) +{ + /* Were we not able to remove it earlier? */ + if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointExpired) + { + /* Well then, we'll just re-use it and return success! */ + KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointExpired; + return TRUE; + } + + /* Are we merely writing an INT3 on top of another INT3? */ + if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) + { + /* Nothing to do then... */ + return TRUE; + } + + /* Ok, we actually have to overwrite the instruction now */ + RtlCopyMemory(KdpBreakpointTable[BpIndex].Address, + &KdpBreakpointInstruction, + sizeof(UCHAR)); + + /* Clear any possible previous pending flag and return success */ + KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointPending; + return TRUE; +} + +BOOLEAN +NTAPI +KdpDeleteBreakpoint(IN ULONG BpEntry) +{ + ULONG BpIndex = BpEntry - 1; + + /* Check for invalid breakpoint entry */ + if (!(BpEntry) || (BpEntry > 20)) return FALSE; + + /* If the specified breakpoint table entry is not valid, then return FALSE. */ + if (!KdpBreakpointTable[BpIndex].Flags) return FALSE; + + /* Check if the breakpoint is suspended */ + if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointSuspended) + { + /* Check if breakpoint is not ...? */ + if (!(KdpBreakpointTable[BpIndex].Flags & KdpBreakpointExpired)) + { + /* Invalidate it and return success */ + KdpBreakpointTable[BpIndex].Flags = 0; + return TRUE; + } + } + + /* Restore original data, then invalidate it and return success */ + if (KdpLowWriteContent(BpIndex)) KdpBreakpointTable[BpIndex].Flags = 0; + return TRUE; +} + +BOOLEAN +NTAPI +KdpDeleteBreakpointRange(IN PVOID Base, + IN PVOID Limit) +{ + ULONG BpIndex; + BOOLEAN Return = FALSE; + + /* Loop the breakpoint table */ + for (BpIndex = 0; BpIndex < 20; BpIndex++) + { + /* Make sure that the breakpoint is active and matches the range. */ + if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && + ((KdpBreakpointTable[BpIndex].Address >= Base) && + (KdpBreakpointTable[BpIndex].Address <= Limit))) + { + /* Delete it */ + Return = Return || KdpDeleteBreakpoint(BpIndex + 1); + } + } + + /* Return to caller */ + return Return; +} + +VOID +NTAPI +KdpRestoreAllBreakpoints(VOID) +{ + ULONG BpIndex; + + /* No more suspended Breakpoints */ + BreakpointsSuspended = FALSE; + + /* Loop the breakpoints */ + for (BpIndex = 0; BpIndex < 20; BpIndex++ ) + { + /* Check if they are valid, suspended breakpoints */ + if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && + (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointSuspended)) + { + /* Unsuspend them */ + KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointSuspended; + KdpLowRestoreBreakpoint(BpIndex); + } + } +} Added: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c (added) +++ trunk/reactos/ntoskrnl/kd64/kddata.c Sat Mar 3 07:39:25 2007 @@ -1,0 +1,467 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kddata.c + * PURPOSE: Contains all global variables and settings for KD64 + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +VOID NTAPI RtlpBreakWithStatusInstruction(VOID); + +/* GLOBALS *******************************************************************/ + +// +// Debugger State +// +KD_CONTEXT KdpContext; +BOOLEAN KdpControlCPressed; +BOOLEAN KdpControlCWaiting; +BOOLEAN KdpPortLocked; +KSPIN_LOCK KdpDebuggerLock; + +// +// Debug Trap Handlers +// +PKDEBUG_ROUTINE KiDebugRoutine = KdpStub; +PKDEBUG_SWITCH_ROUTINE KiDebugSwitchRoutine; + +// +// Debugger Configuration Settings +// +BOOLEAN KdBreakAfterSymbolLoad; +BOOLEAN KdPitchDebugger; +BOOLEAN _KdDebuggerNotPresent; +BOOLEAN _KdDebuggerEnabled; +BOOLEAN KdAutoEnableOnEvent; +BOOLEAN KdPreviouslyEnabled; +BOOLEAN KdpDebuggerStructuresInitialized; +BOOLEAN KdEnteredDebugger; +ULONG KdDisableCount; +LARGE_INTEGER KdPerformanceCounterRate; + +// +// Breakpoint Data +// +BREAKPOINT_ENTRY KdpBreakpointTable[20]; +ULONG KdpBreakpointInstruction = 0xCC; +BOOLEAN KdpOweBreakpoint; +BOOLEAN BreakpointsSuspended; +ULONG KdpNumInternalBreakpoints; + +ULONG KdpCurrentSymbolStart, KdpCurrentSymbolEnd; + +// +// Time Slip Support +// +KDPC KdpTimeSlipDpc; +KTIMER KdpTimeSlipTimer; +WORK_QUEUE_ITEM KdpTimeSlipWorkItem; +LONG KdpTimeSlipPending = 1; +PKEVENT KdpTimeSlipEvent; +KSPIN_LOCK KdpTimeSlipEventLock; +LARGE_INTEGER KdTimerStop, KdTimerStart, KdTimerDifference; + +// +// Buffers +// +CHAR KdpMessageBuffer[4096]; +CHAR KdpPathBuffer[4096]; + +// +// KdPrint Buffers +// +CHAR KdPrintDefaultCircularBuffer[0x8000]; +PCHAR KdPrintWritePointer = KdPrintDefaultCircularBuffer; +ULONG KdPrintRolloverCount; +PCHAR KdPrintCircularBuffer = KdPrintDefaultCircularBuffer; +ULONG KdPrintBufferSize = sizeof(KdPrintDefaultCircularBuffer); +ULONG KdPrintBufferChanges = 0; + +// +// Debug Filter Masks +// +ULONG Kd_WIN2000_Mask = 1; +ULONG Kd_SYSTEM_Mask; +ULONG Kd_SMSS_Mask; +ULONG Kd_SETUP_Mask; +ULONG Kd_NTFS_Mask; +ULONG Kd_FSTUB_Mask; +ULONG Kd_CRASHDUMP_Mask; +ULONG Kd_CDAUDIO_Mask; +ULONG Kd_CDROM_Mask; +ULONG Kd_CLASSPNP_Mask; +ULONG Kd_DISK_Mask; +ULONG Kd_REDBOOK_Mask; +ULONG Kd_STORPROP_Mask; +ULONG Kd_SCSIPORT_Mask; +ULONG Kd_SCSIMINIPORT_Mask; +ULONG Kd_CONFIG_Mask; +ULONG Kd_I8042PRT_Mask; +ULONG Kd_SERMOUSE_Mask; +ULONG Kd_LSERMOUS_Mask; +ULONG Kd_KBDHID_Mask; +ULONG Kd_MOUHID_Mask; +ULONG Kd_KBDCLASS_Mask; +ULONG Kd_MOUCLASS_Mask; +ULONG Kd_TWOTRACK_Mask; +ULONG Kd_WMILIB_Mask; +ULONG Kd_ACPI_Mask; +ULONG Kd_AMLI_Mask; +ULONG Kd_HALIA64_Mask; +ULONG Kd_VIDEO_Mask; +ULONG Kd_SVCHOST_Mask; +ULONG Kd_VIDEOPRT_Mask; +ULONG Kd_TCPIP_Mask; +ULONG Kd_DMSYNTH_Mask; +ULONG Kd_NTOSPNP_Mask; +ULONG Kd_FASTFAT_Mask; +ULONG Kd_SAMSS_Mask; +ULONG Kd_PNPMGR_Mask; +ULONG Kd_NETAPI_Mask; +ULONG Kd_SCSERVER_Mask; +ULONG Kd_SCCLIENT_Mask; +ULONG Kd_SERIAL_Mask; +ULONG Kd_SERENUM_Mask; +ULONG Kd_UHCD_Mask; +ULONG Kd_RPCPROXY_Mask; +ULONG Kd_AUTOCHK_Mask; +ULONG Kd_DCOMSS_Mask; +ULONG Kd_UNIMODEM_Mask; +ULONG Kd_SIS_Mask; +ULONG Kd_FLTMGR_Mask; +ULONG Kd_WMICORE_Mask; +ULONG Kd_BURNENG_Mask; +ULONG Kd_IMAPI_Mask; +ULONG Kd_SXS_Mask; +ULONG Kd_FUSION_Mask; +ULONG Kd_IDLETASK_Mask; +ULONG Kd_SOFTPCI_Mask; +ULONG Kd_TAPE_Mask; +ULONG Kd_MCHGR_Mask; +ULONG Kd_IDEP_Mask; +ULONG Kd_PCIIDE_Mask; +ULONG Kd_FLOPPY_Mask; +ULONG Kd_FDC_Mask; +ULONG Kd_TERMSRV_Mask; +ULONG Kd_W32TIME_Mask; +ULONG Kd_PREFETCHER_Mask; +ULONG Kd_RSFILTER_Mask; +ULONG Kd_FCPORT_Mask; +ULONG Kd_PCI_Mask; +ULONG Kd_DMIO_Mask; +ULONG Kd_DMCONFIG_Mask; +ULONG Kd_DMADMIN_Mask; +ULONG Kd_WSOCKTRANSPORT_Mask; +ULONG Kd_VSS_Mask; +ULONG Kd_PNPMEM_Mask; +ULONG Kd_PROCESSOR_Mask; +ULONG Kd_DMSERVER_Mask; +ULONG Kd_SR_Mask; +ULONG Kd_INFINIBAND_Mask; +ULONG Kd_IHVDRIVER_Mask; +ULONG Kd_IHVVIDEO_Mask; +ULONG Kd_IHVAUDIO_Mask; +ULONG Kd_IHVNETWORK_Mask; +ULONG Kd_IHVSTREAMING_Mask; +ULONG Kd_IHVBUS_Mask; +ULONG Kd_HPS_Mask; +ULONG Kd_RTLTHREADPOOL_Mask; +ULONG Kd_LDR_Mask; +ULONG Kd_TCPIP6_Mask; +ULONG Kd_ISAPNP_Mask; +ULONG Kd_SHPC_Mask; +ULONG Kd_STORPORT_Mask; +ULONG Kd_STORMINIPORT_Mask; +ULONG Kd_PRINTSPOOLER_Mask; +ULONG Kd_VSSDYNDISK_Mask; +ULONG Kd_VERIFIER_Mask; +ULONG Kd_VDS_Mask; +ULONG Kd_VDSBAS_Mask; +ULONG Kd_VDSDYNDR_Mask; +ULONG Kd_VDSUTIL_Mask; +ULONG Kd_DFRGIFC_Mask; +ULONG Kd_DEFAULT_Mask; +ULONG Kd_MM_Mask; +ULONG Kd_DFSC_Mask; +ULONG Kd_WOW64_Mask; +ULONG Kd_ENDOFTABLE_Mask; + +// +// Debug Filter Component Table +// +PULONG KdComponentTable[104] = +{ + &Kd_SYSTEM_Mask, + &Kd_SMSS_Mask, + &Kd_SETUP_Mask, + &Kd_NTFS_Mask, + &Kd_FSTUB_Mask, + &Kd_CRASHDUMP_Mask, + &Kd_CDAUDIO_Mask, + &Kd_CDROM_Mask, + &Kd_CLASSPNP_Mask, + &Kd_DISK_Mask, + &Kd_REDBOOK_Mask, + &Kd_STORPROP_Mask, + &Kd_SCSIPORT_Mask, + &Kd_SCSIMINIPORT_Mask, + &Kd_CONFIG_Mask, + &Kd_I8042PRT_Mask, + &Kd_SERMOUSE_Mask, + &Kd_LSERMOUS_Mask, + &Kd_KBDHID_Mask, + &Kd_MOUHID_Mask, + &Kd_KBDCLASS_Mask, + &Kd_MOUCLASS_Mask, + &Kd_TWOTRACK_Mask, + &Kd_WMILIB_Mask, + &Kd_ACPI_Mask, + &Kd_AMLI_Mask, + &Kd_HALIA64_Mask, + &Kd_VIDEO_Mask, + &Kd_SVCHOST_Mask, + &Kd_VIDEOPRT_Mask, + &Kd_TCPIP_Mask, + &Kd_DMSYNTH_Mask, + &Kd_NTOSPNP_Mask, + &Kd_FASTFAT_Mask, + &Kd_SAMSS_Mask, + &Kd_PNPMGR_Mask, + &Kd_NETAPI_Mask, + &Kd_SCSERVER_Mask, + &Kd_SCCLIENT_Mask, + &Kd_SERIAL_Mask, + &Kd_SERENUM_Mask, + &Kd_UHCD_Mask, + &Kd_RPCPROXY_Mask, + &Kd_AUTOCHK_Mask, + &Kd_DCOMSS_Mask, + &Kd_UNIMODEM_Mask, + &Kd_SIS_Mask, + &Kd_FLTMGR_Mask, + &Kd_WMICORE_Mask, + &Kd_BURNENG_Mask, + &Kd_IMAPI_Mask, + &Kd_SXS_Mask, + &Kd_FUSION_Mask, + &Kd_IDLETASK_Mask, + &Kd_SOFTPCI_Mask, + &Kd_TAPE_Mask, + &Kd_MCHGR_Mask, + &Kd_IDEP_Mask, + &Kd_PCIIDE_Mask, + &Kd_FLOPPY_Mask, + &Kd_FDC_Mask, + &Kd_TERMSRV_Mask, + &Kd_W32TIME_Mask, + &Kd_PREFETCHER_Mask, + &Kd_RSFILTER_Mask, + &Kd_FCPORT_Mask, + &Kd_PCI_Mask, + &Kd_DMIO_Mask, + &Kd_DMCONFIG_Mask, + &Kd_DMADMIN_Mask, + &Kd_WSOCKTRANSPORT_Mask, + &Kd_VSS_Mask, + &Kd_PNPMEM_Mask, + &Kd_PROCESSOR_Mask, + &Kd_DMSERVER_Mask, + &Kd_SR_Mask, + &Kd_INFINIBAND_Mask, + &Kd_IHVDRIVER_Mask, + &Kd_IHVVIDEO_Mask, + &Kd_IHVAUDIO_Mask, + &Kd_IHVNETWORK_Mask, + &Kd_IHVSTREAMING_Mask, + &Kd_IHVBUS_Mask, + &Kd_HPS_Mask, + &Kd_RTLTHREADPOOL_Mask, + &Kd_LDR_Mask, + &Kd_TCPIP6_Mask, + &Kd_ISAPNP_Mask, + &Kd_SHPC_Mask, + &Kd_STORPORT_Mask, + &Kd_STORMINIPORT_Mask, + &Kd_PRINTSPOOLER_Mask, + &Kd_VSSDYNDISK_Mask, + &Kd_VERIFIER_Mask, + &Kd_VDS_Mask, + &Kd_VDSBAS_Mask, + &Kd_VDSDYNDR_Mask, + &Kd_VDSUTIL_Mask, + &Kd_DFRGIFC_Mask, + &Kd_DEFAULT_Mask, + &Kd_MM_Mask, + &Kd_DFSC_Mask, + &Kd_WOW64_Mask, + &Kd_ENDOFTABLE_Mask, +}; + +ULONG KdComponentTableSize = sizeof(KdComponentTable); + +// +// Debugger Data +// +LIST_ENTRY KdpDebuggerDataListHead; +KSPIN_LOCK KdpDataSpinLock; + +// +// Debugger Version and Data Block +// +DBGKD_GET_VERSION64 KdVersionBlock = +{ + 0, + 0, + DBGKD_64BIT_PROTOCOL_VERSION2, + KD_SECONDARY_VERSION_DEFAULT, + DBGKD_VERS_FLAG_DATA, + IMAGE_FILE_MACHINE_I386, + PACKET_TYPE_MAX, + 0, + 0, + DBGKD_SIMULATION_NONE, + {0}, + 0, + 0, + 0 +}; +KDDEBUGGER_DATA64 KdDebuggerDataBlock = +{ + {{0}}, + 0, + {PtrToUlong(RtlpBreakWithStatusInstruction)}, + 0, + FIELD_OFFSET(KTHREAD, CallbackStack), + CBSTACK_CALLBACK_STACK, + CBSTACK_EBP, + 0, + {PtrToUlong(KiCallUserMode)}, + {0}, + {PtrToUlong(&PsLoadedModuleList)}, + {PtrToUlong(&PsActiveProcessHead)}, + {PtrToUlong(&PspCidTable)}, + {PtrToUlong(&ExpSystemResourcesList)}, + {0}, // ExpPagedPoolDescriptor + {0}, // ExpNumberOfPagedPools + {PtrToUlong(&KeTimeIncrement)}, + {PtrToUlong(&KeBugcheckCallbackListHead)}, + {PtrToUlong(KiBugCheckData)}, + {PtrToUlong(&IopErrorLogListHead)}, + {PtrToUlong(&ObpRootDirectoryObject)}, + {PtrToUlong(&ObpTypeObjectType)}, + {0}, // MmSystemCacheStart + {0}, // MmSystemCacheEnd + {0}, // MmSystemCacheWs + {0}, // MmPfnDatabase + {0}, // MmSystemPtesStart + {0}, // MmSystemPtesEnd + {0}, // MmSubsectionBase + {0}, // MmNumberOfPagingFiles + {0}, // MmLowestPhysicalPage + {0}, // MmHighestPhysicalPage + {0}, // MmNumberOfPhysicalPages + {0}, // MmMaximumNonPagedPoolInBytes + {0}, // MmNonPagedSystemStart + {0}, // MmNonPagedPoolStart + {0}, // MmNonPagedPoolEnd + {0}, // MmPagedPoolStart + {0}, // MmPagedPoolEnd + {0}, // MmPagedPoolInfo + PAGE_SIZE, + {0}, // MmSizeOfPagedPoolInBytes + {0}, // MmTotalCommitLimit + {0}, // MmTotalCommittedPages + {0}, // MmSharedCommit + {0}, // MmDriverCommit + {0}, // MmProcessCommit + {0}, // MmPagedPoolCommit + {0}, + {0}, // MmZeroedPageListHead + {0}, // MmFreePageListHead + {0}, // MmStandbyPageListHead + {0}, // MmModifiedPageListHead + {0}, // MmModifiedNoWritePageListHead + {0}, // MmAvailablePages + {0}, // MmResidentAvailablePages + {0}, // PoolTrackTable + {0}, // NonPagedPoolDescriptor + {PtrToUlong(&MmHighestUserAddress)}, + {PtrToUlong(&MmSystemRangeStart)}, + {PtrToUlong(&MmUserProbeAddress)}, + {PtrToUlong(KdPrintDefaultCircularBuffer)}, + {PtrToUlong(KdPrintDefaultCircularBuffer + 1)}, + {PtrToUlong(&KdPrintWritePointer)}, + {PtrToUlong(&KdPrintRolloverCount)}, + {0}, // MmLoadedUserImageList + {PtrToUlong(&NtBuildLab)}, + {0}, + {PtrToUlong(KiProcessorBlock)}, + {0}, // MmUnloadedDrivers + {0}, // MmLastUnloadedDrivers + {0}, // MmTriageActionTaken + {0}, // MmSpecialPoolTag + {0}, // KernelVerifier + {0}, // MmVerifierData + {0}, // MmAllocatedNonPagedPool + {0}, // MmPeakCommitment + {0}, // MmtotalCommitLimitMaximum + {PtrToUlong(&CmNtCSDVersion)}, + {0}, // MmPhysicalMemoryBlock + {0}, // MmSessionBase + {0}, // MmSessionSize + {0}, + {0}, + FIELD_OFFSET(KTHREAD, NextProcessor), + FIELD_OFFSET(KTHREAD, Teb), + FIELD_OFFSET(KTHREAD, KernelStack), + FIELD_OFFSET(KTHREAD, InitialStack), + FIELD_OFFSET(KTHREAD, ApcState.Process), + FIELD_OFFSET(KTHREAD, State), + 0, + 0, + sizeof(EPROCESS), + FIELD_OFFSET(EPROCESS, Peb), + FIELD_OFFSET(EPROCESS, InheritedFromUniqueProcessId), + FIELD_OFFSET(EPROCESS, Pcb.DirectoryTableBase), + sizeof(KPRCB), + FIELD_OFFSET(KPRCB, DpcRoutineActive), + FIELD_OFFSET(KPRCB, CurrentThread), + FIELD_OFFSET(KPRCB, MHz), + FIELD_OFFSET(KPRCB, CpuType), + FIELD_OFFSET(KPRCB, VendorString), + FIELD_OFFSET(KPRCB, ProcessorState.ContextFrame), + FIELD_OFFSET(KPRCB, Number), + sizeof(ETHREAD), + {PtrToUlong(KdPrintDefaultCircularBuffer)}, + {PtrToUlong(&KdPrintBufferSize)}, + {PtrToUlong(&KeLoaderBlock)}, + sizeof(KIPCR) + sizeof(KPRCB), + FIELD_OFFSET(KIPCR, Self), + FIELD_OFFSET(KPCR, Prcb), + FIELD_OFFSET(KIPCR, PrcbData), + 0, + 0, + 0, + 0, + 0, + FIELD_OFFSET(KIPCR, PrcbData) + + FIELD_OFFSET(KPRCB, ProcessorState.SpecialRegisters), + KGDT_R0_CODE, + KGDT_R0_DATA, + KGDT_R0_PCR, + KGDT_R3_CODE, + KGDT_R3_DATA, + KGDT_R3_TEB, + KGDT_LDT, + KGDT_TSS, + 0, + 0, + {0}, // IopNumTriagDumpDataBlocks + {0}, // IopTriageDumpDataBlocks +}; Added: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c (added) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c Sat Mar 3 07:39:25 2007 @@ -1,0 +1,267 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdinit.c + * PURPOSE: KD64 Initialization Code + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +KdRegisterDebuggerDataBlock(IN ULONG Tag, + IN PDBGKD_DEBUG_DATA_HEADER64 DataHeader, + IN ULONG Size) +{ + KIRQL OldIrql; + PLIST_ENTRY NextEntry; + PDBGKD_DEBUG_DATA_HEADER64 CurrentHeader; + + /* Acquire the Data Lock */ + KeAcquireSpinLock(&KdpDataSpinLock, &OldIrql); + + /* Loop the debugger data list */ + NextEntry = KdpDebuggerDataListHead.Flink; + while (NextEntry != &KdpDebuggerDataListHead) + { + /* Get the header for this entry */ + CurrentHeader = CONTAINING_RECORD(NextEntry, + DBGKD_DEBUG_DATA_HEADER64, + List); + + /* Move to the next one */ + NextEntry = NextEntry->Flink; + + /* Check if we already have this data block */ + if ((CurrentHeader == DataHeader) || (CurrentHeader->OwnerTag == Tag)) + { + /* Release the lock and fail */ + KeReleaseSpinLock(&KdpDataSpinLock, OldIrql); + return FALSE; + } + } + + /* Setup the header */ + DataHeader->OwnerTag = Tag; + DataHeader->Size = Size; + + /* Insert it into the list and release the lock */ + InsertTailList(&KdpDebuggerDataListHead, (PLIST_ENTRY)&DataHeader->List); + KeReleaseSpinLock(&KdpDataSpinLock, OldIrql); + return TRUE; +} + +BOOLEAN +NTAPI +KdInitSystem(IN ULONG BootPhase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + BOOLEAN EnableKd; + LPSTR CommandLine, DebugLine; + ANSI_STRING ImageName; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PLIST_ENTRY NextEntry; + ULONG i, j, Length; + CHAR NameBuffer[256]; + PWCHAR Name; + + /* Check if this is Phase 1 */ + if (BootPhase) + { + /* Just query the performance counter */ + KeQueryPerformanceCounter(&KdPerformanceCounterRate); + return TRUE; + } + + /* Check if we already initialized once */ + if (KdDebuggerEnabled) return TRUE; + + /* Set the Debug Routine as the Stub for now */ + KiDebugRoutine = KdpStub; + + /* Disable break after symbol load for now */ + KdBreakAfterSymbolLoad = FALSE; + + /* Check if the Debugger Data Block was already initialized */ + if (!KdpDebuggerDataListHead.Flink) + { + /* It wasn't...Initialize the KD Data Listhead */ + InitializeListHead(&KdpDebuggerDataListHead); + + /* Register the Debugger Data Block */ + KdRegisterDebuggerDataBlock(KDBG_TAG, + &KdDebuggerDataBlock.Header, + sizeof(KdDebuggerDataBlock)); + + /* Fill out the KD Version Block */ + KdVersionBlock.MajorVersion = (USHORT)(NtBuildNumber >> 28); + KdVersionBlock.MinorVersion = (USHORT)(NtBuildNumber & 0xFFFF); + +#ifdef CONFIG_SMP + /* This is an MP Build */ + KdVersionBlock.Flags |= DBGKD_VERS_FLAG_MP; +#endif + + /* Save Pointers to Loaded Module List and Debugger Data */ + KdVersionBlock.PsLoadedModuleList = (ULONGLONG)(LONG_PTR)&PsLoadedModuleList; + KdVersionBlock.DebuggerDataList = (ULONGLONG)(LONG_PTR)&KdpDebuggerDataListHead; + + /* Set protocol limits */ + KdVersionBlock.MaxStateChange = DbgKdMaximumStateChange - + DbgKdMinimumStateChange; + KdVersionBlock.MaxManipulate = DbgKdMaximumManipulate - + DbgKdMinimumManipulate; + KdVersionBlock.Unused[0] = 0; + + /* Link us in the KPCR */ + KeGetPcr()->KdVersionBlock = &KdVersionBlock; + } + + /* Check if we have a loader block */ + if (LoaderBlock) + { + /* Get the image entry */ + LdrEntry = CONTAINING_RECORD(LoaderBlock->LoadOrderListHead.Flink, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Save the Kernel Base */ + PsNtosImageBase = (ULONG)LdrEntry->DllBase; + KdVersionBlock.KernBase = (ULONGLONG)(LONG_PTR)LdrEntry->DllBase; + + /* Check if we have a command line */ + CommandLine = LoaderBlock->LoadOptions; + if (CommandLine) + { + /* Upcase it */ + _strupr(CommandLine); + + /* Assume we'll disable KD */ + EnableKd = FALSE; + + /* Check for CRASHDEBUG and NODEBUG */ + if (strstr(CommandLine, "CRASHDEBUG")) KdPitchDebugger = FALSE; + if (strstr(CommandLine, "NODEBUG")) KdPitchDebugger = TRUE; + + /* Check if DEBUG was on */ + DebugLine = strstr(CommandLine, "DEBUG"); + if (DebugLine) + { + /* Enable KD */ + EnableKd = TRUE; + + /* Check if there was additional data */ + if (DebugLine[5] == '=') + { + /* FIXME: Check for NOUMEX, DISABLE, AUTOENABLE */ + } + } + } + else + { + /* No command line options? Disable debugger by default */ + KdPitchDebugger = TRUE; + EnableKd = FALSE; + } + } + else + { + /* Called from a bugcheck...Save the Kernel Base */ + KdVersionBlock.KernBase = (ULONGLONG)(LONG_PTR)PsNtosImageBase; + + /* Unconditionally enable KD */ + EnableKd = TRUE; + } + + /* Set the Kernel Base in the Data Block */ + KdDebuggerDataBlock.KernBase = (ULONGLONG)(LONG_PTR)KdVersionBlock.KernBase; + + /* Initialize the debugger if requested */ + if ((EnableKd) && (NT_SUCCESS(KdDebuggerInitialize0(LoaderBlock)))) + { + /* Now set our real KD routine */ + KiDebugRoutine = KdpTrap; + + /* Check if we've already initialized our structures */ + if (!KdpDebuggerStructuresInitialized) + { + /* Set the Debug Switch Routine and Retries*/ + KdpContext.KdpDefaultRetries = 20; + KiDebugSwitchRoutine = KdpSwitchProcessor; + + /* Initialize the Time Slip DPC */ + KeInitializeDpc(&KdpTimeSlipDpc, KdpTimeSlipDpcRoutine, NULL); + KeInitializeTimer(&KdpTimeSlipTimer); + ExInitializeWorkItem(&KdpTimeSlipWorkItem, KdpTimeSlipWork, NULL); + + /* First-time initialization done! */ + KdpDebuggerStructuresInitialized = TRUE; + } + + /* Initialize the timer */ + KdTimerStart.QuadPart = 0; + + /* Officially enable KD */ + KdPitchDebugger = FALSE; + KdDebuggerEnabled = TRUE; + + /* Let user-mode know that it's enabled as well */ +#undef KdDebuggerEnabled + SharedUserData->KdDebuggerEnabled = TRUE; +#define KdDebuggerEnabled _KdDebuggerEnabled + + /* Check if we have a loader block */ + if (LoaderBlock) + { + /* Loop boot images */ + NextEntry = LoaderBlock->LoadOrderListHead.Flink; + i = 0; + while ((NextEntry != &LoaderBlock->LoadOrderListHead) && (i < 2)) + { + /* Get the image entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Generate the image name */ + Name = LdrEntry->FullDllName.Buffer; + Length = LdrEntry->FullDllName.Length / sizeof(WCHAR); + j = 0; + do + { + /* Do cheap Unicode to ANSI conversion */ + NameBuffer[j++] = (CHAR)*Name++; + } while (j < Length); + + /* Null-terminate */ + NameBuffer[j] = ANSI_NULL; + + /* Load symbols for image */ + RtlInitAnsiString(&ImageName, NameBuffer); + DbgLoadImageSymbols(&ImageName, LdrEntry->DllBase, -1); + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + i++; + } + } + + /* Check for incoming breakin and break on symbol load if we have it*/ + KdBreakAfterSymbolLoad = KdPollBreakIn(); + } + else + { + /* Disable debugger */ + KdDebuggerNotPresent = TRUE; + } + + /* Return initialized */ + return TRUE; +} Added: trunk/reactos/ntoskrnl/kd64/kdlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdlock.c (added) +++ trunk/reactos/ntoskrnl/kd64/kdlock.c Sat Mar 3 07:39:25 2007 @@ -1,0 +1,125 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdlock.c + * PURPOSE: KD64 Port Lock and Breakin Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpPortLock(VOID) +{ + /* Acquire the lock */ + KiAcquireSpinLock(&KdpDebuggerLock); +} + +VOID +NTAPI +KdpPortUnlock(VOID) +{ + /* Release the lock */ + KiReleaseSpinLock(&KdpDebuggerLock); +} + +BOOLEAN +NTAPI +KdpPollBreakInWithPortLock(VOID) +{ + BOOLEAN DoBreak = FALSE; + + /* First make sure that KD is enabled */ + if (KdDebuggerEnabled) + { + /* Check if a CTRL-C is in the queue */ + if (KdpContext.KdpControlCPending) + { + /* Set it and prepare for break */ + DoBreak = TRUE; + KdpContext.KdpControlCPending = FALSE; + } + else + { + /* Now get a packet */ + if (!KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, + NULL, + NULL, + NULL, + NULL)) + { + /* Successful breakin */ + DoBreak = TRUE; + } + } + } + + /* Tell the caller to do a break */ + return DoBreak; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +BOOLEAN +NTAPI +KdPollBreakIn(VOID) +{ + BOOLEAN DoBreak = FALSE; + ULONG Flags = 0; + + /* First make sure that KD is enabled */ + if (KdDebuggerEnabled) + { + /* Disable interrupts */ + Ke386SaveFlags(Flags); + //Flags = __getcallerseflags(); + _disable(); + + /* Check if a CTRL-C is in the queue */ + if (KdpControlCWaiting) + { + /* Set it and prepare for break */ + KdpControlCPressed = TRUE; + DoBreak = TRUE; + KdpControlCWaiting = FALSE; + } + else + { + /* Try to acquire the lock */ + if (KeTryToAcquireSpinLockAtDpcLevel(&KdpDebuggerLock)) + { + /* Now get a packet */ + if (!KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, + NULL, + NULL, + NULL, + NULL)) + { + /* Successful breakin */ + DoBreak = TRUE; + KdpControlCPressed = TRUE; + } + + /* Let go of the port */ + KdpPortUnlock(); + } + } + + /* Re-enable interrupts if they were disabled */ + if (Flags & EFLAGS_INTERRUPT_MASK) _enable(); + } + + /* Tell the caller to do a break */ + return DoBreak; +} + Added: trunk/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdprint.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdprint.c (added) +++ trunk/reactos/ntoskrnl/kd64/kdprint.c Sat Mar 3 07:39:25 2007 @@ -1,0 +1,198 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdprint.c + * PURPOSE: KD64 Trap Handler Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +KdpPrintString(IN PSTRING Output) +{ + STRING Data, Header; + DBGKD_DEBUG_IO DebugIo; + ULONG Length = Output->Length; + + /* Copy the string */ + RtlMoveMemory(KdpMessageBuffer, Output->Buffer, Length); + + /* Make sure we don't exceed the KD Packet size */ + if ((sizeof(DBGKD_DEBUG_IO) + Length) > PACKET_MAX_SIZE) + { + /* Normalize length */ + Length = PACKET_MAX_SIZE - sizeof(DBGKD_DEBUG_IO); + } + + /* Build the packet header */ + DebugIo.ApiNumber = DbgKdPrintStringApi; + DebugIo.ProcessorLevel = KeProcessorLevel; + DebugIo.Processor = KeGetCurrentPrcb()->Number; + DebugIo.u.PrintString.LengthOfString = Length; + Header.Length = sizeof(DBGKD_DEBUG_IO); + Header.Buffer = (PCHAR)&DebugIo; + + /* Build the data */ + Data.Length = Length; + Data.Buffer = KdpMessageBuffer; + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_DEBUG_IO, &Header, &Data, &KdpContext); + + /* Check if the user pressed CTRL+C */ + return KdpPollBreakInWithPortLock(); +} + +ULONG +NTAPI +KdpCommandString(IN ULONG Length, + IN LPSTR String, + IN KPROCESSOR_MODE PreviousMode, + IN PCONTEXT ContextRecord, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + /* FIXME */ + return FALSE; +} + +ULONG +NTAPI +KdpSymbol(IN PSTRING DllPath, + IN PKD_SYMBOLS_INFO DllBase, + IN BOOLEAN Unload, + IN KPROCESSOR_MODE PreviousMode, + IN PCONTEXT ContextRecord, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + BOOLEAN Entered; + PKPRCB Prcb = KeGetCurrentPrcb(); + ULONG Status; + + /* Check if we need to do anything */ + if ((PreviousMode != KernelMode) || (KdDebuggerNotPresent)) return 0; + + /* Enter the debugger */ + Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); + + /* Save the CPU Control State and save the context */ + KiSaveProcessorControlState(&Prcb->ProcessorState); + RtlCopyMemory(&Prcb->ProcessorState.ContextFrame, + ContextRecord, + sizeof(CONTEXT)); + + /* Report the new state */ + Status = KdpReportLoadSymbolsStateChange(DllPath, + DllBase, + Unload, + &Prcb->ProcessorState. + ContextFrame); + + /* Now restore the processor state, manually again. */ + RtlCopyMemory(ContextRecord, + &Prcb->ProcessorState.ContextFrame, + sizeof(CONTEXT)); + //KiRestoreProcessorControlState(&Prcb->ProcessorState); + + /* Exit the debugger and clear the CTRL-C state */ + KdExitDebugger(Entered); + return 0; +} + +ULONG +NTAPI +KdpPrompt(IN LPSTR InString, + IN ULONG InStringLength, + OUT LPSTR OutString, + IN ULONG OutStringLength, + IN KPROCESSOR_MODE PreviousMode, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + /* FIXME */ + return FALSE; +} + +ULONG +NTAPI +KdpPrint(IN ULONG ComponentId, + IN ULONG ComponentMask, + IN LPSTR String, + IN ULONG Length, + IN KPROCESSOR_MODE PreviousMode, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + OUT PBOOLEAN Status) +{ + NTSTATUS ReturnValue; + BOOLEAN Entered; + ANSI_STRING AnsiString; + + /* Assume failure */ + *Status = FALSE; + + /* Validate the mask */ + if (ComponentMask <= 0x1F) ComponentMask = 1 << ComponentMask; + if (!(Kd_WIN2000_Mask & ComponentMask) || + ((ComponentId < KdComponentTableSize) && + !(*KdComponentTable[ComponentId] & ComponentMask))) + { + /* Mask validation failed */ + *Status = TRUE; + return FALSE; + } + + /* Normalize the length */ + Length = min(Length, 512); + + /* Check if we need to verify the buffer */ + if (PreviousMode != KernelMode) + { + /* FIXME: Support user-mode */ + } + + /* Setup the ANSI string */ + AnsiString.Buffer = String; + AnsiString.Length = (USHORT)Length; + + /* Log the print */ + //KdLogDbgPrint(&AnsiString); + + /* Check for a debugger */ + if (KdDebuggerNotPresent) + { + /* Fail */ + *Status = TRUE; + return (ULONG)STATUS_DEVICE_NOT_CONNECTED; + } + + /* Enter the debugger */ + Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); + + /* Print the string */ + if (KdpPrintString(&AnsiString)) + { + /* User pressed CTRL-C, breakpoint on return */ + ReturnValue = STATUS_BREAKPOINT; + } + else + { + /* String was printed */ + ReturnValue = STATUS_SUCCESS; + } + + /* Exit the debugger and return */ + KdExitDebugger(Entered); + *Status = TRUE; + return ReturnValue; +} + Added: trunk/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdtrap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdtrap.c (added) +++ trunk/reactos/ntoskrnl/kd64/kdtrap.c Sat Mar 3 07:39:25 2007 @@ -1,0 +1,239 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdtrap.c + * PURPOSE: KD64 Trap Handlers + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +KdpReport(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException) +{ + BOOLEAN Entered, Status; + PKPRCB Prcb; + NTSTATUS ExceptionCode = ExceptionRecord->ExceptionCode; + + /* Check if this is INT1 or 3, or if we're forced to handle it */ + if ((ExceptionCode == STATUS_BREAKPOINT) || + (ExceptionCode == STATUS_SINGLE_STEP) || + //(ExceptionCode == STATUS_ASSERTION_FAILURE) || + (NtGlobalFlag & FLG_STOP_ON_EXCEPTION)) + { + /* Check if we can't really handle this */ + if ((SecondChanceException) || + (ExceptionCode == STATUS_PORT_DISCONNECTED) || + (NT_SUCCESS(ExceptionCode))) + { + /* Return false to have someone else take care of the exception */ + return FALSE; + } + } + else if (SecondChanceException) + { + /* We won't bother unless this is second chance */ + return FALSE; + } + + /* Enter the debugger */ + Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); + + /* + * Get the KPRCB and save the CPU Control State manually instead of + * using KiSaveProcessorState, since we already have a valid CONTEXT. + */ + Prcb = KeGetCurrentPrcb(); + KiSaveProcessorControlState(&Prcb->ProcessorState); + RtlCopyMemory(&Prcb->ProcessorState.ContextFrame, + ContextRecord, + sizeof(CONTEXT)); + + /* Report the new state */ + Status = KdpReportExceptionStateChange(ExceptionRecord, + &Prcb->ProcessorState. + ContextFrame, + SecondChanceException); + + /* Now restore the processor state, manually again. */ + RtlCopyMemory(ContextRecord, + &Prcb->ProcessorState.ContextFrame, + sizeof(CONTEXT)); + //KiRestoreProcessorControlState(&Prcb->ProcessorState); + + /* Exit the debugger and clear the CTRL-C state */ + KdExitDebugger(Entered); + KdpControlCPressed = FALSE; + return Status; +} + +BOOLEAN +NTAPI +KdpTrap(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException) +{ + BOOLEAN Unload = FALSE; + ULONG Eip, Eax; + BOOLEAN Status = FALSE; + + /* + * Check if we got a STATUS_BREAKPOINT with a SubID for Print, Prompt or + * Load/Unload symbols. + */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && + (ExceptionRecord->ExceptionInformation[0] != BREAKPOINT_BREAK)) + { + /* Save EIP */ + Eip = ContextRecord->Eip; + + /* Check what kind of operation was requested from us */ + switch (ExceptionRecord->ExceptionInformation[0]) + { + /* DbgPrint */ + case BREAKPOINT_PRINT: + + /* Call the worker routine */ + Eax = KdpPrint(ContextRecord->Ebx, + ContextRecord->Edi, + (LPSTR)ExceptionRecord->ExceptionInformation[1], + (ULONG)ExceptionRecord->ExceptionInformation[2], + PreviousMode, + TrapFrame, + ExceptionFrame, + &Status); + + /* Update the return value for the caller */ + ContextRecord->Eax = Eax; + break; + + /* DbgPrompt */ + case BREAKPOINT_PROMPT: + + /* Call the worker routine */ + while (TRUE); + Eax = 0; + Status = TRUE; + + /* Update the return value for the caller */ + ContextRecord->Eax = Eax; + break; + + /* DbgUnloadSymbols */ + case BREAKPOINT_UNLOAD_SYMBOLS: + + /* Drop into the load case below, with the unload parameter */ + Unload = TRUE; + + /* DbgLoadSymbols */ + case BREAKPOINT_LOAD_SYMBOLS: + + /* Call the worker routine */ + KdpSymbol((PVOID)ExceptionRecord->ExceptionInformation[1], + (PVOID)ExceptionRecord->ExceptionInformation[2], + Unload, + PreviousMode, + ContextRecord, + TrapFrame, + ExceptionFrame); + Status = TRUE; + break; + + /* DbgCommandString*/ + case BREAKPOINT_COMMAND_STRING: + + /* Call the worker routine */ + while (TRUE); + Status = TRUE; + + /* Anything else, do nothing */ + default: + + /* Get out */ + break; + } + + /* + * If EIP was not updated, we'll increment it ourselves so execution + * continues past the breakpoint. + */ + if (ContextRecord->Eip == Eip) ContextRecord->Eip++; + } + else + { + /* Call the worker routine */ + Status = KdpReport(TrapFrame, + ExceptionFrame, + ExceptionRecord, + ContextRecord, + PreviousMode, + SecondChanceException); + } + + /* Return TRUE or FALSE to caller */ + return Status; +} + +BOOLEAN +NTAPI +KdpStub(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException) +{ + ULONG ExceptionCommand = ExceptionRecord->ExceptionInformation[0]; + + /* Check if this was a breakpoint due to DbgPrint or Load/UnloadSymbols */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && + (ExceptionRecord->NumberParameters > 0) && + ((ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) || + (ExceptionCommand == BREAKPOINT_UNLOAD_SYMBOLS) || + (ExceptionCommand == BREAKPOINT_COMMAND_STRING) || + (ExceptionCommand == BREAKPOINT_PRINT))) + { + /* This we can handle: simply bump EIP */ + ContextRecord->Eip++; + return TRUE; + } + else if (KdPitchDebugger) + { + /* There's no debugger, fail. */ + return FALSE; + } + else if ((KdAutoEnableOnEvent) && + (KdPreviouslyEnabled) && + !(KdDebuggerEnabled) && + (KdEnableDebugger()) && + (KdDebuggerEnabled)) + { + /* Debugging was Auto-Enabled. We can now send this to KD. */ + return KdpTrap(TrapFrame, + ExceptionFrame, + ExceptionRecord, + ContextRecord, + PreviousMode, + SecondChanceException); + } + else + { + /* FIXME: All we can do in this case is trace this exception */ + return FALSE; + } +} Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Sat Mar 3 07:39:25 2007 @@ -697,8 +697,8 @@ // // Restore GDT, IDT, LDT and TSS // - Ke386SetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr); - Ke386SetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr); + Ke386SetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr.Base); + Ke386SetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr.Base); Ke386SetTr(ProcessorState->SpecialRegisters.Tr); Ke386SetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr); } @@ -724,8 +724,8 @@ Ke386SetDr7(0); /* Save GDT, IDT, LDT and TSS */ - Ke386GetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr); - Ke386GetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr); + Ke386GetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr.Base); + Ke386GetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr.Base); Ke386GetTr(ProcessorState->SpecialRegisters.Tr); Ke386GetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr); } Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Sat Mar 3 07:39:25 2007 @@ -800,7 +800,7 @@ /* Set the context flags */ Context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; - /* Check if User Mode or if the debugger isenabled */ + /* Check if User Mode or if the debugger is enabled */ if ((PreviousMode == UserMode) || (KdDebuggerEnabled)) { /* Add the FPU Flag */ @@ -846,9 +846,6 @@ goto Handled; } - /* HACK: GDB Entry */ - if (KdpCallGdb(TrapFrame, ExceptionRecord, &Context)) goto Handled; - /* If the Debugger couldn't handle it, dispatch the exception */ if (RtlDispatchException(ExceptionRecord, &Context)) goto Handled; } @@ -893,9 +890,6 @@ /* Exception was handled */ goto Handled; } - - /* HACK: GDB Entry */ - if (KdpCallGdb(TrapFrame, ExceptionRecord, &Context)) goto Handled; /* Forward exception to user mode debugger */ if (DbgkForwardException(ExceptionRecord, TRUE, FALSE)) goto Exit; @@ -1045,4 +1039,3 @@ /* Return the old EIP */ return (NTSTATUS)OldEip; } - Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Sat Mar 3 07:39:25 2007 @@ -228,22 +228,6 @@ /* Copy the parameters */ rep movsd -#ifdef DBG - /* - * The following lines are for the benefit of GDB. It will see the return - * address of the "call ebx" below, find the last label before it and - * thinks that that's the start of the function. It will then check to see - * if it starts with a standard function prolog (push ebp, mov ebp,esp1). - * When that standard function prolog is not found, it will stop the - * stack backtrace. Since we do want to backtrace into usermode, let's - * make GDB happy and create a standard prolog. - */ -KiSystemService: - push ebp - mov ebp,esp - pop ebp -#endif - /* Do the System Call */ call ebx @@ -482,7 +466,7 @@ TRAP_PROLOG kids /* Increase EIP so we skip the INT3 */ - //inc dword ptr [ebp+KTRAP_FRAME_EIP] + inc dword ptr [ebp+KTRAP_FRAME_EIP] /* Call debug service dispatcher */ mov eax, [ebp+KTRAP_FRAME_EAX] @@ -821,7 +805,11 @@ /* Enter trap */ TRAP_PROLOG kit3 + /* Set status code */ + mov eax, 0 //STATUS_SUCCESS + /* Check for V86 */ +PrepareInt3: test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz V86Int3 Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=259… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c Sat Mar 3 07:39:25 2007 @@ -432,9 +432,9 @@ { DbgPrint("MmInsertRmap tries to add a second rmap entry for address %p\n current caller ", current_entry->Address); - KeRosPrintAddress(new_entry->Caller); + DbgPrint("%p", new_entry->Caller); DbgPrint("\n previous caller "); - KeRosPrintAddress(current_entry->Caller); + DbgPrint("%p", current_entry->Caller); DbgPrint("\n"); KeBugCheck(0); } Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Sat Mar 3 07:39:25 2007 @@ -1752,9 +1752,6 @@ if (ModuleObject) *ModuleObject = LdrEntry; if (ImageBaseAddress) *ImageBaseAddress = LdrEntry->DllBase; - /* Hook for KDB on loading a driver. */ - KDB_LOADDRIVER_HOOK(FileName, LdrEntry); - Quickie: /* If we have a file handle, close it */ if (FileHandle) ZwClose(FileHandle); Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=259… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Sat Mar 3 07:39:25 2007 @@ -286,9 +286,6 @@ /* Detach */ KeUnstackDetachProcess(&ApcState); } - - /* KDB hook */ - KDB_DELETEPROCESS_HOOK(Process); /* Check if we have an address space, and clean it */ if (Process->HasAddressSpace)

1 0

[spetreolle] 25964: fix build
by spetreolle＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: spetreolle Date: Sat Mar 3 01:04:21 2007 New Revision: 25964 URL: http://svn.reactos.org/svn/reactos?rev=25964&view=rev Log: fix build Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Sat Mar 3 01:04:21 2007 @@ -161,7 +161,6 @@ // #define TLS_MINIMUM_AVAILABLE 64 #endif -#define TLS_EXPANSION_SLOTS 1024 // // Job Access Types @@ -204,6 +203,7 @@ #define STA_ADDRESS_SPACE_OWNER_BIT 0x4 #endif +#define TLS_EXPANSION_SLOTS 1024 // // Process Flags //

1 0

[fireball] 25963: HACKALERT: Downgrade vmwinst back to 23933, thus working around the inability to set display resolution during setup (if using VMWare's display driver).
by fireball＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: fireball Date: Sat Mar 3 00:26:41 2007 New Revision: 25963 URL: http://svn.reactos.org/svn/reactos?rev=25963&view=rev Log: HACKALERT: Downgrade vmwinst back to 23933, thus working around the inability to set display resolution during setup (if using VMWare's display driver). Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Cz.rc branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/De.rc branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Dk.rc branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/En.rc branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Es.rc branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Hu.rc branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ja.rc branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ru.rc branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Uk.rc branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmware.inf Removed: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/lang/ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/rsrc.rc Modified: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.c branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.h branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.rbuild branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.rc Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Cz.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Cz.rc (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Cz.rc Sat Mar 3 00:26:41 2007 @@ -1,0 +1,130 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaèe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS zjistil, e bìí pod VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaè klepnìte na 'Dalí', pokud ovladaè instalovat nechcete, klepnìte na 'Storno'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaèe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Standardní instalace ReactOS neobsahuje VMware(r) SVGA ovladaè.\n\nProto musíte v oknì VMware(r) workstation vybrat nabídku 'VM' a zvolit poloku 'Install VMware tools...'\n\n\nKlepnìte na 'Dalí' pro pokraèování nebo 'Storno' pro pøeskoèení instalace SVGA ovladaèe.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaèe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaèe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ovladaè obrazovky VMware(r) SVGA byl úspìnì nainstalován. Nyní, prosím, vyberte preferované rozliení obrazovky:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Nyní vyberte preferovanou hloubku barev:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaèe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nelze nainstalovat VMware(r) SVGA ovladaè.\n\n\nKlepnìte na 'Dokonèit' pro pokraèování v instalaèním procesu.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaèe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ovladaè VMware(r) SVGA je ji nainstalován.\n\nNyní, prosím, zvolte, co chete provést:",-1,25,5,225,30 + PUSHBUTTON "Upravit nastavení obrazovky", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Pouít jiný grafický ovladaè", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Odebrat ovladaè VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Klepnìte na 'Dalí' pro pokraèování nebo na 'Storno' pro ukonèení prùvodce.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaèe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Vyberte, prosím, grafický ovladaè, který chcete pouít:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA ovladaè", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE ovladaè (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Klepnìte na 'Dokonèit' pro dokonèení operace nebo na 'Storno' pro ukonèení nastavení beze zmìn.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaèe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nyní bude odebrán ovladaè VMware(r) SVGA!!!\n\n\nKlepnìte na 'Dokonèit' pro odebrání ovladaèe nebo na 'Storno' pro ponechání.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Detekováno prostøedí VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "ReactOS nemùe nalézt poadované soubory.\nZkontrolujte, prosím, zda je VMware(r) tools CD-ROM správnì vloeno." + IDS_FAILEDTOCOPYFILES "Nelze zkopírovat poadované soubory.\nZkontrolujte, prosím, zda je VMware(r) tools CD-ROM správnì vloeno.\n" + IDS_FAILEDTOACTIVATEDRIVER "Nepodaøilo se zaktivovat VMware(r) SVGA ovladaè!" + IDS_FAILEDTOSELVGADRIVER "Nepodaøilo se zaktivovat ReactOS VGA ovladaè!" + IDS_FAILEDTOSELVBEDRIVER "Nepodaøilo se zaktivovat ReactOS VBE ovladaè!" + IDS_UNINSTNOTICE "Podpùrné soubory VMware(r) SVGA ovladaèe nebyly odstranìny.\nSmate je, prosím, po restarování systému." +END + +STRINGTABLE +BEGIN + 10001 "Nejnií (8BPP)" + 10002 "Støední (16BPP)" + 10003 "Nejvyí (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Hledá se VMware(r) Tools CD-ROM..." + IDS_COPYINGFILES "kopírují se soubory..." + IDS_ENABLINGDRIVER "Zavádí se ovladaè VMware(r) SVGA..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Vlote, prosím, VMware(r) tools CD-ROM." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Vyhledání a kopírování VMware (r) SVGA ovladaèe." + IDD_CONFIGTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_CONFIGSUBTITLE "Vyberte, prosím, preferované rozliení obrazovky:" + IDD_INSTALLATION_FAILEDTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_INSTALLATION_FAILEDSUBTITLE "Instalace ovladaèe VMware (r) SVGA selhala." + IDD_CHOOSEACTIONTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_CHOOSEACTIONSUBTITLE "Zvolte, prosím, co chete provést." + IDD_SELECTDRIVERTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_SELECTDRIVERSUBTITLE "Vyberte ovladaè." + IDD_DOUNINSTALLTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_DOUNINSTALLSUBTITLE "Odstranìní ovladaèe." +END Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/De.rc (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/De.rc Sat Mar 3 00:26:41 2007 @@ -1,0 +1,130 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Grafiktreiberinstallation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Das ReactOS Setup hat festgestellt, das Sie ReactOS in VMware(r) installieren.", -1, 100, 8, 160, 24 + LTEXT "Wenn Sie den VMware(r) SVGA Treiber installieren möchten, klicken Sie auf 'Weiter', ansonsten auf 'Abbrechen'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Grafiktreiberinstallation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS wird nicht mit dem VMware(r) SVGA Treiber ausgeliefert.\n\nGehen Sie bitte auf 'VM' in der Menüleiste von VMware(r) Workstation und wählen Sie 'VMware Tools installieren...'\n\n\nKlicken Sie auf 'Weiter' um fortzufahren, ansonsten auf 'Abbrechen'",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Grafiktreiberinstallation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Grafiktreiberinstallation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Der VMware(r) SVGA Treiber wurde erfolgreich installiert. Wählen Sie bitte Ihre Auflösung:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Wählen Sie bitte Ihre Farbtiefe:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Grafiktreiberinstallation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Das ReactOS Setup konnte den VMware(r) SVGA Treiber nicht finden.\n\n\nKlicken Sie auf 'Fertigstellen' um mit der Installation fortzufahren",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Grafiktreiberinstallation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Der VMware(r) SVGA Treiber wurde schon installiert.\n\nWählen Sie bitte eine der folgenden Optionen aus:",-1,25,5,225,30 + PUSHBUTTON "Die Bildeinstellungen ändern", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Einen anderen Grafiktreiber benutzen", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Den VMware(r) SVGA Treiber entfernen", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Klicken Sie auf 'Weiter' um fortzufahren oder 'Abbrechen' und den Asssistenten zu beenden.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Grafiktreiberinstallation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Wählen Sie bitte den Grafiktreiber aus, den Sie verwenden möchten:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA Treiber", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE Treiber (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Klicken Sie auf 'Fertigstellen' um die Installation fertigzustellen oder auf 'Abbrechen' um das Setup ohne Veränderungen zu beenden.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Grafiktreiberinstallation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Das ReactOS Setup wird Ihren VMware(r) SVGA Treiber entfernen!!!\n\n\nKlicken Sie auf 'Fertigstellen' um den Treiber zu entfernen oder auf 'Abbrechen' um ihn weiterhin zu verwenden.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "VMware(r) gefunden" + IDS_FAILEDTOLOCATEDRIVERS "Das ReactOS Setup konnte die benötigten Dateien nicht finden.\nStellen Sie sicher, das sich die VMware-Tools CD in dem Laufwerk befindet." + IDS_FAILEDTOCOPYFILES "Das ReactOS Setup konnte die benötigten Dateien nicht kopieren.\nStellen Sie sicher, das sich die VMware-Tools CD in dem Laufwerk befindet.\n" + IDS_FAILEDTOACTIVATEDRIVER "Fehler beim Aktivieren des VMware(r) SVGA Treibers!" + IDS_FAILEDTOSELVGADRIVER "Fehler beim Aktivieren des ReactOS VGA Treibers!" + IDS_FAILEDTOSELVBEDRIVER "Fehler beim Aktivieren des ReactOS VBE Treibers!" + IDS_UNINSTNOTICE "Die VMware(r) SVGA Treiber Dateien wurden noch nicht gelöscht.\nLöschen Sie sie bitte nach dem Neustart manuell." +END + +STRINGTABLE +BEGIN + 10001 "Niedrigste (8BPP)" + 10002 "Mittelere (16BPP)" + 10003 "Höchste (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Suche die VMware(r) Tools CD-ROM..." + IDS_COPYINGFILES "Kopiere Dateien..." + IDS_ENABLINGDRIVER "Aktiviere den VMware(r) SVGA Treiber..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "VMware(r) SVGA Treiber Installationsassistent" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Bitte legen Sie die VMware-Tool CD-ROM ein." + IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware(r) SVGA Treiber Installationsassistent" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Suchen und kopieren des VMware(r) SVGA Treibers." + IDD_CONFIGTITLE "VMware(r) SVGA Treiber Installationsassistent" + IDD_CONFIGSUBTITLE "Wählen Sie die Bildschirmauflösung aus." + IDD_INSTALLATION_FAILEDTITLE "VMware(r) SVGA Treiber Installationsassistent" + IDD_INSTALLATION_FAILEDSUBTITLE "Die VMware(r) SVGA Treiber installation ist fehlgeschlagen." + IDD_CHOOSEACTIONTITLE "VMware(r) SVGA Treiber Installationsassistent" + IDD_CHOOSEACTIONSUBTITLE "Wählen Sie eine Option aus." + IDD_SELECTDRIVERTITLE "VMware(r) SVGA Treiber Installationsassistent" + IDD_SELECTDRIVERSUBTITLE "Wählen Sie einen Treiber aus." + IDD_DOUNINSTALLTITLE "VMware(r) SVGA Treiber Installationsassistent" + IDD_DOUNINSTALLSUBTITLE "De-Installieren des Treibers." +END Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Dk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Dk.rc (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Dk.rc Sat Mar 3 00:26:41 2007 @@ -1,0 +1,130 @@ +LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Driver til Grafikkort Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS Installation har opdaget at du køre ReactOS under VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Hvis du ønsker at installere VMware(r) SVGA driveren Klik 'Næste', Ellers klik på 'Fortryd' for at afbryde.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "VMware Installation - Driver til Grafikkort" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS Installationen indeholder ingen VMware(r) SVGA driver.\n\nDerfor gå til menuen 'VM' i VMware(r) Arbejdsstation og vælg 'Install VMware tools...'\n\n\nKlik 'Næste' for at forsætte eller klik 'Fortryd' for at undlade at installere SVGA driveren.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "VMware Installation - Driver til Grafikkort" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "VMware Installation - Driver til Grafikkort" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "WMware(r) SVGA driver er blevet installeret med succes. Vælg din favorit Skærm Opløsning:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Vælg din favorit farve kvalitet:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "VMware Installation - Driver til Grafikkort" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS Installationen var ikke i stand til at installere WMware(r) SVGA driver.\n\n\nKlik på 'Færdig' for at forsætte installations processen.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "VMware Installation - Driver til Grafikkort" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "WMware(r) SVGA driver er allerede installeret.\n\nVælg venligst hvad du ønsker at gøre:",-1,25,5,225,30 + PUSHBUTTON "Konfigurer Skærm indstillinger", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Benyt en anden Grafikkort Driver", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Afinstallere WMware(r) SVGA driver", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Klik på 'Næste' for at forsætte eller klik på 'Fortryd' for at afslutte guiden.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "VMware Installation - Driver til Grafikkort" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Vælg venligst den driver til grafikkortet du ønsker at bruge:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA Driver", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE Driver (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Klik på 'Færdig' for at afslutte operationen eller klik på 'fortryd' for at afslutte Installationen uden at gemme ændringerne.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "VMware Installation - Driver til Grafikkort" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS installation skal til at afinstallere din VMware(r) SVGA driver!!!\n\n\nKlik på 'Færdig' for at afinstallere driveren eller klik på 'Fortryd' for at afslutte uden at gemme.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "VMware(r) detected" + IDS_FAILEDTOLOCATEDRIVERS "The ReactOS Setup couldn't find the required files.\nPlease make sure the VMware(r) tools CD-ROM is inserted." + IDS_FAILEDTOCOPYFILES "The ReactOS Setup failed to copy the required files.\nPlease make sure the VMware(r) tools CD-ROM is inserted.\n" + IDS_FAILEDTOACTIVATEDRIVER "Failed to activate the VMware(r) SVGA driver!" + IDS_FAILEDTOSELVGADRIVER "Failed to activate the ReactOS VGA driver!" + IDS_FAILEDTOSELVBEDRIVER "Failed to activate the ReactOS VBE driver!" + IDS_UNINSTNOTICE "The VMware(r) SVGA driver files have not yet been deleted.\nPlease delete them manually after a system reboot." +END + +STRINGTABLE +BEGIN + 10001 "Laveste (8BPP)" + 10002 "Mellem (16BPP)" + 10003 "Højeste (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Søger efter VMware(r) Værktøjs Cdrom..." + IDS_COPYINGFILES "Overfører filer..." + IDS_ENABLINGDRIVER "Aktivere VMware(r) SVGA Driver..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "VMware(r) SVGA driver installations Guide" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Vær venlig at indsættee VMware Værktøjs Cdrom´en." + IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware(r) SVGA driver installations Guide" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Søger efter og overfører VMware(r) SVGA driver." + IDD_CONFIGTITLE "VMware(r) SVGA driver installations Guide" + IDD_CONFIGSUBTITLE "Vælg din favorit Skærmopløsning." + IDD_INSTALLATION_FAILEDTITLE "VMware(r) SVGA driver installations Guide" + IDD_INSTALLATION_FAILEDSUBTITLE "WMware(r) SVGA driver blev ikke installeret." + IDD_CHOOSEACTIONTITLE "VMware(r) SVGA driver installations Guide" + IDD_CHOOSEACTIONSUBTITLE "Vælg hvad du Ønsker at gøre." + IDD_SELECTDRIVERTITLE "VMware (r) SVGA driver installations Guide" + IDD_SELECTDRIVERSUBTITLE "Vælge en driver." + IDD_DOUNINSTALLTITLE "VMware (r) SVGA driver installations Guide" + IDD_DOUNINSTALLSUBTITLE "Afinstallere driveren." +END Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/En.rc (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/En.rc Sat Mar 3 00:26:41 2007 @@ -1,0 +1,131 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS setup detected that you run ReactOS inside of VMware(r).", -1, 100, 8, 160, 24 + LTEXT "If you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS Setup doesn't come with the VMware(r) SVGA driver.\n\nTherefore go to 'VM' in your VMware(r) workstation menu bar and select 'Install VMware tools...'\n\n\nClick 'Next' to continue or 'Cancel' to skip the SVGA driver installation.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The VMware(r) SVGA driver has been successfully installed. Please choose your favorite screen resolution:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Please select your favorite color quality:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS Setup was unable to install the VMware(r) SVGA driver.\n\n\nClick 'Finish' to continue the installation process.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The VMware(r) SVGA driver is already installed.\n\nPlease choose what you like to do:",-1,25,5,225,30 + PUSHBUTTON "Configure the screen settings", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Use a different graphics driver", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Uninstall the VMware(r) SVGA driver", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Click 'Next' to continue or 'Cancel' to exit the wizard.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Please select the graphics driver you would like to use:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA Driver", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE Driver (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Click 'Finish' to complete the operation or 'Cancel' to exit the setup without changes.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS setup is about to uninstall your VMware(r) SVGA driver!!!\n\n\nClick 'Finish' to uninstall the driver or 'Cancel' to leave it as it is.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "VMware(r) detected" + IDS_FAILEDTOLOCATEDRIVERS "The ReactOS Setup couldn't find the required files.\nPlease make sure the VMware(r) tools CD-ROM is inserted." + IDS_FAILEDTOCOPYFILES "The ReactOS Setup failed to copy the required files.\nPlease make sure the VMware(r) tools CD-ROM is inserted.\n" + IDS_FAILEDTOACTIVATEDRIVER "Failed to activate the VMware(r) SVGA driver!" + IDS_FAILEDTOSELVGADRIVER "Failed to activate the ReactOS VGA driver!" + IDS_FAILEDTOSELVBEDRIVER "Failed to activate the ReactOS VBE driver!" + IDS_UNINSTNOTICE "The VMware(r) SVGA driver files have not yet been deleted.\nPlease delete them manually after a system reboot." + IDS_FAILEDTOADDREGENTRIES "Failed to create registry entries for the VMware(r) SVGA driver!" +END + +STRINGTABLE +BEGIN + 10001 "Lowest (8BPP)" + 10002 "Medium (16BPP)" + 10003 "Highest (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Searching for VMware(r) Tools CD-ROM..." + IDS_COPYINGFILES "Copying files..." + IDS_ENABLINGDRIVER "Enabling VMware(r) SVGA driver..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "VMware (r) SVGA driver installation wizard" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Please insert the VMware tool CD-Rom." + IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware (r) SVGA driver installation wizard" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Search and copy the VMware (r) SVGA driver." + IDD_CONFIGTITLE "VMware (r) SVGA driver installation wizard" + IDD_CONFIGSUBTITLE "Select your favorite screen resolution." + IDD_INSTALLATION_FAILEDTITLE "VMware (r) SVGA driver installation wizard" + IDD_INSTALLATION_FAILEDSUBTITLE "The VMware (r) SVGA driver installation failed." + IDD_CHOOSEACTIONTITLE "VMware (r) SVGA driver installation wizard" + IDD_CHOOSEACTIONSUBTITLE "Choose what you like to do." + IDD_SELECTDRIVERTITLE "VMware (r) SVGA driver installation wizard" + IDD_SELECTDRIVERSUBTITLE "Select a driver." + IDD_DOUNINSTALLTITLE "VMware (r) SVGA driver installation wizard" + IDD_DOUNINSTALLSUBTITLE "Uninstall the driver." +END Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Es.rc (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Es.rc Sat Mar 3 00:26:41 2007 @@ -1,0 +1,132 @@ +//encoded=samcharly_at_hotmail_dot_com +//Spanish Language Resource +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalación del Controlador de Video" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "El instalador de ReactOS ha detectado que husted está ejecutando ReactOS sobre el emulador VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Si husted desea instalar el controlador SVGA VMware(r), haga click en 'Siguiente', de lo contrario haga click en 'Cancelar'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalación del Controlador de Video" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "El Instalador de ReactOS no viene con el controlador SVGA VMware(r).\n\nPor lo tanto vaya a 'VM' en la barra de menú de VMware(r) workstation y seleccione 'Install VMware(r) tools...'\n\nhaga click en 'Siguiente' para continuar o en 'Cancelar' para saltar la instalación del controlador SVGA.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalación del Controlador de Video" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalación del Controlador de Video" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "El controlador SVGA VMware(r) ha sido instalado satisfactoriamente.\nPor favor elija su resolución de pantalla favorita:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Por favor seleccione su calidad del color favorita:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalación del Controlador de Video" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "El instalador de ReactOS es incapaz de instalar el controlador SVGA VMware(R).\n\nHaga click en 'Finalizar' para continuar con el proceso de instalación.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalación del Controlador de Video" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "El controlador SVGA VMware(r) está ya instalado.\n\nPor favor, seleccione que desea hacer:",-1,25,5,225,30 + PUSHBUTTON "Configurar las opciones de pantalla", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Usar un controlador gráfico distinto", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Desinstalar el controlador SVGA VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Haga Click en 'Siguiente' para continuar o 'Cancelar' para salir del asistente.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalación del Controlador de Video" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Por favor seleccione el controlador gráfico que desea usar:",-1,25,25,225,15 + PUSHBUTTON "Controlador VGA de ReactOS", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Controlador VBE de ReactOS (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Haga click en 'Finalizar' para completar la operación o 'Cancelar' para salir de la instalación sin cambios.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalación del Controlador de Video" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "El instalador de ReactOS va a proceder a desinstalar su controlador SVGA VMware(r)!!!\n\n\nHaga click en 'Finalizar' para desinstalar el controlador o 'Cancelar' para dejarlo como está.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "VMware(r) detectado" + IDS_FAILEDTOLOCATEDRIVERS "El instalador de ReactOS no puede encontrar los archivos requeridos.\nPor favor asegúrese que el CD-ROM de VMware(r) tools está insertado." + IDS_FAILEDTOCOPYFILES "El instalador de ReactOS falló al copiar los archivos requeridos.\nPor favor asegúrese que el CD-ROM de VMware(r) tools está insertado.\n" + IDS_FAILEDTOACTIVATEDRIVER "Fallo al activar el controlador SVGA VMware(r)!" + IDS_FAILEDTOSELVGADRIVER "Fallo al activar el controlador VGA de ReactOS!" + IDS_FAILEDTOSELVBEDRIVER "Fallo al activar el controlador VBE de ReactOS!" + IDS_UNINSTNOTICE "Los archivos del controlador SVGA VMware(r) aun no han sido eliminados.\nPor favor elimínelos manualmente despues de reiniciar el sistema." +END + +STRINGTABLE +BEGIN + 10001 "Baja (8BPP)" + 10002 "Media (16BPP)" + 10003 "Alta (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Buscando el CD_ROM de VMware(r) Tools..." + IDS_COPYINGFILES "Copiando ficheros..." + IDS_ENABLINGDRIVER "Habilitando el controlador VMware(r) SVGA..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Ayudante de instalación controlador VMware (r) SVGA" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Por favor inserte el CD-Rom de VMware tool." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Ayudante de instalación controlador VMware (r) SVGA" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Busque y copie el controlador de VMware (r) SVGA." + IDD_CONFIGTITLE "Ayudante de instalación controlador VMware (r) SVGA" + IDD_CONFIGSUBTITLE "Seleccione la resolución de su pantalla." + IDD_INSTALLATION_FAILEDTITLE "Ayudante de instalación controlador VMware (r) SVGA" + IDD_INSTALLATION_FAILEDSUBTITLE "El Ayudante de instalación del controlador VMware (r) SVGA a fallado." + IDD_CHOOSEACTIONTITLE "Ayudante de instalación controlador VMware (r) SVGA" + IDD_CHOOSEACTIONSUBTITLE "Escoja lo que quiera hacer." + IDD_SELECTDRIVERTITLE "Ayudante de instalación controlador VMware (r) SVGA" + IDD_SELECTDRIVERSUBTITLE "Seleccione un controlador." + IDD_DOUNINSTALLTITLE "Ayudante de instalación controlador VMware (r) SVGA" + IDD_DOUNINSTALLSUBTITLE "Desinstale el controlador." +END Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Hu.rc (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Hu.rc Sat Mar 3 00:26:41 2007 @@ -1,0 +1,132 @@ +// Hungarian resources by Robert Horvath - talley at cubeclub.hu +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video meghajtó telepítése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "A ReactOS telepítõ felismerte, hogy VMware(r) alól futtatod a ReactOS-t.", -1, 100, 8, 160, 34 + LTEXT "Ha szeretnéd feltelepíteni a VMware(r) SVGA meghajtót, kattints a 'Tovább' gombra, ha nem akkor a 'Mégse' gombra.", -1, 100, 120, 160, 32 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video meghajtó telepítése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "A ReactOS telepítõ nem rendelkezik a VMware(r) SVGA meghajtóval.\n\A VMware(r) VM menüjében válaszd ki a 'Install VMware tools...' menüpontot\n\n\nKattints a 'Tovább' gombra a folytatáshoz, vagy a 'Mégse' gombra, hogy kilépj az SVGA meghajtó telepítésébõl.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video meghajtó telepítése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video meghajtó telepítése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "A VMware(r) SVGA meghajtó sikeresen telepítve lett. Kérlek állítsd be milyen felbontásban szeretnéd használni:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Kérlek állítsd be a színmélységet is:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video meghajtó telepítése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "A ReactOS telepítõ nem tudta telepíteni a VMware(r) SVGA meghajtót.\n\n\nKattints a 'Befejezés' gombra, hogy folytasd a telepítést.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video meghajtó telepítése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "A VMware(r) SVGA meghajtó már telepítve van.\n\nA következõk közül választhatsz:",-1,25,5,225,30 + PUSHBUTTON "Képernyõ beállítások megváltoztatása", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Más meghajtó program telepítése", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "VMware(r) SVGA meghajtó eltávolítása", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Kattints a 'Tovább' gombra a folytatáshoz vagy a 'Mégse' gombra, hogy kilépj a telepítõbõl.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video meghajtó telepítése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Válaszd ki mely meghajtót szeretnéd haszálni:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA meghajtó", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE meghajtó (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Kattints a 'Befejezés' gombra a véglegesítéshez, vagy a 'Mégse' gombra, hogy kilépj.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video meghajtó telepítése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "A ReactOS telepítõ eltávolítja a VMware(r) SVGA meghajtót!!!\n\n\nKattints a 'Befejezés' gombra ennek folytatásához vagy a 'Mégse' gombra, hogy meghagyd.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "VMware(r) felismerve" + IDS_FAILEDTOLOCATEDRIVERS "A ReactOS telepítõ nemtudta megtalálni a szükséges állományokat.\nKérlek vizsgáld meg, hogy bevan-e helyezve a VMware(r) tools CD." + IDS_FAILEDTOCOPYFILES "A ReactOS telepítõ nem tudta átmásolni a szükséges állományokat.\nKérlek vizsgáld meg, hogy bevan-e helyezve a VMware(r) tools CD." + IDS_FAILEDTOACTIVATEDRIVER "Nem sikerült aktiválni a VMware(r) SVGA meghajtót!" + IDS_FAILEDTOSELVGADRIVER "Nem sikerült aktiválni a ReactOS VGA meghajtót!" + IDS_FAILEDTOSELVBEDRIVER "Nem sikerült aktiválni a ReactOS VBE meghajtót!" + IDS_UNINSTNOTICE "A VMware(r) SVGA meghajtó állományai nem lettek törölve.\nKérlek töröld õket újraindítás után." + IDS_FAILEDTOADDREGENTRIES "Nem sikerült a regisztrációs bejegyzések elvégzése a VMware(r) SVGA meghajtó telepítése közben!" +END + +STRINGTABLE +BEGIN + 10001 "Gyenge (8BPP)" + 10002 "Közepes (16BPP)" + 10003 "Kiváló (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "VMware(r) Tools CD keresése..." + IDS_COPYINGFILES "Állományok másolása..." + IDS_ENABLINGDRIVER "VMware(r) SVGA meghajtó akvitálása..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "VMware (r) SVGA meghajtó telepítése" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Kérlek tedd be a VMware tools CD-t." + IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware (r) SVGA meghajtó telepítése" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "VMware (r) SVGA meghajtó keresése és telepítése." + IDD_CONFIGTITLE "VMware (r) SVGA meghajtó telepítése" + IDD_CONFIGSUBTITLE "Válaszd ki a képernyõ felbontását." + IDD_INSTALLATION_FAILEDTITLE "VMware (r) SVGA meghajtó telepítése" + IDD_INSTALLATION_FAILEDSUBTITLE "A VMware (r) SVGA meghajtó telepítése nem sikerült." + IDD_CHOOSEACTIONTITLE "VMware (r) SVGA meghajtó telepítése" + IDD_CHOOSEACTIONSUBTITLE "Válaszd ki mit szeretnél csinálni." + IDD_SELECTDRIVERTITLE "VMware (r) SVGA meghajtó telepítése" + IDD_SELECTDRIVERSUBTITLE "Válassz ki egy meghajtót." + IDD_DOUNINSTALLTITLE "VMware (r) SVGA meghajtó telepítése" + IDD_DOUNINSTALLSUBTITLE "A meghajtó eltávolítása." +END Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ja.rc (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ja.rc Sat Mar 3 00:26:41 2007 @@ -1,0 +1,131 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "rfI hCoÌCXg[" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS ZbgAbvÍ ReactOS ª VMware(R) àÅN®³êÄ¢é±ÆðoµÜµ½B", -1, 100, 8, 160, 24 + LTEXT "VMware(R) SVGA hCoðCXg[·éêÉÍ [Ö] ðACXg[µÈ¢êÉÍ [LZ] ðNbNµÄ¾³¢B", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "rfI hCoÌCXg[" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS ZbgAbvÉÍ VMware(R) SVGA hCoªt®µÄ¢Ü¹ñB\n\nCXg[·éÉÍAVMware(R) [NXe[VÌj[ o[Ì [VM] æè [Install VMware tools...] (VMware Tools CXg[) ðIðµÄ¾³¢B\n\n\n±¯éÉÍ [Ö] ðASVGA hCoÌCXg[ðXLbv·éÉÍ [LZ] ðNbNµÄ¾³¢B",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "rfI hCoÌCXg[" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "rfI hCoÌCXg[" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "VMware(R) SVGA hCoÌCXg[É¬÷µÜµ½Bgpµ½¢æÊðxðIðµÄ¾³¢:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "gpµ½¢FðIðµÄ¾³¢:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "rfI hCoÌCXg[" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS ZbgAbvÍ VMware(R) SVGA hCoðCXg[·é±ÆªÅ«Ü¹ñÅµ½B\n\n\nCXg[ðI¹·éÉÍ [®¹] ðNbNµÄ¾³¢B",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "rfI hCoÌCXg[" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "VMware(R) SVGA hCoÍ·ÅÉCXg[³êÄ¢Ü·B\n\ns¢½¢±ÆðIðµÄ¾³¢:",-1,25,5,225,30 + PUSHBUTTON "æÊÝèðÏX·é", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ÊÌOtBbNX hCoðgp·é", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "VMware(R) SVGA hCoðACXg[·é", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "±¯éÉÍ [Ö] ðAEBU[hðI¹·éÉÍ [LZ] ðNbNµÄ¾³¢B", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "rfI hCoÌCXg[" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "gpµ½¢OtBbNX hCoðIðµÄ¾³¢:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA hCo", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE hCo (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "ð®¹·éÉÍ [®¹] ðA½àÏX¹¸ÉZbgAbvðI¹·éÉÍ [LZ] ðNbNµÄ¾³¢B", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "rfI hCoÌCXg[" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS ZbgAbvÍ VMware(R) SVGA hCoðACXg[µæ¤ÆµÄ¢Ü·!!!\n\n\nhCoðACXg[·éÉÍ [®¹] ðA»ÝÌóÔÌÜÜÉ·éÉÍ [LZ] ðNbNµÄ¾³¢B",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "VMware(R) ªo³êÜµ½" + IDS_FAILEDTOLOCATEDRIVERS "ReactOS ZbgAbvÍKvÈt@Cð©Â¯çêÜ¹ñÅµ½B\nVMware(R) Tools Ì CD-ROM ª}ü³êÄ¢é©mFµÄ¾³¢B" + IDS_FAILEDTOCOPYFILES "ReactOS ZbgAbvÍKvÈt@CÌRs[É¸sµÜµ½B\nVMware(R) Tools Ì CD-ROM ª}ü³êÄ¢é©mFµÄ¾³¢B\n" + IDS_FAILEDTOACTIVATEDRIVER "VMware(R) SVGA hCoðANeBuÉ·éÌÉ¸sµÜµ½!" + IDS_FAILEDTOSELVGADRIVER "ReactOS VGA hCoðANeBuÉ·éÌÉ¸sµÜµ½!" + IDS_FAILEDTOSELVBEDRIVER "ReactOS VBE hCoðANeBuÉ·éÌÉ¸sµÜµ½!" + IDS_UNINSTNOTICE "VMware(R) SVGA hCoÍÜ¾í³êÄ¢Ü¹ñB\nVXeÌÄN®ãAí³êÄ¢È¢t@Cðè®ÅíµÄ¾³¢B" + IDS_FAILEDTOADDREGENTRIES "VMware(R) SVGA hCoðWXgÉo^·éÌÉ¸sµÜµ½!" +END + +STRINGTABLE +BEGIN + 10001 "Åá ( 8 BPP)" + 10002 " (16 BPP)" + 10003 "Å (32 BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "VMware(R) Tools Ì CD-ROM ðTµÄ¢Ü·..." + IDS_COPYINGFILES "t@CðRs[µÄ¢Ü·..." + IDS_ENABLINGDRIVER "VMware(R) SVGA hCoðLøÉµÄ¢Ü·..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "VMware (R) SVGA hCo CXg[ EBU[h" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "VMware tools Ì CD-ROM ð}üµÄ¾³¢B" + IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware (R) SVGA hCo CXg[ EBU[h" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "VMware (R) SVGA hCoÌõÆRs[B" + IDD_CONFIGTITLE "VMware (R) SVGA hCo CXg[ EBU[h" + IDD_CONFIGSUBTITLE "gpµ½¢æÊðxðIðµÄ¾³¢B" + IDD_INSTALLATION_FAILEDTITLE "VMware (R) SVGA hCo CXg[ EBU[h" + IDD_INSTALLATION_FAILEDSUBTITLE "VMware (R) SVGA hCoÌCXg[Í¸sµÜµ½B" + IDD_CHOOSEACTIONTITLE "VMware (R) SVGA hCo CXg[ EBU[h" + IDD_CHOOSEACTIONSUBTITLE "s¢½¢±ÆðIðµÄ¾³¢B" + IDD_SELECTDRIVERTITLE "VMware (R) SVGA hCo CXg[ EBU[h" + IDD_SELECTDRIVERSUBTITLE "hCoÌIðB" + IDD_DOUNINSTALLTITLE "VMware (R) SVGA hCo CXg[ EBU[h" + IDD_DOUNINSTALLSUBTITLE "hCoðACXg[µÜ·B" +END Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ru.rc (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Ru.rc Sat Mar 3 00:26:41 2007 @@ -1,0 +1,131 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà âèäåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàììà óñòàíîâêè îáíàðóæèëà, ÷òî ReactOS ðàáîòàåò ïîä óïðàâëåíèåì âèðòóàëüíîé ìàøèíû VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Äëÿ óñòàíîâêè SVGA-äðàéâåðà VMware(r) íàæìèòå êíîïêó ""Äàëåå"", èíà÷å íàæìèòå ""Îòìåíà"".", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà âèäåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàììà óñòàíîâêè ReactOS íå âêëþ÷àåò â ñåáÿ SVGA-äðàéâåð VMware(r).\n\nÑëåäóéòå â ìåíþ 'VM' ïðîãðàììû VMware(r) Workstation è âûáåðèòå 'Install VMware tools...'\n\n\nÄëÿ ïðîäîëæåíèÿ íàæìèòå êíîïêó ""Äàëåå"", èëè ""Îòìåíà"", ÷òîáû ïðîïóñòèòü óñòàíîâêó SVGA-äðàéâåðà.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà âèäåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà âèäåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Óñòàíîâêà SVGA-äðàéâåðà VMware(r) çàâåðøåíà óñïåøíî. Âûáåðèòå ïðåäïî÷òèòåëüíîå ðàçðåøåíèå ýêðàíà:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Âûáåðèòå êà÷åñòâî ïåðåäà÷è öâåòà:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà âèäåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàììà óñòàíîâêè ReactOS íå ñìîãëà óñòàíîâèòü SVGA-äðàéâåð VMware(r).\n\n\nÍàæìèòå êíîïêó ""Çàâåðøèòü"" äëÿ ïðîäîëæåíèÿ ïðîöåññà óñòàíîâêè.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà âèäåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "SVGA-äðàéâåð VMware(r) óæå óñòàíîâëåí.\n\nÂûáåðèòå äàëüíåéøåå äåéñòâèå:",-1,25,5,225,30 + PUSHBUTTON "Íàñòðîèòü ïàðàìåòðû ýêðàíà", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Óñòàíîâèòü äðóãîé ãðàôè÷åñêèé äðàéâåð", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Óäàëèòü SVGA-äðàéâåð VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Íàæìèòå êíîïêó ""Äàëåå"" äëÿ ïðîäîëæåíèÿ èëè ""Îòìåíà"" äëÿ âûõîäà èç ìàñòåðà óñòàíîâêè.", -1, 25, 93, 225, 20 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà âèäåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Âûáåðèòå ãðàôè÷åñêèé äðàéâåð, êîòîðûé Âû õîòåëè áû èñïîëüçîâàòü:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA äðàéâåð", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE äðàéâåð (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Íàæìèòå êíîïêó ""Çàâåðøèòü"" äëÿ âûïîëíåíèÿ îïåðàöèè èëè ""Îòìåíà"" äëÿ âûõîäà èç ïðîãðàììû óñòàíîâêè áåç ñîõðàíåíèÿ èçìåíåíèé.", -1, 25, 93, 225, 30 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà âèäåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàììà óñòàíîâêè ÎÑ ReactOS ãîòîâà ïðîèçâåñòè óäàëåíèå SVGA-äðàéâåðà VMWare(r)!\n\n\nÍàæìèòå êíîïêó ""Çàâåðøèòü"" äëÿ óäàëåíèÿ äðàéâåðà èëè ""Îòìåíà"" ÷òîáû îñòàâèòü äðàéâåð.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Îáíàðóæåí VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "Ïðîãðàììà óñòàíîâêè ReactOS íå ñìîãëà íàéòè íåîáõîäèìûå ôàéëû.\nÓáåäèòåñü, ÷òî VMware(r) tools CD-ROM âñòàâëåí â ïðèâîä." + IDS_FAILEDTOCOPYFILES "Ïðîãðàììà óñòàíîâêè ReactOS íå ñìîãëà ñêîïèðîâàòü íåîáõîäèìûå ôàéëû.\nÓáåäèòåñü, ÷òî VMware(r) tools CD-ROM âñòàâëåí â ïðèâîä.\n" + IDS_FAILEDTOACTIVATEDRIVER "Íå óäàëîñü çàïóñòèòü SVGA-äðàéâåð VMware(r)!" + IDS_FAILEDTOSELVGADRIVER "Íå óäàëîñü çàïóñòèòü ReactOS VGA äðàéâåð!" + IDS_FAILEDTOSELVBEDRIVER "Íå óäàëîñü çàïóñòèòü ReactOS VBE äðàéâåð!" + IDS_UNINSTNOTICE "Ôàéëû SVGA-äðàéâåðà VMware(r) íå áûëè óäàëåíû.\nÓäàëèòå èõ ñàìîñòîÿòåëüíî ïîñëå ïåðåçàãðóçêè ñèñòåìû." + IDS_FAILEDTOADDREGENTRIES "Íå óäàëîñü ñîçäàòü çàïèñè â ðååñòðå äëÿ SVGA-äðàéâåðà VMware(r)!" +END + +STRINGTABLE +BEGIN + 10001 "Íèçêîå (8BPP)" + 10002 "Ñðåäíåå (16BPP)" + 10003 "Ñàìîå âûñîêîå (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Ïîèñê êîìïàêò-äèñêà VMware(r) Tools..." + IDS_COPYINGFILES "Êîïèðîâàíèå ôàéëîâ..." + IDS_ENABLINGDRIVER "Çàïóñê SVGA-äðàéâåðà VMware(r)..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Ìàñòåð óñòàíîâêè SVGA-äðàéâåðà VMware (r)" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Âñòàâüòå äèñê VMware tools." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Ìàñòåð óñòàíîâêè SVGA-äðàéâåðà VMware (r)" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Ïîèñê è êîïèðîâàíèå SVGA-äðàéâåðà VMware (r)." + IDD_CONFIGTITLE "Ìàñòåð óñòàíîâêè SVGA-äðàéâåðà VMware (r)" + IDD_CONFIGSUBTITLE "Âûáåðèòå ïðåäïî÷èòàåìîå ðàçðåøåíèå ýêðàíà." + IDD_INSTALLATION_FAILEDTITLE "Ìàñòåð óñòàíîâêè SVGA-äðàéâåðà VMware (r)" + IDD_INSTALLATION_FAILEDSUBTITLE "Óñòàíîâêà SVGA-äðàéâåðà VMware (r) íå óäàëàñü." + IDD_CHOOSEACTIONTITLE "Ìàñòåð óñòàíîâêè SVGA-äðàéâåðà VMware (r)" + IDD_CHOOSEACTIONSUBTITLE "Âûáåðèòå äåéñòâèå." + IDD_SELECTDRIVERTITLE "Ìàñòåð óñòàíîâêè SVGA-äðàéâåðà VMware (r)" + IDD_SELECTDRIVERSUBTITLE "Âûáåðèòå äðàéâåð." + IDD_DOUNINSTALLTITLE "Ìàñòåð óñòàíîâêè SVGA-äðàéâåðà VMware (r)" + IDD_DOUNINSTALLSUBTITLE "Óäàëåíèå äðàéâåðà." +END Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Uk.rc (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/Uk.rc Sat Mar 3 00:26:41 2007 @@ -1,0 +1,139 @@ +/* + * PROJECT: ReactOS VMware(r) driver installation utility + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/setup/vmwinst/Uk.rc + * PURPOSE: Ukraianian Language File for vmwinst + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 100, 8, 160, 24 + LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü 'Äàë³', ³íàêøå íàòèñí³òü 'Ñêàñóâàòè'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå âêëþ÷àº SVGA äðàéâåð VMware(r).\n\nÒîìó éä³òü äî ìåíþ 'VM' ó VMware(r) workstation ³ âèáåð³òü 'Install VMware tools...'\n\n\nÍàòèñí³òü 'Äàë³' äëÿ ïðîäîâæåííÿ àáî 'Ñêàñóâàòè', ùîá ïðîïóñòèòè óñòàíîâêó SVGA äðàéâåðà.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Óñòàíîâêó SVGA äðàéâåðà VMware(r) çàâåðøåíî óñï³øíî. Îáåð³òü ïåðåâàæíó ðîçä³ëüíó çäàòí³ñòü åêðàíó:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Áóäü ëàñêà îáåð³òü ÿê³ñòü ïåðåäà÷³ êîëüîðó:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà âñòàíîâèòè SVGA äðàéâåð VMware(r).\n\n\nÍàòèñí³òü 'Çàâåðøèòè' äëÿ ïðîäîâæåííÿ ïðîöåñó óñòàíîâêè.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "SVGA äðàéâåð VMware(r) SVGA âæå âñòàíîâëåíèé.\n\nÎáåð³òü, ùî Âè õî÷åòå çðîáèòè:",-1,25,5,225,30 + PUSHBUTTON "Íàëàøòóâàòè ïàðàìåòðè åêðàíó", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Ñêîðèñòàòèñÿ ³íøèì ãðàô³÷íèì äðàéâåðîì", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Âèäàëèòè SVGA äðàéâåð VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Íàòèñí³òü 'Äàë³' äëÿ ïðîäîâæåííÿ àáî 'Ñêàñóâàòè' äëÿ âèõîäó ç ìàéñòðà.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Áóäü ëàñêà îáåð³òü ãðàô³÷íèé äðàéâåð, ÿêèé Âè õîò³ëè á âèêîðèñòîâóâàòè:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA äðàéâåð", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE äðàéâåð (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Íàòèñí³òü 'Çàâåðøèòè' äëÿ çàâåðøåííÿ îïåðàö³¿ àáî 'Ñêàñóâàòè' äëÿ âèõîäó ç ïðîãðàìè óñòàíîâêè áåç çáåðåæåííÿ çì³í.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS ãîòîâà âèäàëèòè SVGA äðàéâåð VMWare(r)!!!\n\n\nÍàòèñí³òü 'Çàâåðøèòè' äëÿ âèäàëåííÿ äðàéâåðà àáî 'Ñêàñóâàòè' ùîá çàëèøèòè éîãî ÿê º.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Âèÿâëåíèé VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà çíàéòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé." + IDS_FAILEDTOCOPYFILES "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà ñêîï³þâàòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé.\n" + IDS_FAILEDTOACTIVATEDRIVER "Íå âäàëîñÿ çàïóñòèòè SVGA äðàéâåð VMware(r)!" + IDS_FAILEDTOSELVGADRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VGA äðàéâåð!" + IDS_FAILEDTOSELVBEDRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VBE äðàéâåð!" + IDS_UNINSTNOTICE "Ôàéëè SVGA äðàéâåðà VMware(r) ùå íå áóëè âèäàëåí³.\nÁóäü ëàñêà âèäàë³òü ¿õ âðó÷íó ï³ñëÿ ïåðåçàâàíòàæåííÿ ñèñòåìè." + IDS_FAILEDTOADDREGENTRIES "Íå âäàëîñÿ ñòâîðèòè çàïèñè â ðåºñòð³ äëÿ SVGA äðàéâåðà VMware(r)!" +END + +STRINGTABLE +BEGIN + 10001 "Íèçüêà (8BPP)" + 10002 "Ñåðåäíÿ (16BPP)" + 10003 "Íàéâèùà (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Ïîøóê êîìïàêò-äèñêà VMware(r) Tools..." + IDS_COPYINGFILES "Êîï³þâàííÿ ôàéë³â..." + IDS_ENABLINGDRIVER "Çàïóñê SVGA äðàéâåðà VMware(r)..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Áóäü ëàñêà âñòàâòå äèñê VMware tools." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Ïîøóê ³ êîï³þâàííÿ SVGA äðàéâåðà VMware (r)." + IDD_CONFIGTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_CONFIGSUBTITLE "Îáåð³òü Âàøó óëþáëåíó ðîçä³ëüíó çäàòí³ñòü åêðàíó." + IDD_INSTALLATION_FAILEDTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSTALLATION_FAILEDSUBTITLE "Óñòàíîâêà SVGA äðàéâåðà VMware (r) íå âäàëàñÿ." + IDD_CHOOSEACTIONTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_CHOOSEACTIONSUBTITLE "Âèáåð³òü, ùî Âè õî÷åòå çðîáèòè." + IDD_SELECTDRIVERTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_SELECTDRIVERSUBTITLE "Îáðàòè äðàéâåð." + IDD_DOUNINSTALLTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_DOUNINSTALLSUBTITLE "Âèäàëèòè äðàéâåð." +END Removed: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/rsrc.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/rsrc.rc (removed) @@ -1,26 +1,0 @@ -#include <windows.h> -#include "vmwinst.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" - -/* Bitmaps */ -IDB_WATERMARK BITMAP "resources/watermark.bmp" -IDB_HEADER BITMAP "resources/header.bmp" - -/* - * Everything specific to any language goes in one of the specific - * files. Note that you can and may override resources which also have - * a neutral version. This is to get localized bitmaps for example. - */ -#include "lang/cs-CZ.rc" -#include "lang/en-US.rc" -#include "lang/de-DE.rc" -#include "lang/da-DK.rc" -#include "lang/es-ES.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/hu-HU.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" Added: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmware.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmware.inf (added) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmware.inf Sat Mar 3 00:26:41 2007 @@ -1,0 +1,32 @@ +[version] +signature="$CHICAGO$" + +[DefaultInstall] +AddReg=VMXReg + +[VMXReg] +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Group",0x00000000,"Video" +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","ImagePath",0x00020000,"system32\drivers\vmx_svga.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","InstalledDisplayDrivers",0x00010000,"vmx_fb" +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.0",0x00000001,36,34,30,78,34,38,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.1",0x00000001,38,30,30,78,36,30,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.2",0x00000001,31,30,32,34,78,37,36,38,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.3",0x00000001,31,31,35,32,78,38,36,34,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.4",0x00000001,31,32,38,30,78,39,36,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.5",0x00000001,31,32,38,30,78,31,30,32,34,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.6",0x00000001,31,34,30,30,78,31,30,35,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.7",0x00000001,31,36,30,30,78,31,32,30,30,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.8",0x00000001,31,37,39,32,78,31,33,34,34,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.9",0x00000001,31,38,35,36,78,31,33,39,32,00 +HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.10",0x00000001,31,39,32,30,78,31,34,34,30,00 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.Flags",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.VRefresh",0x00010001,85 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.XPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.YPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.BitsPerPel",0x00010001,16 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.XResolution",0x00010001,800 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","DefaultSettings.YResolution",0x00010001,600 +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_15AD&DEV_0405&SUBSYS_040515AD&REV_00\1&f103bba4&0F","Service",0x00000000,"vmx_svga" Modified: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.c (original) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.c Sat Mar 3 00:26:41 2007 @@ -18,7 +18,8 @@ * * VMware is a registered trademark of VMware, Inc. */ -/* +/* $Id$ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VMware(r) driver installation utility * FILE: subsys/system/vmwinst/vmwinst.c @@ -27,11 +28,9 @@ */ #include <windows.h> #include <commctrl.h> -#include <newdev.h> #include <stdio.h> #include <string.h> #include "vmwinst.h" -#include <debug.h> extern VOID CALLBACK InstallHinfSectionW(HWND hwnd, HINSTANCE ModuleHandle, PCWSTR CmdLineBuffer, INT nCmdShow); @@ -96,8 +95,27 @@ return FALSE; } +BOOL +ProcessMessage(void) +{ + MSG msg; + if(PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + return TRUE; + } + return FALSE; +} + +void +ProcessMessages(void) +{ + while(ProcessMessage()); +} + /* try to open the file */ -static BOOL +BOOL FileExists(WCHAR *Path, WCHAR *File) { WCHAR FileName[MAX_PATH + 1]; @@ -149,8 +167,54 @@ } +/* Copy file */ +BOOL +InstallFile(WCHAR *Destination, WCHAR *File) +{ + static char Buffer[1024]; + WCHAR SourceFileName[MAX_PATH + 1]; + WCHAR DestFileName[MAX_PATH + 1]; + HANDLE SourceFileHandle, DestFileHandle; + DWORD DataRead, DataWritten; + + SourceFileName[0] = L'\0'; + DestFileName[0] = L'\0'; + wcscat(SourceFileName, SrcPath); + wcscat(SourceFileName, File); + wcscat(DestFileName, Destination); + wcscat(DestFileName, File); + + SourceFileHandle = CreateFile(SourceFileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(SourceFileHandle == INVALID_HANDLE_VALUE) + { + return FALSE; + } + DestFileHandle = CreateFile(DestFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if(DestFileHandle == INVALID_HANDLE_VALUE) + { + CloseHandle(SourceFileHandle); + return FALSE; + } + + while(ReadFile(SourceFileHandle, Buffer, sizeof(Buffer), &DataRead, NULL) && DataRead > 0) + { + if(!WriteFile(DestFileHandle, Buffer, DataRead, &DataWritten, NULL) || + DataRead != DataWritten) + { + CloseHandle(SourceFileHandle); + CloseHandle(DestFileHandle); + DeleteFile(DestFileName); + return FALSE; + } + } + + CloseHandle(SourceFileHandle); + CloseHandle(DestFileHandle); + return TRUE; +} + /* Find the drive with the inserted VMware cd-rom */ -static BOOL +BOOL IsVMwareCDInDrive(WCHAR *Drv) { static WCHAR Drive[4] = L"X:\\"; @@ -194,14 +258,14 @@ return FALSE; } -static BOOL +BOOL LoadResolutionSettings(DWORD *ResX, DWORD *ResY, DWORD *ColDepth) { HKEY hReg; DWORD Type, Size; if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", + L"SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\vmx_svga\\Device0", 0, KEY_QUERY_VALUE, &hReg) != ERROR_SUCCESS) { return FALSE; @@ -209,26 +273,29 @@ if(RegQueryValueEx(hReg, L"DefaultSettings.BitsPerPel", 0, &Type, (BYTE*)ColDepth, &Size) != ERROR_SUCCESS || Type != REG_DWORD) { - *ColDepth = 8; + RegCloseKey(hReg); + return FALSE; } if(RegQueryValueEx(hReg, L"DefaultSettings.XResolution", 0, &Type, (BYTE*)ResX, &Size) != ERROR_SUCCESS || Type != REG_DWORD) { - *ResX = 640; + RegCloseKey(hReg); + return FALSE; } if(RegQueryValueEx(hReg, L"DefaultSettings.YResolution", 0, &Type, (BYTE*)ResY, &Size) != ERROR_SUCCESS || Type != REG_DWORD) { - *ResY = 480; + RegCloseKey(hReg); + return FALSE; } RegCloseKey(hReg); return TRUE; } -static BOOL +BOOL IsVmwSVGAEnabled(VOID) { HKEY hReg; @@ -253,13 +320,13 @@ -static BOOL +BOOL SaveResolutionSettings(DWORD ResX, DWORD ResY, DWORD ColDepth) { HKEY hReg; if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", + L"SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\vmx_svga\\Device0", 0, KEY_SET_VALUE, &hReg) != ERROR_SUCCESS) { return FALSE; @@ -286,7 +353,7 @@ return TRUE; } -static BOOL +BOOL EnableDriver(WCHAR *Key, BOOL Enable) { DWORD Value; @@ -309,7 +376,7 @@ } /* Activate the vmware driver and deactivate the others */ -static BOOL +BOOL EnableVmwareDriver(BOOL VBE, BOOL VGA, BOOL VMX) { if(!EnableDriver(L"SYSTEM\\CurrentControlSet\\Services\\VBE", VBE)) @@ -328,11 +395,94 @@ return TRUE; } +/* Make sure the required registry entries are present */ +BOOL +AddVmwareRegistryEntries() +{ + HRSRC VmwareInfResource; + HGLOBAL VmwareInfMem; + PVOID VmwareInfLocked; + DWORD Size; + WCHAR TempPath[MAX_PATH]; + WCHAR BufferSize; + WCHAR TempFileName[MAX_PATH]; + HANDLE TempFile; + DWORD Written; + WCHAR CmdLine[19 + MAX_PATH]; + + VmwareInfResource = FindResourceW(hAppInstance, + MAKEINTRESOURCE(IDR_VMWARE_INF), + L"RT_INF"); + if (NULL == VmwareInfResource) + { + return FALSE; + } + Size = SizeofResource(hAppInstance, VmwareInfResource); + if (0 == Size) + { + return FALSE; + } + VmwareInfMem = LoadResource(hAppInstance, VmwareInfResource); + if (NULL == VmwareInfMem) + { + return FALSE; + } + VmwareInfLocked = LockResource(VmwareInfMem); + if (NULL == VmwareInfLocked) + { + return FALSE; + } + + BufferSize = GetTempPathW(sizeof(TempPath) / sizeof(TempPath[0]), TempPath); + if (0 == BufferSize || sizeof(TempPath) / sizeof(TempPath[0]) < BufferSize) + { + return FALSE; + } + if (0 == GetTempFileNameW(TempPath, L"vmx", 0, TempFileName)) + { + return FALSE; + } + + TempFile = CreateFileW(TempFileName, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + if (INVALID_HANDLE_VALUE == TempFile) + { + DeleteFile(TempFileName); + return FALSE; + } + if (! WriteFile(TempFile, VmwareInfLocked, Size, &Written, NULL) || + Written != Size) + { + CloseHandle(TempFile); + DeleteFile(TempFileName); + return FALSE; + } + CloseHandle(TempFile); + + wcscpy(CmdLine, L"DefaultInstall 128 "); + wcscat(CmdLine, TempFileName); + InstallHinfSectionW(NULL, NULL, CmdLine, 0); + + DeleteFile(TempFileName); + + return TRUE; +} + /* GUI */ +void +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DWORD Flags, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT | Flags; + psp->hInstance = hAppInstance; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageWelcomeProc( HWND hwndDlg, UINT uMsg, @@ -362,6 +512,23 @@ { if(DriverFilesFound) { + if(!AddVmwareRegistryEntries()) + { + WCHAR Msg[1024]; + LoadString(hAppInstance, IDS_FAILEDTOADDREGENTRIES, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); + return TRUE; + } + if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) + { + + WCHAR Msg[1024]; + LoadString(hAppInstance, IDS_FAILEDTOACTIVATEDRIVER, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); + return TRUE; + } SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CONFIG); return TRUE; } @@ -375,7 +542,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageInsertDiscProc( HWND hwndDlg, UINT uMsg, @@ -403,7 +570,7 @@ return FALSE; } -static VOID +VOID InstTerminateInstaller(BOOL Wait) { if(hInstallationThread != NULL) @@ -420,11 +587,10 @@ } } -static DWORD STDCALL +DWORD STDCALL InstInstallationThread(LPVOID lpParameter) { HANDLE hThread; - WCHAR InfFileName[1024]; BOOL DriveAvailable; int DrivesTested = 0; @@ -447,22 +613,47 @@ if(AbortInstall != 0) goto done; PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_COPYINGFILES, 0); - wcscpy(InfFileName, SrcPath); - wcscat(InfFileName, L"vmx_svga.inf"); - DPRINT1("Calling UpdateDriverForPlugAndPlayDevices()\n"); - if (!UpdateDriverForPlugAndPlayDevices( - hInstallationNotifyWnd, - L"PCI\\VEN_15AD&DEV_0405&SUBSYS_040515AD&REV_00", - InfFileName, - 0, - NULL)) - { - AbortInstall = 1; - } - else - { - AbortInstall = 0; - } + if(AbortInstall != 0) goto done; + if(!InstallFile(DestinationPath, vmx_fb)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOCOPYFILES, 0); + goto cleanup; + } + + Sleep(250); + + if(AbortInstall != 0) goto done; + if(!InstallFile(DestinationPath, vmx_mode)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOCOPYFILES, 0); + goto cleanup; + } + + Sleep(250); + + if(AbortInstall != 0) goto done; + if(!InstallFile(DestinationDriversPath, vmx_svga)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOCOPYFILES, 0); + goto cleanup; + } + + Sleep(250); + + if(AbortInstall != 0) goto done; + PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_ENABLINGDRIVER, 0); + if(!AddVmwareRegistryEntries()) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOADDREGENTRIES, 0); + goto cleanup; + } + if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOACTIVATEDRIVER, 0); + goto cleanup; + } + + Sleep(500); done: switch(AbortInstall) @@ -484,7 +675,7 @@ return 0; } -static BOOL +BOOL InstStartInstallationThread(HWND hwndNotify) { if(hInstallationThread == NULL) @@ -511,7 +702,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageInstallingProc( HWND hwndDlg, UINT uMsg, @@ -580,7 +771,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageInstallFailedProc( HWND hwndDlg, UINT uMsg, @@ -605,7 +796,7 @@ return FALSE; } -static void +void FillComboBox(HWND Dlg, int idComboBox, int From, int To) { int i; @@ -628,7 +819,7 @@ } MAPCTLRES; /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageConfigProc( HWND hwndDlg, UINT uMsg, @@ -747,7 +938,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageChooseActionProc( HWND hwndDlg, UINT uMsg, @@ -799,7 +990,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageSelectDriverProc( HWND hwndDlg, UINT uMsg, @@ -861,7 +1052,7 @@ return FALSE; } -static VOID +VOID ShowUninstNotice(HWND Owner) { WCHAR Msg[1024]; @@ -869,7 +1060,7 @@ MessageBox(Owner, Msg, NULL, MB_ICONINFORMATION); } -static INT_PTR CALLBACK +INT_PTR CALLBACK PageDoUninstallProc( HWND hwndDlg, UINT uMsg, Modified: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.h (original) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.h Sat Mar 3 00:26:41 2007 @@ -68,4 +68,6 @@ #define IDD_DOUNINSTALLTITLE 361 #define IDD_DOUNINSTALLSUBTITLE 362 +#define IDR_VMWARE_INF 400 + #endif /* __VMWINST_H */ Modified: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.rbuild Sat Mar 3 00:26:41 2007 @@ -8,11 +8,9 @@ <library>advapi32</library> <library>comctl32</library> <library>comdlg32</library> - <library>newdev</library> <library>user32</library> <library>setupapi</library> <library>shell32</library> - <library>ntdll</library> <file>vmwinst.c</file> <file>vmwinst.rc</file> </module> Modified: branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/setup/vmwinst/vmwinst.rc Sat Mar 3 00:26:41 2007 @@ -1,3 +1,5 @@ +/* $Id$ */ + #include <windows.h> #include "vmwinst.h" @@ -6,4 +8,29 @@ #define REACTOS_STR_ORIGINAL_FILENAME "vmwinst.exe\0" #include <reactos/version.rc> -#include "rsrc.rc" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +1 24 DISCARDABLE "manifest.xml" + +/* Bitmaps */ +IDB_WATERMARK BITMAP "resources/watermark.bmp" +IDB_HEADER BITMAP "resources/header.bmp" + +/* The vmware.inf file */ +IDR_VMWARE_INF RT_INF "vmware.inf" + + +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ +#include "Cz.rc" +#include "En.rc" +#include "De.rc" +#include "Dk.rc" +#include "Es.rc" +#include "Ja.rc" +#include "Hu.rc" +#include "Ru.rc" +#include "Uk.rc"

1 0

[fireball] 25962: Merge 25961
by fireball＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: fireball Date: Sat Mar 3 00:13:04 2007 New Revision: 25962 URL: http://svn.reactos.org/svn/reactos?rev=25962&view=rev Log: Merge 25961 Modified: branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/message.c Modified: branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/message.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/message.c Sat Mar 3 00:13:04 2007 @@ -1143,7 +1143,7 @@ if (WndProc == NULL) { - DPRINT1("IntCallWindowsProcW() called with WndProc = NULL!\n"); + DPRINT("IntCallWindowsProcW() called with WndProc = NULL!\n"); return FALSE; }

1 0

[fireball] 25961: Don't spam debug log with that message, it seems it's normal.
by fireball＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: fireball Date: Sat Mar 3 00:11:16 2007 New Revision: 25961 URL: http://svn.reactos.org/svn/reactos?rev=25961&view=rev Log: Don't spam debug log with that message, it seems it's normal. Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Sat Mar 3 00:11:16 2007 @@ -1143,7 +1143,7 @@ if (WndProc == NULL) { - DPRINT1("IntCallWindowsProcW() called with WndProc = NULL!\n"); + DPRINT("IntCallWindowsProcW() called with WndProc = NULL!\n"); return FALSE; }

1 0

[cwittich] 25960: some configuration changes for debug builds
by cwittich＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: cwittich Date: Sat Mar 3 00:04:41 2007 New Revision: 25960 URL: http://svn.reactos.org/svn/reactos?rev=25960&view=rev Log: some configuration changes for debug builds Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Mar 3 00:04:41 2007 @@ -353,11 +353,11 @@ } fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"%s\"\r\n", "warning.h"); - fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); - fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ? "3" : "0") ); + fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "TRUE" : "FALSE" ); + fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"0\"\r\n" ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 1 : 5 ); // 1=/MTd 5=/MT - fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", sys ? "FALSE" : (debug ? "TRUE" : "FALSE" )); - fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); + fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"FALSE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"FALSE\"\r\n" ); if ( module.pch != NULL ) {

1 0

[cwittich] 25959: fix the msvc backend on linux hosts
by cwittich＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: cwittich Date: Fri Mar 2 23:53:41 2007 New Revision: 25959 URL: http://svn.reactos.org/svn/reactos?rev=25959&view=rev Log: fix the msvc backend on linux hosts Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.h trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Fri Mar 2 23:53:41 2007 @@ -224,7 +224,7 @@ std::string MSVCBackend::OptFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.opt" ) ); } @@ -232,7 +232,7 @@ std::string MSVCBackend::SuoFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.suo" ) ); } @@ -240,7 +240,7 @@ std::string MSVCBackend::DswFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_auto.dsw" ) ); } @@ -248,7 +248,7 @@ std::string MSVCBackend::SlnFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.sln" ) ); } @@ -256,7 +256,7 @@ std::string MSVCBackend::NcbFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.ncb" ) ); } @@ -264,7 +264,7 @@ std::string MSVCBackend::DspFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_auto.dsp" ) ); } @@ -272,7 +272,7 @@ std::string MSVCBackend::VcprojFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.vcproj" ) ); } @@ -297,13 +297,13 @@ string basepath = module.GetBasePath (); string vcdir = _get_vc_dir (); size_t i; - string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\"; - string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\"; + string intenv = Environment::GetIntermediatePath () + DEF_SSEP + basepath + DEF_SSEP; + string outenv = Environment::GetOutputPath () + DEF_SSEP + basepath + DEF_SSEP; if ( configuration.UseVSVersionInPath ) { - intenv += vcdir + "\\"; - outenv += vcdir + "\\"; + intenv += vcdir + DEF_SSEP; + outenv += vcdir + DEF_SSEP; } string dbg = vcdir.substr ( 0, 3 ); @@ -336,7 +336,7 @@ for ( i = 0; i < files.size (); i++ ) { string file = files[i]->name; - string::size_type pos = file.find_last_of ("\\"); + string::size_type pos = file.find_last_of (DEF_SSEP); if ( pos != string::npos ) file.erase ( 0, pos+1 ); if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) @@ -379,7 +379,7 @@ { file.insert (pos, "_msvc"); } - modulename += "\\" + file; + modulename += DEF_SSEP + file; out.push_back (modulename); } } @@ -460,8 +460,8 @@ if ( module.installBase == "" || module.installName == "" ) continue; - string inputname = Environment::GetOutputPath () + "\\" + module.GetBasePath () + "\\" + vcdir + "\\" + config + "\\" + module.GetTargetName (); - string installdir = Environment::GetInstallPath () + "\\" + module.installBase + "\\" + module.installName; + string inputname = Environment::GetOutputPath () + DEF_SSEP + module.GetBasePath () + DEF_SSEP + vcdir + DEF_SSEP + config + DEF_SSEP + module.GetTargetName (); + string installdir = Environment::GetInstallPath () + DEF_SSEP + module.installBase + DEF_SSEP + module.installName; if ( _copy_file( inputname, installdir ) ) printf ("Installed File :'%s'\n",installdir.c_str () ); } Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h Fri Mar 2 23:53:41 2007 @@ -112,7 +112,7 @@ // functions in vcprojmaker.cpp: - std::string _get_solution_verion ( void ); + std::string _get_solution_version ( void ); std::string _gen_guid(); std::string _replace_str( std::string string1, Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Mar 2 23:53:41 2007 @@ -116,7 +116,7 @@ if ( configuration.UseVSVersionInPath ) { - vcdir = "\\" + _get_vc_dir(); + vcdir = DEF_SSEP + _get_vc_dir(); } // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? @@ -758,7 +758,7 @@ } std::string -MSVCBackend::_get_solution_verion ( void ) +MSVCBackend::_get_solution_version ( void ) { string version; @@ -780,7 +780,7 @@ void MSVCBackend::_generate_sln_header ( FILE* OUT ) { - fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_verion().c_str() ); + fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_version().c_str() ); fprintf ( OUT, "# Visual Studio 2005\r\n" ); fprintf ( OUT, "\r\n" ); }

1 0

[ion] 25958: -Fix build
by ion＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: ion Date: Fri Mar 2 23:40:48 2007 New Revision: 25958 URL: http://svn.reactos.org/svn/reactos?rev=25958&view=rev Log: -Fix build Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Fri Mar 2 23:40:48 2007 @@ -160,8 +160,8 @@ // TLS Slots // #define TLS_MINIMUM_AVAILABLE 64 +#endif #define TLS_EXPANSION_SLOTS 1024 -#endif // // Job Access Types

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs