Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 43382: - Fix a critical bug in KeFindConfigurationEntry; it passed NULL to KeFindConfigurationNextEntry instead of passing a pointer containing NULL. KeFindConfigurationNextEntry dereferenced this and, because the old bootloader maps NULL, read some bogus value. KeFindConfigurationNextEntry would then try to find something in the configuration tree that matched this, but failed. This was no problem because we currently have no callers of those routines in ReactOS. However, the kdcom.
by sginsberg＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: sginsberg Date: Sun Oct 11 23:57:52 2009 New Revision: 43382 URL: http://svn.reactos.org/svn/reactos?rev=43382&view=rev Log: - Fix a critical bug in KeFindConfigurationEntry; it passed NULL to KeFindConfigurationNextEntry instead of passing a pointer containing NULL. KeFindConfigurationNextEntry dereferenced this and, because the old bootloader maps NULL, read some bogus value. KeFindConfigurationNextEntry would then try to find something in the configuration tree that matched this, but failed. This was no problem because we currently have no callers of those routines in ReactOS. However, the kdcom.dll from Windows 2003 calls KeFindConfigurationEntry to find COM port entries, and this would have crashed if FreeLdr hadn't mapped it. As it is, it didn't, and kdcom fell back to default values for the COM port (which worked). WinLdr doesn't map NULL and this resulted in a crash during kdcom initialization. Bug introduced in revision 15911 over 4 years ago. KD64 now works when booting with the new boot method. Modified: trunk/reactos/ntoskrnl/ke/config.c Modified: trunk/reactos/ntoskrnl/ke/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/config.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] Sun Oct 11 23:57:52 2009 @@ -24,12 +24,14 @@ IN CONFIGURATION_TYPE Type, IN PULONG ComponentKey OPTIONAL) { + PCONFIGURATION_COMPONENT_DATA NextLink = NULL; + /* Start Search at Root */ return KeFindConfigurationNextEntry(Child, Class, Type, ComponentKey, - NULL); + &NextLink); } /*

1 0

[sginsberg] 43381: - Woooops, fix MP hal build.
by sginsberg＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: sginsberg Date: Sun Oct 11 22:40:19 2009 New Revision: 43381 URL: http://svn.reactos.org/svn/reactos?rev=43381&view=rev Log: - Woooops, fix MP hal build. Modified: trunk/reactos/hal/halx86/mp/processor_mp.c Modified: trunk/reactos/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/processor_mp… ============================================================================== --- trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/processor_mp.c [iso-8859-1] Sun Oct 11 22:40:19 2009 @@ -17,6 +17,17 @@ #include <hal.h> #define NDEBUG #include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +HaliHaltSystem(VOID) +{ + /* Disable interrupts and halt the CPU */ + _disable(); + __halt(); +} /* FUNCTIONS *****************************************************************/

1 0

[sginsberg] 43380: - Stub out DbgKdWriteVirtualMemoryApi, DbgKdReadPhysicalMemoryApi, DbgKdWritePhysicalMemoryApi, DbgKdWriteBreakPointExApi, DbgKdRestoreBreakPointExApi, DbgKdSearchMemoryApi and DbgKdFillMemoryApi cases more properly. - Fail on physical memory write like we do for read too. - Don't handle OldVlm1/2 as they appear to be deprecated and unhandled in Windows. - Implement HalHaltSystem to halt execution in a portable way. Default to xHalHaltSystem, a simple infinite loop, if we get
by sginsberg＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: sginsberg Date: Sun Oct 11 22:16:45 2009 New Revision: 43380 URL: http://svn.reactos.org/svn/reactos?rev=43380&view=rev Log: - Stub out DbgKdWriteVirtualMemoryApi, DbgKdReadPhysicalMemoryApi, DbgKdWritePhysicalMemoryApi, DbgKdWriteBreakPointExApi, DbgKdRestoreBreakPointExApi, DbgKdSearchMemoryApi and DbgKdFillMemoryApi cases more properly. - Fail on physical memory write like we do for read too. - Don't handle OldVlm1/2 as they appear to be deprecated and unhandled in Windows. - Implement HalHaltSystem to halt execution in a portable way. Default to xHalHaltSystem, a simple infinite loop, if we get called before HAL has initialized. Use this in KiBugCheckDebugBreak and the system shutdown handler instead of x86/AMD64/ARM intrinsics. - Don't try to halt the CPU if KeBugCheck has been called 3 times or more -- if this happens, something has gone very wrong, and we shouldn't try to do anything special. Just loop infinitely. - Fix KiBugCheckDebugBreak -- it shouldn't halt execution when called for the first chance as bugcheck callbacks have not been invoked at this point (nor has the BSOD been displayed). Use SEH to protect against a crash instead of checking KdDebuggerNotPresent as the debugger, if it is present, *could* disconnect while the trap is being handled. Also, don't halt execution if the debugger handled the breakpoint, just break again. - Don't call MmMapIoSpace from HalpReboot! The reboot might take place at elevated IRQL (as high as HIGH_LEVEL if called from KeBugCheck), and thus can't use any Mm support routines. Use a PTE from the reserved HAL region and map it ourselves instead as done in the BIOS call code. - Acquire the display ownership in HalReturnToFirmware in case the caller hasn't done so (as done in the KD reboot routine, for example). - Just include ntndk.h in hal.h instead of including 6 NDK headers (which turns into more than half of the NDK anyway since those headers include other NDK headers). - Crashing and rebooting from KD now works properly. Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/hal/halx86/include/hal.h trunk/reactos/hal/halx86/include/halp.h trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/fstub/halstub.c trunk/reactos/ntoskrnl/include/internal/hal.h trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -110,6 +110,7 @@ HalGetDmaAdapter = HalpGetDmaAdapter; HalGetInterruptTranslator = NULL; // FIXME: TODO HalResetDisplay = HalpBiosDisplayReset; + HalHaltSystem = HaliHaltSystem; /* Initialize the hardware lock (CMOS) */ KeInitializeSpinLock(&HalpSystemHardwareLock); Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/processor.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -14,6 +14,17 @@ LONG HalpActiveProcessors; KAFFINITY HalpDefaultInterruptAffinity; + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +HaliHaltSystem(VOID) +{ + /* Disable interrupts and halt the CPU */ + _disable(); + __halt(); +} /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -13,9 +13,11 @@ #define NDEBUG #include <debug.h> +#define GetPteAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 12) << 2) + 0xC0000000) + /* PRIVATE FUNCTIONS *********************************************************/ -static VOID +VOID NTAPI HalpWriteResetCommand(VOID) { @@ -23,17 +25,29 @@ WRITE_PORT_UCHAR((PUCHAR)0x64, 0xFE); }; -static VOID +VOID NTAPI HalpReboot(VOID) { UCHAR Data; - PVOID HalpZeroPageMapping; - PHYSICAL_ADDRESS Null = {{0, 0}}; + PVOID ZeroPageMapping; + PHARDWARE_PTE Pte; + + /* Get a PTE in the HAL reserved region */ + ZeroPageMapping = (PVOID)(0xFFC00000 + PAGE_SIZE); + Pte = GetPteAddress(ZeroPageMapping); + + /* Make it valid and map it to the first physical page */ + Pte->Valid = 1; + Pte->Write = 1; + Pte->Owner = 1; + Pte->PageFrameNumber = 0; + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); /* Enable warm reboot */ - HalpZeroPageMapping = MmMapIoSpace(Null, PAGE_SIZE, MmNonCached); - ((PUSHORT)HalpZeroPageMapping)[0x239] = 0x1234; + ((PUSHORT)ZeroPageMapping)[0x239] = 0x1234; /* FIXME: Lock CMOS Access */ @@ -79,12 +93,15 @@ NTAPI HalReturnToFirmware(IN FIRMWARE_REENTRY Action) { - /* Check the kind of action this is */ + /* Check what kind of action this is */ switch (Action) { /* All recognized actions */ case HalHaltRoutine: case HalRebootRoutine: + + /* Acquire the display */ + InbvAcquireDisplayOwnership(); /* Call the internal reboot function */ HalpReboot(); Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -25,12 +25,7 @@ #include <bugcodes.h> #include <ntdddisk.h> #include <arc/arc.h> -#include <iotypes.h> -#include <kefuncs.h> -#include <halfuncs.h> -#include <iofuncs.h> -#include <ldrtypes.h> -#include <obfuncs.h> +#include <ntndk.h> /* Internal kernel headers */ #include "internal/pci.h" Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -164,6 +164,15 @@ VOID ); +// +// Processor Halt Routine +// +VOID +NTAPI +HaliHaltSystem( + VOID +); + #ifdef _M_AMD64 #define KfLowerIrql KeLowerIrql #ifndef CONFIG_SMP Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -30,13 +30,7 @@ while (TRUE) { KeRaiseIrql(SYNCH_LEVEL, &OldIrql); -#if defined(_M_IX86) || defined(_M_AMD64) - __halt(); -#elif defined(_M_ARM) - KeArmHaltProcessor(); -#else - HalProcessorIdle(); -#endif + HalHaltSystem(); } } Modified: trunk/reactos/ntoskrnl/fstub/halstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/halstub.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/halstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/halstub.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -51,7 +51,7 @@ (pHalSetWakeAlarm)NULL, (pHalTranslateBusAddress)NULL, (pHalAssignSlotResources)NULL, - (pHalHaltSystem)NULL, + xHalHaltSystem, (pHalFindBusAddressTranslation)NULL, (pHalResetDisplay)NULL, (pHalAllocateMapRegisters)NULL, @@ -66,5 +66,10 @@ /* FUNCTIONS *****************************************************************/ - -/* EOF */ +VOID +NTAPI +xHalHaltSystem(VOID) +{ + /* Halt execution */ + while (TRUE); +} Modified: trunk/reactos/ntoskrnl/include/internal/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hal.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hal.h [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -46,6 +46,13 @@ IN ULONG SectorsPerTrack, IN ULONG NumberOfHeads, IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); + +VOID +NTAPI +xHalHaltSystem( + VOID +); + // // Various offsets in the boot record Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -66,6 +66,28 @@ VOID NTAPI +KdpSearchMemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpSearchMemory called\n"); + while (TRUE); +} + +VOID +NTAPI +KdpFillMemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpFillMemory called\n"); + while (TRUE); +} + +VOID +NTAPI KdpWriteBreakpoint(IN PDBGKD_MANIPULATE_STATE64 State, IN PSTRING Data, IN PCONTEXT Context) @@ -97,6 +119,62 @@ &Header, NULL, &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); +} + +NTSTATUS +NTAPI +KdpWriteBreakPointEx(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpWriteBreakPointEx called\n"); + while (TRUE); + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +KdpRestoreBreakPointEx(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpRestoreBreakPointEx called\n"); + while (TRUE); } VOID @@ -236,6 +314,71 @@ VOID NTAPI +KdpWriteVirtualMemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + /* FIXME: STUB */ + KdpDprintf("KdpWriteVirtualMemory called for Address: %p Length %x\n", + (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress, + State->u.ReadMemory.TransferCount); + while (TRUE); +} + +VOID +NTAPI +KdpReadPhysicalmemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + + /* FIXME: STUB */ + KdpDprintf("KdpWritePhysicalMemory called for Address %I64x Length: %x\n", + State->u.ReadMemory.TargetBaseAddress, + State->u.ReadMemory.TransferCount); + + /* Setup an empty message, with failure */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + Data->Length = 0; + State->ReturnStatus = STATUS_UNSUCCESSFUL; + + /* Send it */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpWritePhysicalmemory(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + + /* FIXME: STUB */ + KdpDprintf("KdpWritePhysicalMemory called for Address %I64x Length: %x\n", + State->u.ReadMemory.TargetBaseAddress, + State->u.ReadMemory.TransferCount); + + /* Setup an empty message, with failure */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + Data->Length = 0; + State->ReturnStatus = STATUS_UNSUCCESSFUL; + + /* Send it */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI KdpReadControlSpace(IN PDBGKD_MANIPULATE_STATE64 State, IN PSTRING Data, IN PCONTEXT Context) @@ -302,39 +445,6 @@ 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); } @@ -788,9 +898,8 @@ case DbgKdWriteVirtualMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdWriteVirtualMemoryApi called\n"); - while (TRUE); + /* Write virtual memory */ + KdpWriteVirtualMemory(&ManipulateState, &Data, Context); break; case DbgKdGetContextApi: @@ -866,22 +975,17 @@ /* Return an error */ return ContinueError; } - break; case DbgKdReadPhysicalMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdReadPhysicalMemoryApi called for address %I64X\n", - ManipulateState.u.ReadMemory.TargetBaseAddress); - goto Hack; - while (TRUE); + /* Read physical memory */ + KdpReadPhysicalmemory(&ManipulateState, &Data, Context); break; case DbgKdWritePhysicalMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdWritePhysicalMemoryApi called\n"); - while (TRUE); + /* Write physical memory */ + KdpWritePhysicalmemory(&ManipulateState, &Data, Context); break; case DbgKdQuerySpecialCallsApi: @@ -939,16 +1043,20 @@ case DbgKdWriteBreakPointExApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdWriteBreakPointExApi called\n"); - while (TRUE); + /* Write the breakpoint and check if it failed */ + if (!NT_SUCCESS(KdpWriteBreakPointEx(&ManipulateState, + &Data, + Context))) + { + /* Return an error */ + return ContinueError; + } break; case DbgKdRestoreBreakPointExApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdRestoreBreakPointExApi called\n"); - while (TRUE); + /* Restore the breakpoint */ + KdpRestoreBreakPointEx(&ManipulateState, &Data, Context); break; case DbgKdCauseBugCheckApi: @@ -983,25 +1091,10 @@ KdpWriteMachineSpecificRegister(&ManipulateState, &Data, Context); break; - case OldVlm1: - - /* FIXME: TODO */ - KdpDprintf("OldVlm1 called\n"); - while (TRUE); - break; - - case OldVlm2: - - /* FIXME: TODO */ - KdpDprintf("OldVlm2 called\n"); - while (TRUE); - break; - case DbgKdSearchMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdSearchMemoryApi called\n"); - while (TRUE); + /* Search memory */ + KdpSearchMemory(&ManipulateState, &Data, Context); break; case DbgKdGetBusDataApi: @@ -1030,9 +1123,8 @@ case DbgKdFillMemoryApi: - /* FIXME: TODO */ - KdpDprintf("DbgKdFillMemoryApi called\n"); - while (TRUE); + /* Fill memory */ + KdpFillMemory(&ManipulateState, &Data, Context); break; case DbgKdQueryMemoryApi: @@ -1052,9 +1144,7 @@ default: /* Setup an empty message, with failure */ - KdpDprintf("Received unknown API Number %lx\n", ManipulateState.ApiNumber); - while (TRUE); -Hack: + KdpDprintf("Received Unhandled API %lx\n", ManipulateState.ApiNumber); Data.Length = 0; ManipulateState.ReturnStatus = STATUS_UNSUCCESSFUL; Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4338… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Oct 11 22:16:45 2009 @@ -546,21 +546,29 @@ } } -DECLSPEC_NORETURN VOID NTAPI KiBugCheckDebugBreak(IN ULONG StatusCode) { - /* If KDBG isn't connected, freeze the CPU, otherwise, break */ -#if defined(_M_IX86) || defined(_M_AMD64) - if (KdDebuggerNotPresent) for (;;) __halt(); -#elif defined(_M_ARM) - if (KdDebuggerNotPresent) for (;;) KeArmHaltProcessor(); -#else -#error -#endif - DbgBreakPointWithStatus(StatusCode); - while (TRUE); + /* + * Wrap this in SEH so we don't crash if + * there is no debugger or if it disconnected + */ +DoBreak: + _SEH2_TRY + { + /* Breakpoint */ + DbgBreakPointWithStatus(StatusCode); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* No debugger, halt the CPU */ + HalHaltSystem(); + } + _SEH2_END; + + /* Break again if this wasn't first try */ + if (StatusCode != DBG_STATUS_BUGCHECK_FIRST) goto DoBreak; } PCHAR @@ -1175,14 +1183,8 @@ } else if (KeBugCheckOwnerRecursionCount > 2) { - /* Halt the CPU */ -#if defined(_M_IX86) || defined(_M_AMD64) - for (;;) __halt(); -#elif defined(_M_ARM) - for (;;) KeArmHaltProcessor(); -#else -#error -#endif + /* Halt execution */ + while (TRUE); } } @@ -1201,6 +1203,9 @@ /* Attempt to break in the debugger (otherwise halt CPU) */ KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_SECOND); + + /* Shouldn't get here */ + while (TRUE); } /* PUBLIC FUNCTIONS **********************************************************/ @@ -1421,7 +1426,7 @@ } } - /* Bugcheck */ + /* Break in the debugger */ KiBugCheckDebugBreak(DBG_STATUS_FATAL); }

1 0

[gschneider] 43379: [spider] Address two more gcc 4.4 parenthesis warnings
by gschneider＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: gschneider Date: Sun Oct 11 20:10:48 2009 New Revision: 43379 URL: http://svn.reactos.org/svn/reactos?rev=43379&view=rev Log: [spider] Address two more gcc 4.4 parenthesis warnings Modified: trunk/reactos/base/applications/games/spider/spigame.cpp Modified: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Sun Oct 11 20:10:48 2009 @@ -145,8 +145,8 @@ case IDC_DIF_ONECOLOR: break; case IDC_DIF_TWOCOLORS: - if (mystack[i].IsBlack() && mystack[i + 1].IsBlack() || - mystack[i].IsRed() && mystack[i + 1].IsRed()) + if ((mystack[i].IsBlack() && mystack[i + 1].IsBlack()) || + (mystack[i].IsRed() && mystack[i + 1].IsRed())) { return false; } @@ -236,8 +236,8 @@ case IDC_DIF_ONECOLOR: break; case IDC_DIF_TWOCOLORS: - if (mystack[0].IsBlack() && dragcard.IsRed() || - mystack[0].IsRed() && dragcard.IsBlack()) + if ((mystack[0].IsBlack() && dragcard.IsRed()) || + (mystack[0].IsRed() && dragcard.IsBlack())) { return false; }

1 0

[hpoussin] 43378: [freeldr] Fix typo: REGISTER -> REGISTRY
by hpoussin＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: hpoussin Date: Sun Oct 11 19:10:32 2009 New Revision: 43378 URL: http://svn.reactos.org/svn/reactos?rev=43378&view=rev Log: [freeldr] Fix typo: REGISTER -> REGISTRY Modified: trunk/reactos/boot/freeldr/freeldr/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Oct 11 19:10:32 2009 @@ -159,7 +159,7 @@ DbgPrint("CACHE: "); break; case DPRINT_REGISTRY: - DbgPrint("REGISTER: "); + DbgPrint("REGISTRY: "); break; case DPRINT_REACTOS: DbgPrint("REACTOS: ");

1 0

[hpoussin] 43377: [freeldr] Rework the ramdisk driver to let it be a full device, instead of a deprecated harddisk which was only available once real harddisks were disabled Add support for /RDPATH switch in WINLDR boot style
by hpoussin＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: hpoussin Date: Sun Oct 11 19:08:33 2009 New Revision: 43377 URL: http://svn.reactos.org/svn/reactos?rev=43377&view=rev Log: [freeldr] Rework the ramdisk driver to let it be a full device, instead of a deprecated harddisk which was only available once real harddisks were disabled Add support for /RDPATH switch in WINLDR boot style Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -71,7 +71,6 @@ ArmDiskGetDriveGeometry(IN ULONG DriveNumber, OUT PGEOMETRY Geometry) { - ASSERT(gRamDiskBase == NULL); return FALSE; } @@ -81,15 +80,13 @@ IN ULONG SectorCount, IN PVOID Buffer) { - ASSERT(gRamDiskBase == NULL); return FALSE; } ULONG ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) { - ASSERT(gRamDiskBase == NULL); - return FALSE; + return 0; } PCONFIGURATION_COMPONENT_DATA @@ -191,12 +188,11 @@ MachVtbl.HwDetect = ArmHwDetect; // - // Setup disk I/O routines, switch to ramdisk ones for non-NAND boot + // Setup disk I/O routines // MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; - RamDiskSwitchFromBios(); // // Now set default disk handling routines -- we don't need to override Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -1,9 +1,10 @@ /* * PROJECT: ReactOS Boot Loader * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/arch/i386/ramdisk.c + * FILE: boot/freeldr/freeldr/disk/ramdisk.c * PURPOSE: Implements routines to support booting from a RAM Disk * PROGRAMMERS: ReactOS Portable Systems Group + * Hervé Poussineau */ /* INCLUDES *******************************************************************/ @@ -16,78 +17,108 @@ PVOID gRamDiskBase; ULONG gRamDiskSize; +ULONG gRamDiskOffset; /* FUNCTIONS ******************************************************************/ -FORCEINLINE -PVOID -RamDiskGetDataAtOffset(IN PVOID Offset) -{ - // - // Return data from our RAM Disk - // - ASSERT(((ULONG_PTR)gRamDiskBase + (ULONG_PTR)Offset) < - ((ULONG_PTR)gRamDiskBase + (ULONG_PTR)gRamDiskSize)); - return (PVOID)((ULONG_PTR)gRamDiskBase + (ULONG_PTR)(Offset)); -} - -ULONG -RamDiskGetCacheableBlockCount(IN ULONG Reserved) -{ - // - // Allow 32KB transfers (64 sectors), emulating BIOS LBA - // - ASSERT(Reserved == 0x49); - return 64; -} - -BOOLEAN -RamDiskGetDriveGeometry(IN ULONG Reserved, - OUT PGEOMETRY Geometry) -{ - // - // Should never be called when the caller expects valid Geometry! - // - ASSERT(Reserved == 0x49); - return TRUE; -} - -BOOLEAN -RamDiskReadLogicalSectors(IN ULONG Reserved, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - IN PVOID Buffer) +static LONG RamDiskClose(ULONG FileId) +{ + // + // Nothing to do + // + return ESUCCESS; +} + +static LONG RamDiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + // + // Give current seek offset and ram disk size to caller + // + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + Information->EndingAddress.LowPart = gRamDiskSize; + Information->CurrentAddress.LowPart = gRamDiskOffset; + + return ESUCCESS; +} + +static LONG RamDiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + // + // Always return success, as contents are already in memory + // + return ESUCCESS; +} + +static LONG RamDiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { PVOID StartAddress; - ULONG Length; - ASSERT(Reserved == 0x49); - - // - // Get actual pointers and lengths - // - StartAddress = (PVOID)((ULONG_PTR)SectorNumber * 512); - Length = SectorCount * 512; - + + // + // Get actual pointer + // + StartAddress = (PVOID)((ULONG_PTR)gRamDiskBase + gRamDiskOffset); + // // Don't allow reads past our image // - if (((ULONG_PTR)StartAddress + Length) > gRamDiskSize) return FALSE; + if (gRamDiskOffset + N > gRamDiskSize) + { + *Count = 0; + return EIO; + } // // Do the read // - RtlCopyMemory(Buffer, RamDiskGetDataAtOffset(StartAddress), Length); - return TRUE; -} + RtlCopyMemory(Buffer, StartAddress, N); + *Count = N; + + return ESUCCESS; +} + +static LONG RamDiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + // + // Only accept absolute mode now + // + if (SeekMode != SeekAbsolute) + return EINVAL; + + // + // Check if we're in the ramdisk + // + if (Position->HighPart != 0) + return EINVAL; + if (Position->LowPart >= gRamDiskSize) + return EINVAL; + + // + // OK, remember seek position + // + gRamDiskOffset = Position->LowPart; + + return ESUCCESS; +} + +static const DEVVTBL RamDiskVtbl = { + RamDiskClose, + RamDiskGetFileInformation, + RamDiskOpen, + RamDiskRead, + RamDiskSeek, +}; VOID NTAPI RamDiskLoadVirtualFile(IN PCHAR FileName) { - PFILE RamFile; - ULONG TotalRead, ChunkSize; - PCHAR MsgBuffer = "Loading ramdisk..."; + ULONG RamFile; + ULONG TotalRead, ChunkSize, Count; + PCHAR MsgBuffer = "Loading ramdisk..."; ULONG PercentPerChunk, Percent; + FILEINFORMATION Information; + LARGE_INTEGER Position; + LONG ret; // // Display progress @@ -95,25 +126,45 @@ UiDrawProgressBarCenter(1, 100, MsgBuffer); // - // Try opening the ramdisk file (this assumes the boot volume was opened) - // - RamFile = FsOpenFile(FileName); - if (RamFile) + // Try opening the ramdisk file + // + ret = ArcOpen(FileName, OpenReadOnly, &RamFile); + if (ret == ESUCCESS) { // // Get the file size // - gRamDiskSize = FsGetFileSize(RamFile); - if (!gRamDiskSize) return; - + ret = ArcGetFileInformation(RamFile, &Information); + if (ret != ESUCCESS) + { + ArcClose(RamFile); + return; + } + + // + // For now, limit RAM disks to 4GB + // + if (Information.EndingAddress.HighPart != 0) + { + UiMessageBox("RAM disk too big\n"); + ArcClose(RamFile); + return; + } + gRamDiskSize = Information.EndingAddress.LowPart; + // // Allocate memory for it // ChunkSize = 8 * 1024 * 1024; Percent = PercentPerChunk = 100 / (gRamDiskSize / ChunkSize); gRamDiskBase = MmAllocateMemory(gRamDiskSize); - if (!gRamDiskBase) return; - + if (!gRamDiskBase) + { + UiMessageBox("Failed to allocate memory for RAM disk\n"); + ArcClose(RamFile); + return; + } + // // Read it in chunks // @@ -139,43 +190,34 @@ // // Copy the contents // - - if (!FsReadFile(RamFile, - ChunkSize, - NULL, - (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead))) + Position.HighPart = 0; + Position.LowPart = TotalRead; + ret = ArcSeek(RamFile, &Position, SeekAbsolute); + if (ret == ESUCCESS) { - // - // Fail - // + ret = ArcRead(RamFile, + (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead), + ChunkSize, + &Count); + } + + // + // Check for success + // + if (ret != ESUCCESS || Count != ChunkSize) + { + MmFreeMemory(gRamDiskBase); + gRamDiskBase = NULL; + gRamDiskSize = 0; + ArcClose(RamFile); UiMessageBox("Failed to read ramdisk\n"); + return; } } + + ArcClose(RamFile); + + // Register a new device for the ramdisk + FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); } } - -VOID -NTAPI -RamDiskSwitchFromBios(VOID) -{ - extern ULONG BootDrive, BootPartition; - - // - // Check if we have a ramdisk, in which case we need to switch routines - // - if (gRamDiskBase) - { - // - // Don't use the BIOS for reads anymore - // - MachVtbl.DiskReadLogicalSectors = RamDiskReadLogicalSectors; - MachVtbl.DiskGetDriveGeometry = RamDiskGetDriveGeometry; - MachVtbl.DiskGetCacheableBlockCount = RamDiskGetCacheableBlockCount; - - // - // Switch to ramdisk boot partition - // - BootDrive = 0x49; - BootPartition = 0; - } -} Modified: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -14,12 +14,6 @@ // VOID NTAPI -RamDiskSwitchFromBios( - VOID -); - -VOID -NTAPI RamDiskLoadVirtualFile( IN PCHAR FileName ); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -746,15 +746,6 @@ UiDrawStatusText("Loading..."); - // - // If we have a ramdisk, this will switch to the ramdisk disk routines - // which read from memory instead of using the firmware. This has to be done - // after hardware detection, since hardware detection will require using the - // real routines in order to perform disk-detection (just because we're on a - // ram-boot doesn't mean the user doesn't have actual disks installed too!) - // - RamDiskSwitchFromBios(); - /* Get boot path */ if (strchr(SystemPath, '\\') != NULL) strcpy(szBootPath, strchr(SystemPath, '\\')); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -390,6 +390,7 @@ CHAR FullPath[MAX_PATH], SystemRoot[MAX_PATH], BootPath[MAX_PATH]; CHAR FileName[MAX_PATH]; CHAR BootOptions[256]; + PCHAR File; PCHAR PathSeparator; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; @@ -445,6 +446,28 @@ strcpy(BootOptions, ""); } + // + // Check if a ramdisk file was given + // + File = strstr(BootOptions, "/RDPATH="); + if (File) + { + // + // Copy the file name and everything else after it + // + strcpy(FileName, File + 8); + + // + // Null-terminate + // + *strstr(FileName, " ") = ANSI_NULL; + + // + // Load the ramdisk + // + RamDiskLoadVirtualFile(FileName); + } + /* Let user know we started loading */ UiDrawStatusText("Loading...");

1 0

[gschneider] 43375: [cardlib] Re-add changes that got lost due to an old version being used as base
by gschneider＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: gschneider Date: Sun Oct 11 16:15:02 2009 New Revision: 43375 URL: http://svn.reactos.org/svn/reactos?rev=43375&view=rev Log: [cardlib] Re-add changes that got lost due to an old version being used as base Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] Sun Oct 11 16:15:02 2009 @@ -326,7 +326,7 @@ else { HWND hwnd = (HWND)parentWnd; - SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG)hwnd); + SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG_PTR)hwnd); } } } Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] Sun Oct 11 16:15:02 2009 @@ -298,7 +298,7 @@ else fDrawTips = TRUE; - if(yoffset != 0 && abs(xoffset) == 1 || xoffset != 0 && abs(yoffset) == 1) + if((yoffset != 0 && abs(xoffset) == 1) || (xoffset != 0 && abs(yoffset) == 1)) fDrawTips = TRUE; //draw horizontal strips Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] Sun Oct 11 16:15:02 2009 @@ -626,7 +626,7 @@ MoveDragCardTo(hdc, ix, iy); - if(attarget || ix == idestx && iy == idesty) + if(attarget || (ix == idestx && iy == idesty)) break; oldx = (int)x; Modified: trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] Sun Oct 11 16:15:02 2009 @@ -275,7 +275,7 @@ // LRESULT CALLBACK CardWindow::CardWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { - CardWindow *cw = (CardWindow *)GetWindowLong(hwnd, 0); + CardWindow *cw = (CardWindow *)GetWindowLongPtr(hwnd, 0); return cw->WndProc(hwnd, iMsg, wParam, lParam); } @@ -366,7 +366,7 @@ // // associate this class with the window // - SetWindowLong(hwnd, 0, (LONG)cs->lpCreateParams); + SetWindowLongPtr(hwnd, 0, (LONG_PTR)cs->lpCreateParams); return 1;

1 0

[dchapyshev] 43374: - Add spider.exe to bootcd - Add shortcut for spider
by dchapyshev＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: dchapyshev Date: Sun Oct 11 16:00:18 2009 New Revision: 43374 URL: http://svn.reactos.org/svn/reactos?rev=43374&view=rev Log: - Add spider.exe to bootcd - Add shortcut for spider Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -47,6 +47,7 @@ base\applications\mscutils\devmgmt\devmgmt.exe 1 base\applications\mscutils\eventvwr\eventvwr.exe 1 base\applications\games\solitaire\sol.exe 1 +base\applications\games\spider\spider.exe 1 base\applications\games\winemine\winemine.exe 1 base\applications\hh\hh.exe 4 base\applications\kbswitch\kbswitch.exe 1 Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -806,6 +806,7 @@ { CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SOLITAIRE, _T("%SystemRoot%\\system32\\sol.exe"), IDS_CMT_SOLITAIRE, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WINEMINE, _T("%SystemRoot%\\system32\\winemine.exe"), IDS_CMT_WINEMINE, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SPIDER, _T("%SystemRoot%\\system32\\spider.exe"), IDS_CMT_SPIDER, TRUE); } CoUninitialize(); Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -226,6 +226,7 @@ IDS_GAMES "Èãðè" IDS_CMT_SOLITAIRE "Ïàñèàíñ" IDS_CMT_WINEMINE "Ìèíè÷êè" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -286,6 +287,7 @@ IDS_SHORT_SNDVOL32 "Ñèëà íà çâóêà.lnk" IDS_SHORT_DXDIAG "Ïðåãëåæäàíå íà ÐåàêòÕ.lnk" IDS_SHORT_PAINT "Ðèñóíúê.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -207,6 +207,7 @@ IDS_GAMES "Hry" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -268,6 +269,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -221,6 +221,7 @@ IDS_GAMES "Spiele" IDS_CMT_SOLITAIRE "Solitär" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Ðáé÷íßäéá" IDS_CMT_SOLITAIRE "ÐáóéÝíôæá" IDS_CMT_WINEMINE "ÍáñêáëéåõôÞò" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -283,6 +284,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Games" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -231,6 +231,7 @@ IDS_GAMES "Juegos" IDS_CMT_SOLITAIRE "Solitario" IDS_CMT_WINEMINE "Buscaminas" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -292,6 +293,7 @@ IDS_SHORT_SNDVOL32 "Control de volumen.lnk" IDS_SHORT_DXDIAG "Diagnóstico de ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -221,6 +221,7 @@ IDS_GAMES "Mängud" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -281,6 +282,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Jeux" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -234,6 +234,7 @@ IDS_GAMES "Játékok" IDS_CMT_SOLITAIRE "Pasziánsz" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -295,6 +296,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -220,6 +220,7 @@ IDS_GAMES "Games" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -280,6 +281,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -213,6 +213,7 @@ IDS_GAMES "Giochi" IDS_CMT_SOLITAIRE "Solitario" IDS_CMT_WINEMINE "Campo minato" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -273,6 +274,7 @@ IDS_SHORT_SNDVOL32 "Controllo Volume.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostica.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Q[" IDS_CMT_SOLITAIRE "\\eBA" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "[hpbh.lnk" IDS_SHORT_PAINT "yCg.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Games" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -225,6 +225,7 @@ IDS_GAMES "Spill" IDS_CMT_SOLITAIRE "Kabal" IDS_CMT_WINEMINE "Minnesveiper" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -285,6 +286,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -252,6 +252,7 @@ IDS_GAMES "Gry" IDS_CMT_SOLITAIRE "Pasjans" IDS_CMT_WINEMINE "Saper" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -290,6 +291,7 @@ IDS_SHORT_SNDVOL32 "Regulacja g³onoci.lnk" IDS_SHORT_DXDIAG "Program diagnostyczny ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -223,6 +223,7 @@ IDS_GAMES "Jocuri" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -283,6 +284,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -201,8 +201,9 @@ STRINGTABLE BEGIN IDS_GAMES "Èãðû" - IDS_CMT_SOLITAIRE "Ïàñüÿíñ" + IDS_CMT_SOLITAIRE "Ïàñüÿíñ ""Êîñûíêà""" IDS_CMT_WINEMINE "Ñàïåð" + IDS_CMT_SPIDER "Ïàñüÿíñ ""Ïàóê""" END STRINGTABLE @@ -253,7 +254,7 @@ IDS_SHORT_NOTEPAD "Áëîêíîò.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_SNAP "SnapShot.lnk" - IDS_SHORT_SOLITAIRE "Ïàñüÿíñ.lnk" + IDS_SHORT_SOLITAIRE "Ïàñüÿíñ ""Êîñûíêà"".lnk" IDS_SHORT_WINEMINE "Ñàïåð.lnk" IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" IDS_SHORT_MAGNIFY "Ýêðàííàÿ ëóïà.lnk" @@ -264,6 +265,7 @@ IDS_SHORT_SNDVOL32 "Ãðîìêîñòü.lnk" IDS_SHORT_DXDIAG "Ñðåäñòâî äèàãíîñòèêè ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Ïàñüÿíñ ""Ïàóê"".lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -207,6 +207,7 @@ IDS_GAMES "Hry" IDS_CMT_SOLITAIRE "Solitér" IDS_CMT_WINEMINE "Míny" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -268,6 +269,7 @@ IDS_SHORT_SNDVOL32 "Ovládanie hlasitosti.lnk" //Volume Control IDS_SHORT_DXDIAG "Diagnostika ReactX.lnk" IDS_SHORT_PAINT "Skicár.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -211,6 +211,7 @@ IDS_GAMES "²ãðè" IDS_CMT_SOLITAIRE "Êîñèíêà" IDS_CMT_WINEMINE "Ñàïåð" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -272,6 +273,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -210,6 +210,7 @@ IDS_GAMES "ÓÎÏ·" IDS_CMT_SOLITAIRE "Ö½ÅÆ" IDS_CMT_WINEMINE "É¨À×" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -271,6 +272,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -121,6 +121,7 @@ #define IDS_CMT_SNDVOL32 3229 #define IDS_CMT_DXDIAG 3230 #define IDS_CMT_PAINT 3231 +#define IDS_CMT_SPIDER 3232 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -154,6 +155,7 @@ #define IDS_SHORT_SNDVOL32 3419 #define IDS_SHORT_DXDIAG 3420 #define IDS_SHORT_PAINT 3421 +#define IDS_SHORT_SPIDER 3422 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

1 0

[gschneider] 43373: Remove solitaires local cardlib copy
by gschneider＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: gschneider Date: Sun Oct 11 14:10:57 2009 New Revision: 43373 URL: http://svn.reactos.org/svn/reactos?rev=43373&view=rev Log: Remove solitaires local cardlib copy Removed: trunk/reactos/base/applications/games/solitaire/cardlib/

1 0

[gschneider] 43372: [spider] - Add a spider solitaire clone - Relies on the Catch22 cardlib - Supports all three playing modes and full game play - English and German resources included, own work - Icon origin: tango solitaire icon with a self drawn spider on top [cardlib] - Convert to a static library as suggested in the comments, move to 3rdparty directory - Allow to modify dragged card stacks (needed for spider) [solitaire] - Adapt to cardlib changes, delete local cardlib copy
by gschneider＠svn.reactos.org 11 Oct '09

11 Oct '09

Author: gschneider Date: Sun Oct 11 14:07:11 2009 New Revision: 43372 URL: http://svn.reactos.org/svn/reactos?rev=43372&view=rev Log: [spider] - Add a spider solitaire clone - Relies on the Catch22 cardlib - Supports all three playing modes and full game play - English and German resources included, own work - Icon origin: tango solitaire icon with a self drawn spider on top [cardlib] - Convert to a static library as suggested in the comments, move to 3rdparty directory - Allow to modify dragged card stacks (needed for spider) [solitaire] - Adapt to cardlib changes, delete local cardlib copy Added: trunk/reactos/base/applications/games/spider/ (with props) trunk/reactos/base/applications/games/spider/lang/ (with props) trunk/reactos/base/applications/games/spider/lang/de-DE.rc (with props) trunk/reactos/base/applications/games/spider/lang/en-US.rc (with props) trunk/reactos/base/applications/games/spider/resource.h (with props) trunk/reactos/base/applications/games/spider/rsrc.rc (with props) trunk/reactos/base/applications/games/spider/spider.cpp (with props) trunk/reactos/base/applications/games/spider/spider.h (with props) trunk/reactos/base/applications/games/spider/spider.ico (with props) trunk/reactos/base/applications/games/spider/spider.rbuild (with props) trunk/reactos/base/applications/games/spider/spigame.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/ (with props) trunk/reactos/lib/3rdparty/cardlib/ReadMe.txt (with props) trunk/reactos/lib/3rdparty/cardlib/card.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardbutton.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardcolor.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardcount.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardlib.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardlib.rbuild (with props) trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardregion.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardstack.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardwindow.h (with props) trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/dropzone.h (with props) trunk/reactos/lib/3rdparty/cardlib/globals.h (with props) Modified: trunk/reactos/base/applications/games/games.rbuild trunk/reactos/base/applications/games/solitaire/ReadMe.txt trunk/reactos/base/applications/games/solitaire/solcreate.cpp trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h trunk/reactos/base/applications/games/solitaire/solitaire.rbuild trunk/reactos/lib/3rdparty/3rdparty.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/games/games.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/ga… Modified: trunk/reactos/base/applications/games/solitaire/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Added: trunk/reactos/base/applications/games/spider/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spider.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spider.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/3rdparty.rbui… Added: trunk/reactos/lib/3rdparty/cardlib/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/ReadM… Added: trunk/reactos/lib/3rdparty/cardlib/card.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/card.… Added: trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… Added: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… Added: trunk/reactos/lib/3rdparty/cardlib/cardbutton.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… Added: trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… Added: trunk/reactos/lib/3rdparty/cardlib/cardcolor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… Added: trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… Added: trunk/reactos/lib/3rdparty/cardlib/cardcount.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… Added: trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… Added: trunk/reactos/lib/3rdparty/cardlib/cardlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… Added: trunk/reactos/lib/3rdparty/cardlib/cardlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… Added: trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… Added: trunk/reactos/lib/3rdparty/cardlib/cardregion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… Added: trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… Added: trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… Added: trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… Added: trunk/reactos/lib/3rdparty/cardlib/cardstack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… Added: trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… Added: trunk/reactos/lib/3rdparty/cardlib/cardwindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… Added: trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz… Added: trunk/reactos/lib/3rdparty/cardlib/dropzone.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz… Added: trunk/reactos/lib/3rdparty/cardlib/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/globa…

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