Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[ros-arm-bringup] 32223: We now have an official hal-arm which exports KeSwapIrql, allowing many more drivers to compile and link properly. We now have ARM export files for Class2 and Scsiport, allowing these drivers plus disk, cdrom and other dependencies to build and link.
by ros-arm-bringup＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: ros-arm-bringup Date: Fri Feb 8 20:13:09 2008 New Revision: 32223 URL: http://svn.reactos.org/svn/reactos?rev=32223&view=rev Log: We now have an official hal-arm which exports KeSwapIrql, allowing many more drivers to compile and link properly. We now have ARM export files for Class2 and Scsiport, allowing these drivers plus disk, cdrom and other dependencies to build and link. Added: trunk/reactos/drivers/storage/class/class2/class2_arm.def (with props) trunk/reactos/drivers/storage/class/class2/class2_i386.def - copied unchanged from r32201, trunk/reactos/drivers/storage/class/class2/class2.def trunk/reactos/drivers/storage/scsiport/scsiport_arm.def (with props) trunk/reactos/drivers/storage/scsiport/scsiport_i386.def - copied unchanged from r32201, trunk/reactos/drivers/storage/scsiport/scsiport.def trunk/reactos/hal/halarm/ trunk/reactos/hal/halarm/directory.rbuild (with props) trunk/reactos/hal/halarm/generic/ trunk/reactos/hal/halarm/generic/generic.rbuild (with props) trunk/reactos/hal/halarm/generic/hal.c (with props) trunk/reactos/hal/halarm/include/ trunk/reactos/hal/halarm/include/hal.h (with props) trunk/reactos/hal/halarm/include/halp.h (with props) trunk/reactos/hal/halarm/up/ trunk/reactos/hal/halarm/up/halinit_up.c (with props) trunk/reactos/hal/halarm/up/halup.rbuild (with props) trunk/reactos/hal/halarm/up/halup.rc (with props) Removed: trunk/reactos/drivers/storage/class/class2/class2.def trunk/reactos/drivers/storage/scsiport/scsiport.def Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild trunk/reactos/drivers/storage/scsiport/scsiport.rbuild trunk/reactos/hal/hal.rbuild trunk/reactos/hal/hal/hal_arm.def trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Removed: trunk/reactos/drivers/storage/class/class2/class2.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.def (original) +++ trunk/reactos/drivers/storage/class/class2/class2.def (removed) @@ -1,29 +1,0 @@ -; $Id$ -; -; class2.def - export definition file for scsi class driver -; -LIBRARY CLASS2.SYS -EXPORTS -ScsiClassAsynchronousCompletion@12 -ScsiClassBuildRequest@8 -ScsiClassClaimDevice@16 -ScsiClassCreateDeviceObject@20 -ScsiClassDeviceControl@8 -ScsiClassFindModePage@16 -ScsiClassFindUnclaimedDevices@8 -ScsiClassGetCapabilities@8 -ScsiClassGetInquiryData@8 -ScsiClassInitialize@12 -ScsiClassInitializeSrbLookasideList@8 -ScsiClassInternalIoControl@8 -ScsiClassInterpretSenseInfo@24 -ScsiClassIoComplete@12 -ScsiClassIoCompleteAssociated@12 -ScsiClassModeSense@16 -ScsiClassQueryTimeOutRegistryValue@4 -ScsiClassReadDriveCapacity@4 -ScsiClassReleaseQueue@4 -ScsiClassSendSrbAsynchronous@24 -ScsiClassSendSrbSynchronous@20 -ScsiClassSplitRequest@12 -;EOF Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rbuild Fri Feb 8 20:13:09 2008 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <importlibrary definition="class2.def" /> + <importlibrary definition="class2_$(ARCH).def" /> <library>ntoskrnl</library> <library>hal</library> <library>scsiport</library> Added: trunk/reactos/drivers/storage/class/class2/class2_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2_arm.def (added) +++ trunk/reactos/drivers/storage/class/class2/class2_arm.def Fri Feb 8 20:13:09 2008 @@ -1,0 +1,29 @@ +; $Id: class2.def 26227 2007-04-01 16:29:16Z fireball $ +; +; class2.def - export definition file for scsi class driver +; +LIBRARY CLASS2.SYS +EXPORTS +ScsiClassAsynchronousCompletion +ScsiClassBuildRequest +ScsiClassClaimDevice +ScsiClassCreateDeviceObject +ScsiClassDeviceControl +ScsiClassFindModePage +ScsiClassFindUnclaimedDevices +ScsiClassGetCapabilities +ScsiClassGetInquiryData +ScsiClassInitialize +ScsiClassInitializeSrbLookasideList +ScsiClassInternalIoControl +ScsiClassInterpretSenseInfo +ScsiClassIoComplete +ScsiClassIoCompleteAssociated +ScsiClassModeSense +ScsiClassQueryTimeOutRegistryValue +ScsiClassReadDriveCapacity +ScsiClassReleaseQueue +ScsiClassSendSrbAsynchronous +ScsiClassSendSrbSynchronous +ScsiClassSplitRequest +;EOF Propchange: trunk/reactos/drivers/storage/class/class2/class2_arm.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/storage/class/class2/class2_arm.def ------------------------------------------------------------------------------ svn:mime-type = text/plain Removed: trunk/reactos/drivers/storage/scsiport/scsiport.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.def (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.def (removed) @@ -1,51 +1,0 @@ -; -; scsiport.def - export definition file for scsiport driver -; -LIBRARY SCSIPORT.SYS -EXPORTS -ScsiDebugPrint -ScsiPortCompleteRequest@20 -ScsiPortConvertPhysicalAddressToUlong@8 -ScsiPortConvertUlongToPhysicalAddress(a)4=NTOSKRNL.RtlConvertUlongToLargeInteger -ScsiPortFlushDma@4 -ScsiPortFreeDeviceBase@8 -ScsiPortGetBusData@24 -ScsiPortGetDeviceBase@28 -ScsiPortGetLogicalUnit@16 -ScsiPortGetPhysicalAddress@16 -ScsiPortGetSrb@20 -ScsiPortGetUncachedExtension@12 -ScsiPortGetVirtualAddress@12 -ScsiPortInitialize@16 -ScsiPortIoMapTransfer@16 -ScsiPortLogError@28 -ScsiPortMoveMemory@12 -ScsiPortNotification -ScsiPortReadPortBufferUchar(a)12=HAL.READ_PORT_BUFFER_UCHAR -ScsiPortReadPortBufferUshort(a)12=HAL.READ_PORT_BUFFER_USHORT -ScsiPortReadPortBufferUlong(a)12=HAL.READ_PORT_BUFFER_ULONG -ScsiPortReadPortUchar(a)4=HAL.READ_PORT_UCHAR -ScsiPortReadPortUshort(a)4=HAL.READ_PORT_USHORT -ScsiPortReadPortUlong(a)4=HAL.READ_PORT_ULONG -ScsiPortReadRegisterBufferUchar(a)12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -ScsiPortReadRegisterBufferUshort(a)12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT -ScsiPortReadRegisterBufferUlong(a)12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG -ScsiPortReadRegisterUchar(a)4=NTOSKRNL.READ_REGISTER_UCHAR -ScsiPortReadRegisterUshort(a)4=NTOSKRNL.READ_REGISTER_USHORT -ScsiPortReadRegisterUlong(a)4=NTOSKRNL.READ_REGISTER_ULONG -ScsiPortSetBusDataByOffset@28 -ScsiPortStallExecution(a)4=HAL.KeStallExecutionProcessor -ScsiPortValidateRange@28 -ScsiPortWritePortUchar(a)8=HAL.WRITE_PORT_UCHAR -ScsiPortWritePortUshort(a)8=HAL.WRITE_PORT_USHORT -ScsiPortWritePortUlong(a)8=HAL.WRITE_PORT_ULONG -ScsiPortWritePortBufferUchar(a)12=HAL.WRITE_PORT_BUFFER_UCHAR -ScsiPortWritePortBufferUshort(a)12=HAL.WRITE_PORT_BUFFER_USHORT -ScsiPortWritePortBufferUlong(a)12=HAL.WRITE_PORT_BUFFER_ULONG -ScsiPortWriteRegisterBufferUchar(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -ScsiPortWriteRegisterBufferUshort(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -ScsiPortWriteRegisterBufferUlong(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -ScsiPortWriteRegisterUchar(a)8=NTOSKRNL.WRITE_REGISTER_UCHAR -ScsiPortWriteRegisterUshort(a)8=NTOSKRNL.WRITE_REGISTER_USHORT -ScsiPortWriteRegisterUlong(a)8=NTOSKRNL.WRITE_REGISTER_ULONG -;EOF Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Fri Feb 8 20:13:09 2008 @@ -3,7 +3,7 @@ <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <define name="_SCSIPORT_" /> - <importlibrary definition="scsiport.def" /> + <importlibrary definition="scsiport_$(ARCH).def" /> <include base="scsiport">.</include> <library>ntoskrnl</library> <library>hal</library> Added: trunk/reactos/drivers/storage/scsiport/scsiport_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_arm.def (added) +++ trunk/reactos/drivers/storage/scsiport/scsiport_arm.def Fri Feb 8 20:13:09 2008 @@ -1,0 +1,51 @@ +; +; scsiport.def - export definition file for scsiport driver +; +LIBRARY SCSIPORT.SYS +EXPORTS +ScsiDebugPrint +ScsiPortCompleteRequest +ScsiPortConvertPhysicalAddressToUlong +ScsiPortConvertUlongToPhysicalAddress=NTOSKRNL.RtlConvertUlongToLargeInteger +ScsiPortFlushDma +ScsiPortFreeDeviceBase +ScsiPortGetBusData +ScsiPortGetDeviceBase +ScsiPortGetLogicalUnit +ScsiPortGetPhysicalAddress +ScsiPortGetSrb +ScsiPortGetUncachedExtension +ScsiPortGetVirtualAddress +ScsiPortInitialize +ScsiPortIoMapTransfer +ScsiPortLogError +ScsiPortMoveMemory +ScsiPortNotification +ScsiPortReadPortBufferUchar=HAL.READ_PORT_BUFFER_UCHAR +ScsiPortReadPortBufferUshort=HAL.READ_PORT_BUFFER_USHORT +ScsiPortReadPortBufferUlong=HAL.READ_PORT_BUFFER_ULONG +ScsiPortReadPortUchar=HAL.READ_PORT_UCHAR +ScsiPortReadPortUshort=HAL.READ_PORT_USHORT +ScsiPortReadPortUlong=HAL.READ_PORT_ULONG +ScsiPortReadRegisterBufferUchar=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +ScsiPortReadRegisterBufferUshort=NTOSKRNL.READ_REGISTER_BUFFER_USHORT +ScsiPortReadRegisterBufferUlong=NTOSKRNL.READ_REGISTER_BUFFER_ULONG +ScsiPortReadRegisterUchar=NTOSKRNL.READ_REGISTER_UCHAR +ScsiPortReadRegisterUshort=NTOSKRNL.READ_REGISTER_USHORT +ScsiPortReadRegisterUlong=NTOSKRNL.READ_REGISTER_ULONG +ScsiPortSetBusDataByOffset +ScsiPortStallExecution=HAL.KeStallExecutionProcessor +ScsiPortValidateRange +ScsiPortWritePortUchar=HAL.WRITE_PORT_UCHAR +ScsiPortWritePortUshort=HAL.WRITE_PORT_USHORT +ScsiPortWritePortUlong=HAL.WRITE_PORT_ULONG +ScsiPortWritePortBufferUchar=HAL.WRITE_PORT_BUFFER_UCHAR +ScsiPortWritePortBufferUshort=HAL.WRITE_PORT_BUFFER_USHORT +ScsiPortWritePortBufferUlong=HAL.WRITE_PORT_BUFFER_ULONG +ScsiPortWriteRegisterBufferUchar=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +ScsiPortWriteRegisterBufferUshort=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +ScsiPortWriteRegisterBufferUlong=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +ScsiPortWriteRegisterUchar=NTOSKRNL.WRITE_REGISTER_UCHAR +ScsiPortWriteRegisterUshort=NTOSKRNL.WRITE_REGISTER_USHORT +ScsiPortWriteRegisterUlong=NTOSKRNL.WRITE_REGISTER_ULONG +;EOF Propchange: trunk/reactos/drivers/storage/scsiport/scsiport_arm.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/storage/scsiport/scsiport_arm.def ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=32223&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild (original) +++ trunk/reactos/hal/hal.rbuild Fri Feb 8 20:13:09 2008 @@ -14,4 +14,9 @@ <xi:include href="halppc/directory.rbuild" /> </directory> </if> + <if property="ARCH" value="arm"> + <directory name="halarm"> + <xi:include href="halarm/directory.rbuild" /> + </directory> + </if> </group> Modified: trunk/reactos/hal/hal/hal_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal_arm.def?rev=32… ============================================================================== --- trunk/reactos/hal/hal/hal_arm.def (original) +++ trunk/reactos/hal/hal/hal_arm.def Fri Feb 8 20:13:09 2008 @@ -78,6 +78,7 @@ KeFlushWriteBuffer KeGetCurrentIrql KeLowerIrql +KeSwapIrql KeQueryPerformanceCounter KeRaiseIrql KeRaiseIrqlToDpcLevel Added: trunk/reactos/hal/halarm/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halarm/directory.rbuild (added) +++ trunk/reactos/hal/halarm/directory.rbuild Fri Feb 8 20:13:09 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="generic"> + <xi:include href="generic/generic.rbuild" /> + </directory> + <directory name="up"> + <xi:include href="up/halup.rbuild" /> + </directory> +</group> Propchange: trunk/reactos/hal/halarm/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/hal/halarm/directory.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/hal/halarm/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/generic… ============================================================================== --- trunk/reactos/hal/halarm/generic/generic.rbuild (added) +++ trunk/reactos/hal/halarm/generic/generic.rbuild Fri Feb 8 20:13:09 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="halarm_generic" type="objectlibrary"> + <include base="halarm_generic">../include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <file>hal.c</file> + <pch>../include/hal.h</pch> +</module> Propchange: trunk/reactos/hal/halarm/generic/generic.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/hal/halarm/generic/generic.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c (added) +++ trunk/reactos/hal/halarm/generic/hal.c Fri Feb 8 20:13:09 2008 @@ -1,0 +1,1092 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: hal/hal.c + * PURPOSE: Hardware Abstraction Layer DLL + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * REVISION HISTORY: + * 01-08-2001 CSH Created + */ + +/* INCLUDES ******************************************************************/ + +#include <ntddk.h> +#include <ntdddisk.h> +#include <arc/arc.h> +#include <intrin.h> +#include <ndk/halfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdfuncs.h> + +#define NDEBUG +#include <debug.h> + +#undef ExAcquireFastMutex +#undef ExReleaseFastMutex +#undef ExTryToAcquireFastMutex + +/* DATA **********************************************************************/ + +ULONG _KdComPortInUse = 0; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + +/* +* @unimplemented +*/ +VOID +NTAPI +HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) +{ + KEBUGCHECK(0); + return; +} + +/* +* @unimplemented +*/ +VOID +NTAPI +HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) +{ + KEBUGCHECK(0); + return; +} + +/* +* @unimplemented +*/ +ULONG_PTR +NTAPI +HalSetProfileInterval(IN ULONG_PTR Interval) +{ + KEBUGCHECK(0); + return Interval; +} + +VOID +FASTCALL +ExAcquireFastMutex( + PFAST_MUTEX FastMutex) +{ + UNIMPLEMENTED; +} + + +VOID +FASTCALL +ExReleaseFastMutex( + PFAST_MUTEX FastMutex) +{ + UNIMPLEMENTED; +} + + +BOOLEAN FASTCALL +ExTryToAcquireFastMutex( + PFAST_MUTEX FastMutex) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalAcquireDisplayOwnership( + PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) +{ + UNIMPLEMENTED; +} + + +NTSTATUS +NTAPI +HalAdjustResourceList( + PCM_RESOURCE_LIST Resources) +{ + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + + +BOOLEAN +NTAPI +HalAllProcessorsStarted(VOID) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +NTSTATUS +NTAPI +HalAllocateAdapterChannel( + PADAPTER_OBJECT AdapterObject, + PWAIT_CONTEXT_BLOCK WaitContextBlock, + ULONG NumberOfMapRegisters, + PDRIVER_CONTROL ExecutionRoutine) +{ + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + + +PVOID +NTAPI +HalAllocateCommonBuffer( + PADAPTER_OBJECT AdapterObject, + ULONG Length, + PPHYSICAL_ADDRESS LogicalAddress, + BOOLEAN CacheEnabled) +{ + UNIMPLEMENTED; + + return NULL; +} + + +PVOID +NTAPI +HalAllocateCrashDumpRegisters( + PADAPTER_OBJECT AdapterObject, + PULONG NumberOfMapRegisters) +{ + UNIMPLEMENTED; + return NULL; +} + + +NTSTATUS +NTAPI +HalAssignSlotResources( + PUNICODE_STRING RegistryPath, + PUNICODE_STRING DriverClassName, + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT DeviceObject, + INTERFACE_TYPE BusType, + ULONG BusNumber, + ULONG SlotNumber, + PCM_RESOURCE_LIST *AllocatedResources) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +BOOLEAN +NTAPI +HalBeginSystemInterrupt (KIRQL Irql, + ULONG Vector, + PKIRQL OldIrql) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalCalibratePerformanceCounter( + volatile LONG *Count, + ULONGLONG NewCount) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalDisableSystemInterrupt( + ULONG Vector, + KIRQL Irql) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalDisplayString( + PCH String) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalEnableSystemInterrupt( + ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalEndSystemInterrupt( + KIRQL Irql, + ULONG Unknown2) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalFlushCommonBuffer( + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4, + ULONG Unknown5) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalFreeCommonBuffer( + PADAPTER_OBJECT AdapterObject, + ULONG Length, + PHYSICAL_ADDRESS LogicalAddress, + PVOID VirtualAddress, + BOOLEAN CacheEnabled) +{ + UNIMPLEMENTED; +} + + +PADAPTER_OBJECT +NTAPI +HalGetAdapter( + PDEVICE_DESCRIPTION DeviceDescription, + PULONG NumberOfMapRegisters) +{ + UNIMPLEMENTED; + + return (PADAPTER_OBJECT)NULL; +} + + +ULONG +NTAPI +HalGetBusData( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +ULONG +NTAPI +HalGetBusDataByOffset( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Offset, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +ARC_STATUS +NTAPI +HalGetEnvironmentVariable( + PCH Name, + USHORT ValueLength, + PCH Value) +{ + UNIMPLEMENTED; + + return ENOENT; +} + + +ULONG +NTAPI +HalGetInterruptVector( + INTERFACE_TYPE InterfaceType, + ULONG BusNumber, + ULONG BusInterruptLevel, + ULONG BusInterruptVector, + PKIRQL Irql, + PKAFFINITY Affinity) +{ + UNIMPLEMENTED; + + return 0; +} + + +VOID +NTAPI +HalHandleNMI( + PVOID NmiData) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalInitSystem( + ULONG BootPhase, + PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalInitializeProcessor(ULONG ProcessorNumber, + PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalMakeBeep( + ULONG Frequency) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalProcessorIdle(VOID) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalQueryDisplayOwnership(VOID) +{ + UNIMPLEMENTED; + + return FALSE; +} + + +VOID +NTAPI +HalQueryDisplayParameters( + OUT PULONG DispSizeX, + OUT PULONG DispSizeY, + OUT PULONG CursorPosX, + OUT PULONG CursorPosY) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalQueryRealTimeClock( + PTIME_FIELDS Time) +{ + UNIMPLEMENTED; + return FALSE; +} + + +ULONG +NTAPI +HalReadDmaCounter( + PADAPTER_OBJECT AdapterObject) +{ + UNIMPLEMENTED; + + return 0; +} + + +VOID +NTAPI +HalReleaseDisplayOwnership(VOID) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +HalReportResourceUsage(VOID) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +HalRequestIpi( + ULONG Unknown) +{ + UNIMPLEMENTED; +} + + +VOID +FASTCALL +HalRequestSoftwareInterrupt( + KIRQL Request) +{ + UNIMPLEMENTED; +} + +VOID FASTCALL +HalClearSoftwareInterrupt( + IN KIRQL Request) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +HalReturnToFirmware( + FIRMWARE_REENTRY Action) +{ + UNIMPLEMENTED; +} + + +ULONG +NTAPI +HalSetBusData( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +ULONG +NTAPI +HalSetBusDataByOffset( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Offset, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +VOID +NTAPI +HalSetDisplayParameters( + ULONG CursorPosX, + ULONG CursorPosY) +{ + UNIMPLEMENTED; +} + + +ARC_STATUS +NTAPI +HalSetEnvironmentVariable( + PCH Name, + PCH Value) +{ + UNIMPLEMENTED; + + return ESUCCESS; +} + + +BOOLEAN +NTAPI +HalSetRealTimeClock( + PTIME_FIELDS Time) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +ULONG +NTAPI +HalSetTimeIncrement( + ULONG Increment) +{ + UNIMPLEMENTED; + + return Increment; +} + + +BOOLEAN +NTAPI +HalStartNextProcessor(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PKPROCESSOR_STATE ProcessorState) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +ULONG +FASTCALL +HalSystemVectorDispatchEntry( + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3) +{ + UNIMPLEMENTED; + + return 0; +} + + +BOOLEAN +NTAPI +HalTranslateBusAddress( + INTERFACE_TYPE InterfaceType, + ULONG BusNumber, + PHYSICAL_ADDRESS BusAddress, + PULONG AddressSpace, + PPHYSICAL_ADDRESS TranslatedAddress) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalpAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + OUT PSTRING NtSystemPathString) +{ + /* Call the kernel */ + IoAssignDriveLetters(LoaderBlock, + NtDeviceName, + NtSystemPath, + NtSystemPathString); +} + +NTSTATUS +NTAPI +HalpReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) +{ + /* Call the kernel */ + return IoReadPartitionTable(DeviceObject, + SectorSize, + ReturnRecognizedPartitions, + PartitionBuffer); +} + +NTSTATUS +NTAPI +HalpWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) +{ + /* Call the kernel */ + return IoWritePartitionTable(DeviceObject, + SectorSize, + SectorsPerTrack, + NumberOfHeads, + PartitionBuffer); +} + +NTSTATUS +NTAPI +HalpSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType) +{ + /* Call the kernel */ + return IoSetPartitionInformation(DeviceObject, + SectorSize, + PartitionNumber, + PartitionType); +} + + +BOOLEAN +NTAPI +IoFlushAdapterBuffers( + PADAPTER_OBJECT AdapterObject, + PMDL Mdl, + PVOID MapRegisterBase, + PVOID CurrentVa, + ULONG Length, + BOOLEAN WriteToDevice) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +IoFreeAdapterChannel( + PADAPTER_OBJECT AdapterObject) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +IoFreeMapRegisters( + PADAPTER_OBJECT AdapterObject, + PVOID MapRegisterBase, + ULONG NumberOfMapRegisters) +{ + UNIMPLEMENTED; +} + + +PHYSICAL_ADDRESS +NTAPI +IoMapTransfer( + PADAPTER_OBJECT AdapterObject, + PMDL Mdl, + PVOID MapRegisterBase, + PVOID CurrentVa, + PULONG Length, + BOOLEAN WriteToDevice) +{ + PHYSICAL_ADDRESS Address; + + UNIMPLEMENTED; + + Address.QuadPart = 0; + + return Address; +} + + +#undef KeAcquireSpinLock +VOID +NTAPI +KeAcquireSpinLock( + PKSPIN_LOCK SpinLock, + PKIRQL OldIrql) +{ + UNIMPLEMENTED; +} + + +KIRQL +FASTCALL +KeAcquireSpinLockRaiseToSynch( + PKSPIN_LOCK SpinLock) +{ + UNIMPLEMENTED; + + return 0; +} + + +VOID +FASTCALL +KeAcquireInStackQueuedSpinLock( + IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle + ) +{ + UNIMPLEMENTED; +} + +VOID +FASTCALL +KeAcquireInStackQueuedSpinLockRaiseToSynch( + IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle + ) +{ + UNIMPLEMENTED; +} + +VOID +FASTCALL +KeReleaseInStackQueuedSpinLock( + IN PKLOCK_QUEUE_HANDLE LockHandle + ) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +KeFlushWriteBuffer(VOID) +{ + UNIMPLEMENTED; +} + +#undef KeGetCurrentIrql +KIRQL +NTAPI +KeGetCurrentIrql(VOID) +{ + UNIMPLEMENTED; + + return (KIRQL)0; +} + +#undef KeLowerIrql +VOID +NTAPI +KeLowerIrql( + KIRQL NewIrql) +{ + UNIMPLEMENTED; +} + + +LARGE_INTEGER +NTAPI +KeQueryPerformanceCounter( + PLARGE_INTEGER PerformanceFreq) +{ + LARGE_INTEGER Value; + + UNIMPLEMENTED; + + Value.QuadPart = 0; + + return Value; +} + +#undef KeRaiseIrql +VOID +NTAPI +KeRaiseIrql( + KIRQL NewIrql, + PKIRQL OldIrql) +{ + UNIMPLEMENTED; +} + + +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel(VOID) +{ + UNIMPLEMENTED; + + return (KIRQL)0; +} + + +KIRQL +NTAPI +KeRaiseIrqlToSynchLevel(VOID) +{ + UNIMPLEMENTED; + + return (KIRQL)0; +} + +#undef KeReleaseSpinLock +VOID +NTAPI +KeReleaseSpinLock( + PKSPIN_LOCK SpinLock, + KIRQL NewIrql) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +KeStallExecutionProcessor( + ULONG Microseconds) +{ + UNIMPLEMENTED; +} + + +LOGICAL +FASTCALL +KeTryToAcquireQueuedSpinLock( + KSPIN_LOCK_QUEUE_NUMBER LockNumber, + PKIRQL OldIrql) +{ + UNIMPLEMENTED; + + return FALSE; +} + + +BOOLEAN +FASTCALL +KeTryToAcquireQueuedSpinLockRaiseToSynch( + KSPIN_LOCK_QUEUE_NUMBER LockNumber, + PKIRQL OldIrql) +{ + UNIMPLEMENTED; + + return FALSE; +} + + +KIRQL +FASTCALL +KfAcquireSpinLock( + PKSPIN_LOCK SpinLock) +{ + UNIMPLEMENTED; + + return (KIRQL)0; +} + + +VOID +FASTCALL +KfLowerIrql( + KIRQL NewIrql) +{ + UNIMPLEMENTED; +} + + +KIRQL +FASTCALL +KfRaiseIrql( + KIRQL NewIrql) +{ + UNIMPLEMENTED; + + return (KIRQL)0; +} + + +VOID +FASTCALL +KfReleaseSpinLock( + PKSPIN_LOCK SpinLock, + KIRQL NewIrql) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +READ_PORT_BUFFER_UCHAR( + PUCHAR Port, + PUCHAR Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +READ_PORT_BUFFER_ULONG( + PULONG Port, + PULONG Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +READ_PORT_BUFFER_USHORT( + PUSHORT Port, + PUSHORT Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +UCHAR +NTAPI +READ_PORT_UCHAR( + PUCHAR Port) +{ + UNIMPLEMENTED; + + return 0; +} + + +ULONG +NTAPI +READ_PORT_ULONG( + PULONG Port) +{ + UNIMPLEMENTED; + + return 0; +} + + +USHORT +NTAPI +READ_PORT_USHORT( + PUSHORT Port) +{ + UNIMPLEMENTED; + + return 0; +} + + +VOID +NTAPI +WRITE_PORT_BUFFER_UCHAR( + PUCHAR Port, + PUCHAR Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +WRITE_PORT_BUFFER_USHORT( + PUSHORT Port, + PUSHORT Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +WRITE_PORT_BUFFER_ULONG( + PULONG Port, + PULONG Buffer, + ULONG Count) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +WRITE_PORT_UCHAR( + PUCHAR Port, + UCHAR Value) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WRITE_PORT_ULONG( + PULONG Port, + ULONG Value) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WRITE_PORT_USHORT( + PUSHORT Port, + USHORT Value) +{ + UNIMPLEMENTED; +} + +KIRQL +FASTCALL +KeAcquireQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNIMPLEMENTED; + return (KIRQL)0; +} + +KIRQL +FASTCALL +KeAcquireQueuedSpinLockRaiseToSynch(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNIMPLEMENTED; + return (KIRQL)0; +} + +VOID +FASTCALL +KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle, + IN KIRQL OldIrql) +{ + UNIMPLEMENTED; +} + +KIRQL +KeSwapIrql(IN KIRQL Irql) +{ + UNIMPLEMENTED; + return 0; +} +/* EOF */ Propchange: trunk/reactos/hal/halarm/generic/hal.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/hal/halarm/generic/hal.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/hal/halarm/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halarm/include/hal.h (added) +++ trunk/reactos/hal/halarm/include/hal.h Fri Feb 8 20:13:09 2008 @@ -1,0 +1,43 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Hardware Abstraction Layer + * FILE: hal/halx86/include/hal.h + * PURPOSE: HAL Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +/* C Headers */ +#include <stdio.h> + +/* WDK HAL Compilation hack */ +#ifdef _MSC_VER +#include <excpt.h> +#include <ntdef.h> +#undef _NTHAL_ +#undef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT +#define __declspec(dllimport) +#endif + +/* IFS/DDK/NDK Headers */ +#include <ntifs.h> +#include <bugcodes.h> +#include <ntdddisk.h> +#include <arc/arc.h> +#include <iotypes.h> +#include <kefuncs.h> +#include <intrin.h> +#include <halfuncs.h> +#include <iofuncs.h> +#include <ldrtypes.h> +#include <obfuncs.h> + +/* Internal HAL Headers */ +#include "halp.h" + +/* Helper Header */ +#include <reactos/helper.h> + +/* EOF */ Propchange: trunk/reactos/hal/halarm/include/hal.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/hal/halarm/include/hal.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/hal/halarm/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halarm/include/halp.h (added) +++ trunk/reactos/hal/halarm/include/halp.h Fri Feb 8 20:13:09 2008 @@ -1,0 +1,114 @@ +/* + * + */ + +#ifndef __INTERNAL_HAL_HAL_H +#define __INTERNAL_HAL_HAL_H + +/* WDK Hack */ +#define KdComPortInUse _KdComPortInUse + +#define HAL_APC_REQUEST 0 +#define HAL_DPC_REQUEST 1 + +/* Conversion functions */ +#define BCD_INT(bcd) \ + (((bcd & 0xF0) >> 4) * 10 + (bcd & 0x0F)) +#define INT_BCD(int) \ + (UCHAR)(((int / 10) << 4) + (int % 10)) + +/* adapter.c */ +PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); + +/* bus.c */ +VOID NTAPI HalpInitNonBusHandler (VOID); + +/* irql.c */ +VOID NTAPI HalpInitPICs(VOID); + +/* udelay.c */ +VOID NTAPI HalpInitializeClock(VOID); + +/* pci.c */ +VOID HalpInitPciBus (VOID); + +/* dma.c */ +VOID HalpInitDma (VOID); + +/* Non-generic initialization */ +VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock); +VOID HalpInitPhase1(VOID); +VOID NTAPI HalpClockInterrupt(VOID); + +// +// KD Support +// +VOID +NTAPI +HalpCheckPowerButton( + VOID +); + +VOID +NTAPI +HalpRegisterKdSupportFunctions( + VOID +); + +NTSTATUS +NTAPI +HalpSetupPciDeviceForDebugging( + IN PVOID LoaderBlock, + IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice +); + +NTSTATUS +NTAPI +HalpReleasePciDeviceForDebugging( + IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice +); + +// +// Memory routines +// +PVOID +NTAPI +HalpMapPhysicalMemory64( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG NumberPage +); + +VOID +NTAPI +HalpUnmapVirtualAddress( + IN PVOID VirtualAddress, + IN ULONG NumberPages +); + +/* sysinfo.c */ +NTSTATUS +NTAPI +HaliQuerySystemInformation( + IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength +); + +NTSTATUS +NTAPI +HaliSetSystemInformation( + IN HAL_SET_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer +); + +typedef struct tagHALP_HOOKS +{ + void (*InitPciBus)(ULONG BusNumber, PBUS_HANDLER BusHandler); +} HALP_HOOKS, *PHALP_HOOKS; + +extern HALP_HOOKS HalpHooks; +extern KSPIN_LOCK HalpSystemHardwareLock; + +#endif /* __INTERNAL_HAL_HAL_H */ Propchange: trunk/reactos/hal/halarm/include/halp.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/hal/halarm/include/halp.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/hal/halarm/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halarm/up/halinit_up.c (added) +++ trunk/reactos/hal/halarm/up/halinit_up.c Fri Feb 8 20:13:09 2008 @@ -1,0 +1,32 @@ +/* $Id: halinit_up.c 24964 2006-11-29 08:28:20Z ion $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/hal/x86/halinit.c + * PURPOSE: Initalize the x86 hal + * PROGRAMMER: David Welch (welch(a)cwcom.net) + * UPDATE HISTORY: + * 11/06/98: Created + */ + +/* INCLUDES *****************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ***************************************************************/ + +VOID +HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + +} + +VOID +HalpInitPhase1(VOID) +{ + +} + +/* EOF */ Propchange: trunk/reactos/hal/halarm/up/halinit_up.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/hal/halarm/up/halinit_up.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/hal/halarm/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halarm/up/halup.rbuild (added) +++ trunk/reactos/hal/halarm/up/halup.rbuild Fri Feb 8 20:13:09 2008 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="halarm_up" type="kernelmodedll"> + <importlibrary definition="../../hal/hal_arm.def" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <include base="halarm_generic">../include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <library>halarm_generic</library> + <library>ntoskrnl</library> + <file>halinit_up.c</file> + <file>halup.rc</file> +</module> Propchange: trunk/reactos/hal/halarm/up/halup.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/hal/halarm/up/halup.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/hal/halarm/up/halup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halup.rc?rev… ============================================================================== --- trunk/reactos/hal/halarm/up/halup.rc (added) +++ trunk/reactos/hal/halarm/up/halup.rc Fri Feb 8 20:13:09 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "X86 Uniprocessor Hardware Abstraction Layer\0" +#define REACTOS_STR_INTERNAL_NAME "halup\0" +#define REACTOS_STR_ORIGINAL_FILENAME "halup.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/hal/halarm/up/halup.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/hal/halarm/up/halup.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Fri Feb 8 20:13:09 2008 @@ -1,7 +1,6 @@ #include <internal/arm/asmmacro.S> GENERATE_ARM_STUB KiSwapContext -GENERATE_ARM_STUB KeSwapIrql GENERATE_ARM_STUB DbgBreakPointWithStatus GENERATE_ARM_STUB ExInterlockedAddLargeInteger GENERATE_ARM_STUB ExInterlockedAddLargeStatistic

1 0

[fireball] 32222: Kamil Hornicek <tykef@atlas.cz> - Convert advapi32 to use wine-style debug macros.
by fireball＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: fireball Date: Fri Feb 8 20:04:39 2008 New Revision: 32222 URL: http://svn.reactos.org/svn/reactos?rev=32222&view=rev Log: Kamil Hornicek <tykef(a)atlas.cz> - Convert advapi32 to use wine-style debug macros. Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/advapi32/misc/msi.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/dll/win32/advapi32/sec/audit.c trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/advapi32/sec/trustee.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/dll/win32/advapi32/token/token.c Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c Fri Feb 8 20:04:39 2008 @@ -29,8 +29,9 @@ #include "crypt.h" #include <winefs.h> -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(crypt); + /* * Note: this code is harmless on little-endian machines. @@ -174,7 +175,7 @@ return FALSE; } - DPRINT1("FIXME (%s, %p): not verifying image\n", lpszImage, pData); + FIXME("(%s, %p): not verifying image\n", lpszImage, pData); return TRUE; } @@ -202,7 +203,7 @@ if ( !(provider->hModule = LoadLibraryW(pImage)) ) { errorcode = (GetLastError() == ERROR_FILE_NOT_FOUND) ? NTE_PROV_DLL_NOT_FOUND : NTE_PROVIDER_DLL_FAIL; - DPRINT("Failed to load dll %S\n", pImage); + FIXME("Failed to load dll %S\n", pImage); goto error; } provider->dwMagic = MAGIC_CRYPTPROV; @@ -292,7 +293,7 @@ static const WCHAR typeW[] = {'T','y','p','e',0}; static const WCHAR imagepathW[] = {'I','m','a','g','e',' ','P','a','t','h',0}; - DPRINT("(%p, %S, %S, %d, %08x)\n", phProv, pszContainer, + TRACE("(%p, %S, %S, %d, %08x)\n", phProv, pszContainer, pszProvider, dwProvType, dwFlags); if (dwProvType < 1 || dwProvType > MAXPROVTYPES) @@ -313,7 +314,7 @@ * then try the machine default CSP */ if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, TRUE)) ) { - DPRINT("No provider registered for crypto provider type %d.\n", dwProvType); + WARN("No provider registered for crypto provider type %d.\n", dwProvType); SetLastError(NTE_PROV_TYPE_NOT_DEF); return FALSE; } @@ -321,13 +322,13 @@ { CRYPT_Free(keyname); if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, FALSE)) ) { - DPRINT("No type registered for crypto provider type %d.\n", dwProvType); + TRACE("No type registered for crypto provider type %d.\n", dwProvType); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_NOT_DEF); goto error; } if (RegOpenKeyW(HKEY_LOCAL_MACHINE, keyname, &key)) { - DPRINT("Did not find registry entry of crypto provider for %S.\n", keyname); + TRACE("Did not find registry entry of crypto provider for %S.\n", keyname); CRYPT_Free(keyname); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_NOT_DEF); @@ -338,7 +339,7 @@ r = RegQueryValueExW(key, nameW, NULL, &keytype, NULL, &len); if( r != ERROR_SUCCESS || !len || keytype != REG_SZ) { - DPRINT("error %d reading size of 'Name' from registry\n", r ); + TRACE("error %d reading size of 'Name' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; @@ -352,7 +353,7 @@ r = RegQueryValueExW(key, nameW, NULL, NULL, (LPBYTE)provname, &len); if( r != ERROR_SUCCESS ) { - DPRINT("error %d reading 'Name' from registry\n", r ); + TRACE("error %d reading 'Name' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; @@ -384,7 +385,7 @@ } if (type != dwProvType) { - DPRINT("Crypto provider has wrong type (%d vs expected %d).\n", type, dwProvType); + TRACE("Crypto provider has wrong type (%d vs expected %d).\n", type, dwProvType); SetLastError(NTE_PROV_TYPE_NO_MATCH); goto error; } @@ -392,7 +393,7 @@ r = RegQueryValueExW(key, imagepathW, NULL, &keytype, NULL, &len); if ( r != ERROR_SUCCESS || keytype != REG_SZ) { - DPRINT("error %d reading size of 'Image Path' from registry\n", r ); + TRACE("error %d reading size of 'Image Path' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; @@ -406,7 +407,7 @@ r = RegQueryValueExW(key, imagepathW, NULL, NULL, (LPBYTE)temp, &len); if( r != ERROR_SUCCESS ) { - DPRINT("error %d reading 'Image Path' from registry\n", r ); + TRACE("error %d reading 'Image Path' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; @@ -493,7 +494,7 @@ PWSTR pProvider = NULL, pContainer = NULL; BOOL ret = FALSE; - DPRINT("(%p, %s, %s, %d, %08x)\n", phProv, pszContainer, + TRACE("(%p, %s, %s, %d, %08x)\n", phProv, pszContainer, pszProvider, dwProvType, dwFlags); if ( !CRYPT_ANSIToUnicode(pszContainer, &pContainer, -1) ) @@ -535,7 +536,7 @@ { PCRYPTPROV pProv = (PCRYPTPROV)hProv; - DPRINT("(0x%lx, %p, %08lx)\n", hProv, pdwReserved, dwFlags); + TRACE("(0x%lx, %p, %08lx)\n", hProv, pdwReserved, dwFlags); if (!pProv) { @@ -565,7 +566,7 @@ PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - DPRINT("(0x%lx, %08ld)\n", hProv, dwFlags); + TRACE("(0x%lx, %08ld)\n", hProv, dwFlags); if (!pProv) { @@ -610,7 +611,7 @@ { PCRYPTPROV prov = (PCRYPTPROV)hProv; - DPRINT("(0x%lx, %ld, %p)\n", hProv, dwLen, pbBuffer); + TRACE("(0x%lx, %ld, %p)\n", hProv, dwLen, pbBuffer); if (!hProv) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -644,7 +645,7 @@ PCRYPTKEY key = (PCRYPTKEY)hKey; PCRYPTHASH hash; - DPRINT("(0x%lx, 0x%x, 0x%lx, %08lx, %p)\n", hProv, Algid, hKey, dwFlags, phHash); + TRACE("(0x%lx, 0x%x, 0x%lx, %08lx, %p)\n", hProv, Algid, hKey, dwFlags, phHash); if (!prov) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -695,7 +696,7 @@ PCRYPTKEY key = (PCRYPTKEY)hKey; PCRYPTHASH hash = (PCRYPTHASH)hHash; - DPRINT("(0x%lx, 0x%lx, %d, %08lx, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen); + TRACE("(0x%lx, 0x%lx, %d, %08lx, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen); if (!key || !pbData || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -728,7 +729,7 @@ PCRYPTHASH hash = (PCRYPTHASH)hBaseData; PCRYPTKEY key; - DPRINT("(0x%lx, 0x%08x, 0x%lx, 0x%08lx, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey); + TRACE("(0x%lx, 0x%08x, 0x%lx, 0x%08lx, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey); if (!prov || !hash) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -768,7 +769,7 @@ PCRYPTPROV prov; BOOL ret; - DPRINT("(0x%lx)\n", hHash); + TRACE("(0x%lx)\n", hHash); if (!hash) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -797,7 +798,7 @@ PCRYPTPROV prov; BOOL ret; - DPRINT("(0x%lx)\n", hKey); + TRACE("(0x%lx)\n", hKey); if (!key) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -829,7 +830,7 @@ PCRYPTPROV prov; PCRYPTHASH orghash, newhash; - DPRINT("(0x%lx, %p, %08ld, %p)\n", hHash, pdwReserved, dwFlags, phHash); + TRACE("(0x%lx, %p, %08ld, %p)\n", hHash, pdwReserved, dwFlags, phHash); orghash = (PCRYPTHASH)hHash; if (!orghash || pdwReserved || !phHash) @@ -872,7 +873,7 @@ PCRYPTPROV prov; PCRYPTKEY orgkey, newkey; - DPRINT("(0x%lx, %p, %08ld, %p)\n", hKey, pdwReserved, dwFlags, phKey); + TRACE("(0x%lx, %p, %08ld, %p)\n", hKey, pdwReserved, dwFlags, phKey); orgkey = (PCRYPTKEY)hKey; if (!orgkey || pdwReserved || !phKey) @@ -925,7 +926,7 @@ PCRYPTKEY key = (PCRYPTKEY)hKey; PCRYPTHASH hash = (PCRYPTHASH)hHash; - DPRINT("(0x%lx, 0x%lx, %d, %08ld, %p, %p, %ld)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen); + TRACE("(0x%lx, 0x%lx, %d, %08ld, %p, %p, %ld)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen); if (!key || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -962,7 +963,7 @@ { HKEY hKey; - DPRINT("(%ld, %p, %ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, + TRACE("(%ld, %p, %ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName); if (pdwReserved || !pcbProvName) @@ -1026,7 +1027,7 @@ DWORD strlen; BOOL ret; /* = FALSE; */ - DPRINT("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, + TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName); strlen = *pcbProvName * sizeof(WCHAR); @@ -1072,7 +1073,7 @@ PSTR keyname, ch; DWORD result; - DPRINT("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, + TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); if (pdwReserved || !pdwProvType || !pcbTypeName) @@ -1123,7 +1124,7 @@ DWORD strlen; BOOL ret; - DPRINT("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, + TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); strlen = *pcbTypeName / sizeof(WCHAR); if (pszTypeName && !(str = CRYPT_Alloc(strlen))) @@ -1165,7 +1166,7 @@ PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey, expkey = (PCRYPTKEY)hExpKey; - DPRINT("(0x%lx, 0x%lx, %ld, %08ld, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen); + TRACE("(0x%lx, 0x%lx, %ld, %08ld, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen); if (!key || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1195,7 +1196,7 @@ PCRYPTPROV prov = (PCRYPTPROV)hProv; PCRYPTKEY key; - DPRINT("(0x%lx, %d, %08ld, %p)\n", hProv, Algid, dwFlags, phKey); + TRACE("(0x%lx, %d, %08ld, %p)\n", hProv, Algid, dwFlags, phKey); if (!prov) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -1300,7 +1301,7 @@ DWORD strlen; BOOL ret = FALSE; - DPRINT("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName); + TRACE("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName); CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &strlen); if ( pszProvName && !(str = CRYPT_Alloc(strlen)) ) @@ -1349,7 +1350,7 @@ PCRYPTPROV prov; PCRYPTHASH hash = (PCRYPTHASH)hHash; - DPRINT("(0x%lx, %ld, %p, %p, %08ld)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags); + TRACE("(0x%lx, %ld, %p, %p, %08ld)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags); if (!hash || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1384,7 +1385,7 @@ PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey; - DPRINT("(0x%lx, %ld, %p, %p, %08ld)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags); + TRACE("(0x%lx, %ld, %p, %p, %08ld)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags); if (!key || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1418,7 +1419,7 @@ { PCRYPTPROV prov = (PCRYPTPROV)hProv; - DPRINT("(0x%lx, %ld, %p, %p, %08ld)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags); + TRACE("(0x%lx, %ld, %p, %p, %08ld)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags); return prov->pFuncs->pCPGetProvParam(prov->hPrivate, dwParam, pbData, pdwDataLen, dwFlags); } @@ -1442,7 +1443,7 @@ PCRYPTPROV prov = (PCRYPTPROV)hProv; PCRYPTKEY key; - DPRINT("(0x%lx, %ld, %p)\n", hProv, dwKeySpec, phUserKey); + TRACE("(0x%lx, %ld, %p)\n", hProv, dwKeySpec, phUserKey); if (!prov) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -1485,7 +1486,7 @@ PCRYPTHASH hash = (PCRYPTHASH)hHash; PCRYPTPROV prov; - DPRINT("(0x%lx, %p, %ld, %08ld)\n", hHash, pbData, dwDataLen, dwFlags); + TRACE("(0x%lx, %p, %ld, %08ld)\n", hHash, pbData, dwDataLen, dwFlags); if (!hash) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -1514,7 +1515,7 @@ PCRYPTKEY key = (PCRYPTKEY)hKey; PCRYPTPROV prov; - DPRINT("(0x%lx, 0x%lx, %08ld)\n", hHash, hKey, dwFlags); + TRACE("(0x%lx, 0x%lx, %08ld)\n", hHash, hKey, dwFlags); if (!hash || !key) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -1544,7 +1545,7 @@ PCRYPTPROV prov = (PCRYPTPROV)hProv; PCRYPTKEY pubkey = (PCRYPTKEY)hPubKey, importkey; - DPRINT("(0x%lx, %p, %ld, 0x%lx, %08ld, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); + TRACE("(0x%lx, %p, %ld, 0x%lx, %08ld, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); if (!prov || !pbData || !dwDataLen || !phKey) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1602,11 +1603,11 @@ PCRYPTHASH hash = (PCRYPTHASH)hHash; PCRYPTPROV prov; - DPRINT("(0x%lx, %ld, %08ld, %p, %p)\n", hHash, dwKeySpec, dwFlags, pbSignature, pdwSigLen); + TRACE("(0x%lx, %ld, %08ld, %p, %p)\n", hHash, dwKeySpec, dwFlags, pbSignature, pdwSigLen); if (sDescription) { /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/seccrypto/… */ - DPRINT("The sDescription parameter is not supported (and no longer used). Ignoring.\n"); + WARN("The sDescription parameter is not supported (and no longer used). Ignoring.\n"); } if (!hash) @@ -1640,7 +1641,7 @@ PCRYPTPROV prov; PCRYPTHASH hash = (PCRYPTHASH)hHash; - DPRINT("(0x%lx, %ld, %p, %08ld)\n", hHash, dwParam, pbData, dwFlags); + TRACE("(0x%lx, %ld, %p, %08ld)\n", hHash, dwParam, pbData, dwFlags); if (!hash || !pbData) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1670,7 +1671,7 @@ PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey; - DPRINT("(0x%lx, %ld, %p, %08ld)\n", hKey, dwParam, pbData, dwFlags); + TRACE("(0x%lx, %ld, %p, %08ld)\n", hKey, dwParam, pbData, dwFlags); if (!key || !pbData) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1695,7 +1696,7 @@ */ BOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType) { - DPRINT("(%s, %ld)\n", pszProvName, dwProvType); + TRACE("(%s, %ld)\n", pszProvName, dwProvType); return CryptSetProviderExA(pszProvName, dwProvType, NULL, CRYPT_USER_DEFAULT); } @@ -1706,7 +1707,7 @@ */ BOOL WINAPI CryptSetProviderW (LPCWSTR pszProvName, DWORD dwProvType) { - DPRINT("(%S, %ld)\n", pszProvName, dwProvType); + TRACE("(%S, %ld)\n", pszProvName, dwProvType); return CryptSetProviderExW(pszProvName, dwProvType, NULL, CRYPT_USER_DEFAULT); } @@ -1731,7 +1732,7 @@ PWSTR keyname; static const WCHAR nameW[] = {'N','a','m','e',0}; - DPRINT("(%S, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags); + TRACE("(%S, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags); if (!pszProvName || pdwReserved) { @@ -1811,7 +1812,7 @@ BOOL ret = FALSE; PWSTR str = NULL; - DPRINT("(%s, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags); + TRACE("(%s, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags); if (CRYPT_ANSIToUnicode(pszProvName, &str, -1)) { @@ -1840,14 +1841,14 @@ { PCRYPTPROV prov = (PCRYPTPROV)hProv; - DPRINT("(0x%lx, %ld, %p, %08ld)\n", hProv, dwParam, pbData, dwFlags); + TRACE("(0x%lx, %ld, %p, %08ld)\n", hProv, dwParam, pbData, dwFlags); if (!prov) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); if (dwFlags & PP_USE_HARDWARE_RNG) { - DPRINT1("PP_USE_HARDWARE_RNG: What do I do with this?\n"); - DPRINT1("\tLetting the CSP decide.\n"); + FIXME("PP_USE_HARDWARE_RNG: What do I do with this?\n"); + FIXME("\tLetting the CSP decide.\n"); } if (dwFlags & PP_CLIENT_HWND) { @@ -1897,11 +1898,11 @@ PCRYPTKEY key = (PCRYPTKEY)hPubKey; PCRYPTPROV prov; - DPRINT("(0x%lx, %p, %ld, 0x%lx, %08ld)\n", hHash, pbSignature, + TRACE("(0x%lx, %p, %ld, 0x%lx, %08ld)\n", hHash, pbSignature, dwSigLen, hPubKey, dwFlags); if (sDescription) { - DPRINT("The sDescription parameter is not supported (and no longer used). Ignoring.\n"); + WARN("The sDescription parameter is not supported (and no longer used). Ignoring.\n"); } if (!hash || !key) @@ -1922,7 +1923,7 @@ LPCWSTR sDescription, DWORD dwFlags) { - OutputDebugStringA ("ADVAPI32!CryptVerifySignatureW not implemented!"); + FIXME("ADVAPI32!CryptVerifySignatureW not implemented!"); return FALSE; } @@ -1943,7 +1944,7 @@ */ NTSTATUS WINAPI SystemFunction040(PVOID memory, ULONG length, ULONG flags) /* RtlEncryptMemory */ { - DPRINT1("(%p, %lx, %lx): stub [RtlEncryptMemory]\n", memory, length, flags); + FIXME("(%p, %lx, %lx): stub [RtlEncryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; } @@ -1959,7 +1960,7 @@ */ NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags) /* RtlDecryptMemory */ { - DPRINT1("(%p, %lx, %lx): stub [RtlDecryptMemory]\n", memory, length, flags); + FIXME("(%p, %lx, %lx): stub [RtlDecryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; } @@ -1972,7 +1973,7 @@ PENCRYPTION_CERTIFICATE_LIST pencryption_certificate_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -1984,7 +1985,7 @@ PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -1996,7 +1997,7 @@ LPDWORD lpStatus ) { - DPRINT1("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); if (!lpStatus) return FALSE; *lpStatus = FILE_SYSTEM_NOT_SUPPORT; @@ -2016,6 +2017,8 @@ NTSTATUS Status; BOOL ret = FALSE; + TRACE("(%s, %p)\n", lpFileName, lpStatus); + FileName.Buffer = NULL; Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); @@ -2040,7 +2043,7 @@ PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -2052,7 +2055,7 @@ PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return; } @@ -2065,7 +2068,7 @@ PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -2077,9 +2080,10 @@ BOOL Disable ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + Modified: trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/hw… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c (original) +++ trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c Fri Feb 8 20:04:39 2008 @@ -10,7 +10,8 @@ */ #include <advapi32.h> -#include <debug.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi); /****************************************************************************** * GetCurrentHwProfileA [ADVAPI32.@] @@ -35,7 +36,7 @@ BOOL bResult; NTSTATUS Status; - DPRINT("GetCurrentHwProfileA() called\n"); + TRACE("GetCurrentHwProfileA() called\n"); bResult = GetCurrentHwProfileW(&ProfileInfo); if (bResult == FALSE) @@ -91,7 +92,7 @@ DWORD dwLength; DWORD dwConfigId; - DPRINT("GetCurrentHwProfileW() called\n"); + TRACE("GetCurrentHwProfileW() called\n"); if (lpHwProfileInfo == NULL) { Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c Fri Feb 8 20:04:39 2008 @@ -7,8 +7,9 @@ */ #include <advapi32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* FUNCTIONS ***************************************************************/ @@ -216,7 +217,7 @@ KEY_READ, &hUsersKey)) { - DPRINT1 ("Failed to open Users key! (Error %lu)\n", GetLastError()); + ERR("Failed to open Users key! (Error %lu)\n", GetLastError()); return FALSE; } @@ -229,12 +230,12 @@ { if (GetLastError () == ERROR_FILE_NOT_FOUND) { - DPRINT1 ("Invalid user name!\n"); + ERR("Invalid user name!\n"); SetLastError (ERROR_NO_SUCH_USER); } else { - DPRINT1 ("Failed to open user key! (Error %lu)\n", GetLastError()); + ERR("Failed to open user key! (Error %lu)\n", GetLastError()); } RegCloseKey (hUsersKey); @@ -252,19 +253,19 @@ NULL, &dwLength)) { - DPRINT1 ("Failed to read the SID size! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); RegCloseKey (hUserKey); return FALSE; } /* Allocate sid buffer */ - DPRINT ("Required SID buffer size: %lu\n", dwLength); + TRACE("Required SID buffer size: %lu\n", dwLength); lpSid = (PSID)RtlAllocateHeap (RtlGetProcessHeap (), 0, dwLength); if (lpSid == NULL) { - DPRINT1 ("Failed to allocate SID buffer!\n"); + ERR("Failed to allocate SID buffer!\n"); RegCloseKey (hUserKey); return FALSE; } @@ -277,7 +278,7 @@ (LPBYTE)lpSid, &dwLength)) { - DPRINT1 ("Failed to read the SID! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); RtlFreeHeap (RtlGetProcessHeap (), 0, lpSid); @@ -300,7 +301,7 @@ DWORD dwLength; HKEY hDomainKey; - DPRINT("SamGetDomainSid() called\n"); + TRACE("SamGetDomainSid() called\n"); if (Sid != NULL) *Sid = NULL; @@ -312,7 +313,7 @@ KEY_READ, &hDomainKey)) { - DPRINT1("Failed to open the account domain key! (Error %lu)\n", GetLastError()); + ERR("Failed to open the account domain key! (Error %lu)\n", GetLastError()); return FALSE; } @@ -325,19 +326,19 @@ NULL, &dwLength)) { - DPRINT1("Failed to read the SID size! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); RegCloseKey(hDomainKey); return FALSE; } /* Allocate sid buffer */ - DPRINT("Required SID buffer size: %lu\n", dwLength); + TRACE("Required SID buffer size: %lu\n", dwLength); lpSid = (PSID)RtlAllocateHeap(RtlGetProcessHeap(), 0, dwLength); if (lpSid == NULL) { - DPRINT1("Failed to allocate SID buffer!\n"); + ERR("Failed to allocate SID buffer!\n"); RegCloseKey(hDomainKey); return FALSE; } @@ -350,7 +351,7 @@ (LPBYTE)lpSid, &dwLength)) { - DPRINT1("Failed to read the SID! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); RtlFreeHeap(RtlGetProcessHeap(), 0, lpSid); @@ -362,7 +363,7 @@ *Sid = lpSid; - DPRINT("SamGetDomainSid() done\n"); + TRACE("SamGetDomainSid() done\n"); return TRUE; } @@ -480,7 +481,7 @@ TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; GroupCount++; #else - DPRINT1("Not adding user to Administrators group\n"); + TRACE("Not adding user to Administrators group\n"); #endif /* Member of 'Users' */ @@ -674,7 +675,7 @@ /* Get the user SID from the registry */ if (!SamGetUserSid (lpszUsername, &UserSid)) { - DPRINT1 ("SamGetUserSid() failed\n"); + ERR("SamGetUserSid() failed\n"); return FALSE; } @@ -710,7 +711,7 @@ if (! LookupPrivilegeValueW(NULL, DefaultPrivs[i].PrivName, &TokenPrivileges->Privileges[TokenPrivileges->PrivilegeCount].Luid)) { - DPRINT1("Can't set privilege %S\n", DefaultPrivs[i].PrivName); + WARN("Can't set privilege %S\n", DefaultPrivs[i].PrivName); } else { Modified: trunk/reactos/dll/win32/advapi32/misc/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ms… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/msi.c (original) +++ trunk/reactos/dll/win32/advapi32/misc/msi.c Fri Feb 8 20:04:39 2008 @@ -9,8 +9,14 @@ #include <advapi32.h> -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi); +#ifndef _UNICODE +#define debugstr_aw debugstr_a +#else +#define debugstr_aw debugstr_w +#endif + typedef UINT (WINAPI *fnMsiProvideComponentFromDescriptor)(LPCWSTR,LPWSTR,DWORD*,DWORD*); @@ -22,7 +28,7 @@ HMODULE hmsi; UINT r = ERROR_CALL_NOT_IMPLEMENTED; - DPRINT("%S %p %p\n", szDescriptor, szCommandLine, pcchCommandLine); + TRACE("%S %p %p\n", szDescriptor, szCommandLine, pcchCommandLine); hmsi = LoadLibraryW( szMsi ); if (!hmsi) Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Fri Feb 8 20:04:39 2008 @@ -14,10 +14,9 @@ /* INCLUDES *****************************************************************/ #include <advapi32.h> -#define NDEBUG #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi32); +WINE_DEFAULT_DEBUG_CHANNEL(reg); /* DEFINES ******************************************************************/ Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c Fri Feb 8 20:04:39 2008 @@ -7,9 +7,9 @@ */ #include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* --- ACL --- */ @@ -1078,7 +1078,7 @@ IN PTRUSTEE_W pTrustee, OUT PACCESS_MASK pAccessRights) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -1123,7 +1123,7 @@ OUT PACCESS_MASK pSuccessfulAuditedRights, OUT PACCESS_MASK pFailedAuditRights) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/advapi32/sec/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/aud… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/audit.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/audit.c Fri Feb 8 20:04:39 2008 @@ -12,9 +12,9 @@ /* INCLUDES *****************************************************************/ #include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* FUNCTIONS ****************************************************************/ @@ -530,7 +530,7 @@ OUT LPDWORD AccessStatusList, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -558,7 +558,7 @@ OUT LPDWORD AccessStatusList, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -585,7 +585,7 @@ OUT LPDWORD AccessStatusList, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -612,7 +612,7 @@ OUT LPDWORD AccessStatusList, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -639,7 +639,7 @@ OUT LPBOOL AccessStatus, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -666,7 +666,7 @@ OUT LPBOOL AccessStatus, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c Fri Feb 8 20:04:39 2008 @@ -12,9 +12,9 @@ */ #include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); static handle_t LSABindingHandle = NULL; @@ -29,7 +29,7 @@ status = RpcBindingFree(Handle); if (status) { - DPRINT1("RpcBindingFree returned 0x%x\n", status); + TRACE("RpcBindingFree returned 0x%x\n", status); } } @@ -51,7 +51,7 @@ &pszStringBinding); if (status) { - DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + TRACE("RpcStringBindingCompose returned 0x%x\n", status); return; } @@ -60,13 +60,13 @@ &Handle); if (status) { - DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); } status = RpcStringFreeW(&pszStringBinding); if (status) { - DPRINT1("RpcStringFree returned 0x%x\n", status); + TRACE("RpcStringFree returned 0x%x\n", status); } if (InterlockedCompareExchangePointer(&LSABindingHandle, @@ -84,7 +84,7 @@ NTSTATUS STDCALL LsaClose(LSA_HANDLE ObjectHandle) { - DPRINT("LsaClose(0x%p) called\n", ObjectHandle); + TRACE("LsaClose(0x%p) called\n", ObjectHandle); LSAHandleBind(); @@ -99,7 +99,7 @@ NTSTATUS STDCALL LsaDelete(LSA_HANDLE ObjectHandle) { - DPRINT("LsaDelete(0x%p) called\n", ObjectHandle); + TRACE("LsaDelete(0x%p) called\n", ObjectHandle); LSAHandleBind(); @@ -295,7 +295,7 @@ PLSA_REFERENCED_DOMAIN_LIST LocalDomains; PLSA_TRANSLATED_NAME LocalNames; - DPRINT("LsaLookupSids(): stub. Always returning 'Administrator'\n"); + WARN("LsaLookupSids(): stub. Always returning 'Administrator'\n"); if (Count != 1) return STATUS_NONE_MAPPED; LocalDomains = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(LSA_TRANSLATED_SID)); @@ -354,7 +354,7 @@ static int count = 0; if (count++ < 20) { - DPRINT("LsaOpenPolicy - stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); } return STATUS_SUCCESS; } @@ -407,7 +407,7 @@ POLICY_INFORMATION_CLASS pic, PVOID *Buffer) { - DPRINT1("(%p,0x%08x,%p):LsaQueryInformationPolicy stub\n", + TRACE("(%p,0x%08x,%p):LsaQueryInformationPolicy stub\n", PolicyHandle, pic, Buffer); if (!Buffer) @@ -464,7 +464,7 @@ } if (useDefault) RtlCreateUnicodeStringFromAsciiz(&(xdi->ppdi.Name), "DOMAIN"); - DPRINT1("setting domain to \n"); + TRACE("setting domain to \n"); xdi->ppdi.Sid = &(xdi->sid); xdi->sid.Revision = SID_REVISION; @@ -485,7 +485,7 @@ case PolicyDnsDomainInformation: case PolicyEfsInformation: { - DPRINT1("category not implemented\n"); + FIXME("category not implemented\n"); return FALSE; } } @@ -639,7 +639,7 @@ PUNICODE_STRING *UserName, PUNICODE_STRING *DomainName) { - DPRINT1("LsaGetUserName not implemented\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } @@ -653,7 +653,7 @@ DWORD Unknonw1, DWORD Unknonw2) { - DPRINT1("LsaQueryInfoTrustedDomain not implemented\n"); + FIXME("%s() not implemented!\n", __FUNCTION__);; return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Fri Feb 8 20:04:39 2008 @@ -6,9 +6,9 @@ */ #include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* Needed for LookupAccountNameW implementation from Wine */ @@ -208,7 +208,7 @@ #if DBG else { - DPRINT1("Failed to initialize ntmarta.dll! Error: 0x%x", ErrorCode); + ERR("Failed to initialize ntmarta.dll! Error: 0x%x", ErrorCode); } #endif } @@ -326,7 +326,7 @@ HANDLE FileHandle; NTSTATUS Status; - DPRINT("GetFileSecurityW() called\n"); + TRACE("GetFileSecurityW() called\n"); if (RequestedInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION)) @@ -344,7 +344,7 @@ NULL, NULL)) { - DPRINT("Invalid path\n"); + ERR("Invalid path\n"); SetLastError(ERROR_INVALID_NAME); return FALSE; } @@ -368,7 +368,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenFile() failed (Status %lx)\n", Status); + ERR("NtOpenFile() failed (Status %lx)\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -382,7 +382,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("NtQuerySecurityObject() failed (Status %lx)\n", Status); + ERR("NtQuerySecurityObject() failed (Status %lx)\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -468,7 +468,7 @@ HANDLE FileHandle; NTSTATUS Status; - DPRINT("SetFileSecurityW() called\n"); + TRACE("SetFileSecurityW() called\n"); if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) @@ -491,7 +491,7 @@ NULL, NULL)) { - DPRINT("Invalid path\n"); + ERR("Invalid path\n"); SetLastError(ERROR_INVALID_NAME); return FALSE; } @@ -515,7 +515,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenFile() failed (Status %lx)\n", Status); + ERR("NtOpenFile() failed (Status %lx)\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -527,7 +527,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("NtSetSecurityObject() failed (Status %lx)\n", Status); + ERR("NtSetSecurityObject() failed (Status %lx)\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -1155,7 +1155,7 @@ static const WCHAR dm[] = {'D','O','M','A','I','N',0}; unsigned int i; - DPRINT("%s %s %p %p %p %p %p - stub\n", lpSystemName, lpAccountName, + TRACE("%s %s %p %p %p %p %p - stub\n", lpSystemName, lpAccountName, Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) @@ -1306,7 +1306,7 @@ if (NULL != SystemName && L'\0' != *SystemName) { - DPRINT1("LookupPrivilegeValueW: not implemented for remote system\n"); + FIXME("LookupPrivilegeValueW: not implemented for remote system\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1321,7 +1321,7 @@ } } - DPRINT1("LookupPrivilegeValueW: no such privilege %S\n", PrivName); + WARN("LookupPrivilegeValueW: no such privilege %S\n", PrivName); SetLastError(ERROR_NO_SUCH_PRIVILEGE); return FALSE; } @@ -1339,7 +1339,7 @@ LPDWORD cbDisplayName, LPDWORD lpLanguageId) { - DPRINT1("LookupPrivilegeDisplayNameA: stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError (ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1357,7 +1357,7 @@ LPDWORD cbDisplayName, LPDWORD lpLanguageId) { - DPRINT1("LookupPrivilegeDisplayNameW: stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError (ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1374,7 +1374,7 @@ LPSTR lpName, LPDWORD cbName) { - DPRINT1("LookupPrivilegeNameA: stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError (ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1391,7 +1391,7 @@ LPWSTR lpName, LPDWORD cbName) { - DPRINT1("LookupPrivilegeNameW: stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError (ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1863,7 +1863,7 @@ LPSTR *lppGroup ) { - DPRINT1("GetSecurityInfoExA stub!\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_BAD_PROVIDER; } @@ -1883,7 +1883,7 @@ LPWSTR *lppGroup ) { - DPRINT1("GetSecurityInfoExW stub!\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_BAD_PROVIDER; } @@ -1899,7 +1899,7 @@ IO_STATUS_BLOCK StatusBlock; NTSTATUS Status; - DPRINT("ImpersonateNamedPipeClient() called\n"); + TRACE("ImpersonateNamedPipeClient() called\n"); Status = NtFsControlFile(hNamedPipe, NULL, @@ -1963,7 +1963,7 @@ HANDLE Token, PGENERIC_MAPPING GenericMapping) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return FALSE; } @@ -1982,7 +1982,7 @@ HANDLE Token, PGENERIC_MAPPING GenericMapping) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return FALSE; } Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c Fri Feb 8 20:04:39 2008 @@ -12,9 +12,9 @@ */ #include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* * @implemented @@ -569,7 +569,7 @@ */ BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) { - DPRINT1("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -602,7 +602,7 @@ */ BOOL WINAPI EncryptFileW(LPCWSTR lpFileName) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -637,7 +637,7 @@ LPWSTR* lpwstr, PULONG pulong) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -649,7 +649,7 @@ LPSTR* lpstr, PULONG pulong) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/tru… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/trustee.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/trustee.c Fri Feb 8 20:04:39 2008 @@ -8,8 +8,9 @@ #include <advapi32.h> -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); /****************************************************************************** @@ -132,7 +133,7 @@ VOID WINAPI BuildTrusteeWithSidA(PTRUSTEE_A pTrustee, PSID pSid) { - DPRINT("%p %p\n", pTrustee, pSid); + TRACE("%p %p\n", pTrustee, pSid); pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -148,7 +149,7 @@ VOID WINAPI BuildTrusteeWithSidW(PTRUSTEE_W pTrustee, PSID pSid) { - DPRINT("%p %p\n", pTrustee, pSid); + TRACE("%p %p\n", pTrustee, pSid); pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -164,7 +165,7 @@ VOID WINAPI BuildTrusteeWithNameA(PTRUSTEE_A pTrustee, LPSTR name) { - DPRINT("%p %s\n", pTrustee, name); + TRACE("%p %s\n", pTrustee, name); pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -180,7 +181,7 @@ VOID WINAPI BuildTrusteeWithNameW(PTRUSTEE_W pTrustee, LPWSTR name) { - DPRINT("%p %s\n", pTrustee, name); + TRACE("%p %s\n", pTrustee, name); pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -200,7 +201,7 @@ { DWORD ObjectsPresent = 0; - DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, + TRACE("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, Name); /* Fill the OBJECTS_AND_NAME structure */ @@ -238,7 +239,7 @@ { DWORD ObjectsPresent = 0; - DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, + TRACE("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, Name); /* Fill the OBJECTS_AND_NAME structure */ @@ -275,7 +276,7 @@ { DWORD ObjectsPresent = 0; - DPRINT("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + TRACE("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); /* Fill the OBJECTS_AND_SID structure */ if (pObjectGuid != NULL) @@ -321,7 +322,7 @@ { DWORD ObjectsPresent = 0; - DPRINT("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + TRACE("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); /* Fill the OBJECTS_AND_SID structure */ if (pObjectGuid != NULL) Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c Fri Feb 8 20:04:39 2008 @@ -22,9 +22,10 @@ */ #include <advapi32.h> -#define NDEBUG -#include <debug.h> - +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); +WINE_DECLARE_DEBUG_CHANNEL(eventlog); typedef struct _LOG_INFO { @@ -45,7 +46,7 @@ NTSTATUS Status; ANSI_STRING BackupFileName; - DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + TRACE("%p, %s\n", hEventLog, lpBackupFileName); RtlInitAnsiString(&BackupFileName, lpBackupFileName); @@ -84,7 +85,7 @@ NTSTATUS Status; UNICODE_STRING BackupFileName; - DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + TRACE("%p, %s\n", hEventLog, lpBackupFileName); RtlInitUnicodeString(&BackupFileName, lpBackupFileName); @@ -120,7 +121,7 @@ NTSTATUS Status; ANSI_STRING BackupFileName; - DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + TRACE("%p, %s\n", hEventLog, lpBackupFileName); RtlInitAnsiString(&BackupFileName, lpBackupFileName); @@ -156,7 +157,7 @@ NTSTATUS Status; UNICODE_STRING BackupFileName; - DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + TRACE("%p, %s\n", hEventLog, lpBackupFileName); RtlInitUnicodeString(&BackupFileName, lpBackupFileName); @@ -190,7 +191,7 @@ PLOG_INFO pLog; NTSTATUS Status; - DPRINT("%p", hEventLog); + TRACE("%p", hEventLog); pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -238,7 +239,7 @@ PLOG_INFO pLog; NTSTATUS Status; - DPRINT("%p\n", hEventLog); + TRACE("%p\n", hEventLog); pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -272,7 +273,7 @@ NTSTATUS Status; long Records; - DPRINT("%p, %p\n", hEventLog, NumberOfRecords); + TRACE("%p, %p\n", hEventLog, NumberOfRecords); pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -311,7 +312,7 @@ NTSTATUS Status; long Oldest; - DPRINT("%p, %p\n", hEventLog, OldestRecord); + TRACE("%p, %p\n", hEventLog, OldestRecord); pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -365,7 +366,7 @@ UNICODE_STRING FileName; HANDLE Handle; - DPRINT("%s, %s\n", lpUNCServerName, lpFileName); + TRACE("%s, %s\n", lpUNCServerName, lpFileName); if (!RtlCreateUnicodeStringFromAsciiz(&UNCServerName, lpUNCServerName)) { @@ -407,7 +408,7 @@ UNICODE_STRING UNCServerName; UNICODE_STRING FileName; - DPRINT("%s, %s\n", lpUNCServerName, lpFileName); + TRACE("%s, %s\n", lpUNCServerName, lpFileName); RtlInitUnicodeString(&UNCServerName, lpUNCServerName); RtlInitUnicodeString(&FileName, lpFileName); @@ -511,7 +512,7 @@ UNICODE_STRING UNCServerName; UNICODE_STRING SourceName; - DPRINT("%s, %s\n", lpUNCServerName, lpSourceName); + TRACE("%s, %s\n", lpUNCServerName, lpSourceName); RtlInitUnicodeString(&UNCServerName, lpUNCServerName); RtlInitUnicodeString(&SourceName, lpSourceName); @@ -583,7 +584,7 @@ NTSTATUS Status; long bytesRead, minNumberOfBytesNeeded; - DPRINT("%p, %lu, %lu, %p, %lu, %p, %p\n", + TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); @@ -640,7 +641,7 @@ NTSTATUS Status; long bytesRead, minNumberOfBytesNeeded; - DPRINT("%p, %lu, %lu, %p, %lu, %p, %p\n", + TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); @@ -683,7 +684,7 @@ UNICODE_STRING SourceName; HANDLE Handle; - DPRINT("%s, %s\n", lpUNCServerName, lpSourceName); + TRACE("%s, %s\n", lpUNCServerName, lpSourceName); if (!RtlCreateUnicodeStringFromAsciiz(&UNCServerName, lpUNCServerName)) { @@ -728,7 +729,7 @@ UNICODE_STRING UNCServerName; UNICODE_STRING SourceName; - DPRINT("%s, %s\n", lpUNCServerName, lpSourceName); + TRACE("%s, %s\n", lpUNCServerName, lpSourceName); RtlInitUnicodeString(&UNCServerName, lpUNCServerName); RtlInitUnicodeString(&SourceName, lpSourceName); @@ -892,7 +893,7 @@ UNICODE_STRING *Strings; WORD i; - DPRINT("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", + TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, wNumStrings, dwDataSize, lpStrings, lpRawData); @@ -955,23 +956,23 @@ switch (wType) { case EVENTLOG_SUCCESS: - DPRINT1("Success: %S\n", lpStrings[i]); + TRACE_(eventlog)("Success: %S\n", lpStrings[i]); break; case EVENTLOG_ERROR_TYPE: - DPRINT1("Error: %S\n", lpStrings[i]); + ERR_(eventlog)("Error: %S\n", lpStrings[i]); break; case EVENTLOG_WARNING_TYPE: - DPRINT1("Warning: %S\n", lpStrings[i]); + WARN_(eventlog)("Warning: %S\n", lpStrings[i]); break; case EVENTLOG_INFORMATION_TYPE: - DPRINT1("Info: %S\n", lpStrings[i]); + TRACE_(eventlog)("Info: %S\n", lpStrings[i]); break; default: - DPRINT1("Type %hu: %S\n", wType, lpStrings[i]); + TRACE_(eventlog)("Type %hu: %S\n", wType, lpStrings[i]); break; } } Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Fri Feb 8 20:04:39 2008 @@ -14,8 +14,10 @@ #include <advapi32.h> -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + /* FUNCTIONS *****************************************************************/ @@ -38,7 +40,7 @@ &pszStringBinding); if (status) { - DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + TRACE("RpcStringBindingCompose returned 0x%x\n", status); return; } @@ -47,13 +49,13 @@ &BindingHandle); if (status) { - DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); } status = RpcStringFreeW(&pszStringBinding); if (status) { - DPRINT1("RpcStringFree returned 0x%x\n", status); + TRACE("RpcStringFree returned 0x%x\n", status); } } @@ -70,7 +72,7 @@ status = RpcBindingFree(&BindingHandle); if (status) { - DPRINT1("RpcBindingFree returned 0x%x\n", status); + TRACE("RpcBindingFree returned 0x%x\n", status); } } #endif @@ -89,7 +91,7 @@ DWORD lpInfoSize; DWORD dwError; - DPRINT("ChangeServiceConfig2A() called\n"); + TRACE("ChangeServiceConfig2A() called\n"); /* Determine the length of the lpInfo parameter */ switch (dwInfoLevel) @@ -103,7 +105,7 @@ break; default: - DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + WARN("Unknown info level 0x%lx\n", dwInfoLevel); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -120,7 +122,7 @@ lpInfoSize); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrChangeServiceConfig2A() failed (Error %lu)\n", dwError); + ERR("ScmrChangeServiceConfig2A() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -143,7 +145,7 @@ DWORD dwInfoSize; DWORD dwError; - DPRINT("ChangeServiceConfig2W() called\n"); + TRACE("ChangeServiceConfig2W() called\n"); switch (dwInfoLevel) { @@ -178,7 +180,7 @@ break; default: - DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + WARN("Unknown info level 0x%lx\n", dwInfoLevel); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -195,7 +197,7 @@ dwInfoSize); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrChangeServiceConfig2W() failed (Error %lu)\n", dwError); + ERR("ScmrChangeServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -204,7 +206,7 @@ if (lpSendData != NULL) HeapFree(GetProcessHeap(), 0, lpSendData); - DPRINT("ChangeServiceConfig2W() done\n"); + TRACE("ChangeServiceConfig2W() done\n"); return TRUE; } @@ -233,7 +235,7 @@ DWORD dwLength; LPSTR lpStr; - DPRINT("ChangeServiceConfigA() called\n"); + TRACE("ChangeServiceConfigA() called\n"); /* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -269,7 +271,7 @@ (LPSTR)lpDisplayName); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrChangeServiceConfigA() failed (Error %lu)\n", dwError); + ERR("ScmrChangeServiceConfigA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -301,7 +303,7 @@ DWORD dwLength; LPWSTR lpStr; - DPRINT("ChangeServiceConfigW() called\n"); + TRACE("ChangeServiceConfigW() called\n"); /* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -337,7 +339,7 @@ (LPWSTR)lpDisplayName); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrChangeServiceConfigW() failed (Error %lu)\n", dwError); + ERR("ScmrChangeServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -356,7 +358,7 @@ { DWORD dwError; - DPRINT("CloseServiceHandle() called\n"); + TRACE("CloseServiceHandle() called\n"); HandleBind(); @@ -365,12 +367,12 @@ (unsigned int)hSCObject); if (dwError) { - DPRINT1("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("CloseServiceHandle() done\n"); + ERR("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("CloseServiceHandle() done\n"); return TRUE; } @@ -388,7 +390,7 @@ { DWORD dwError; - DPRINT("ControlService(%x, %x, %p)\n", + TRACE("ControlService(%x, %x, %p)\n", hService, dwControl, lpServiceStatus); HandleBind(); @@ -400,12 +402,12 @@ lpServiceStatus); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrControlService() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("ControlService() done\n"); + ERR("ScmrControlService() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("ControlService() done\n"); return TRUE; } @@ -422,7 +424,7 @@ IN DWORD dwInfoLevel, IN OUT PVOID pControlParams) { - DPRINT1("ControlServiceEx(0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", + FIXME("ControlServiceEx(0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", hService, dwControl, dwInfoLevel, pControlParams); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -621,7 +623,7 @@ DWORD dwLength; LPWSTR lpStr; - DPRINT("CreateServiceW() called\n"); + TRACE("CreateServiceW() called\n"); /* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -660,7 +662,7 @@ (unsigned long *)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrCreateServiceW() failed (Error %lu)\n", dwError); + ERR("ScmrCreateServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -679,7 +681,7 @@ { DWORD dwError; - DPRINT("DeleteService(%x)\n", hService); + TRACE("DeleteService(%x)\n", hService); HandleBind(); @@ -688,7 +690,7 @@ (unsigned int)hService); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrDeleteService() failed (Error %lu)\n", dwError); + ERR("ScmrDeleteService() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -714,7 +716,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount; - DPRINT("EnumServicesStatusA() called\n"); + TRACE("EnumServicesStatusA() called\n"); HandleBind(); @@ -742,12 +744,12 @@ if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrEnumDependentServicesA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumDependentServicesA() done\n"); + ERR("ScmrEnumDependentServicesA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumDependentServicesA() done\n"); return TRUE; } @@ -770,7 +772,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount; - DPRINT("EnumServicesStatusW() called\n"); + TRACE("EnumServicesStatusW() called\n"); HandleBind(); @@ -798,12 +800,12 @@ if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrEnumDependentServicesW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumDependentServicesW() done\n"); + ERR("ScmrEnumDependentServicesW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumDependentServicesW() done\n"); return TRUE; } @@ -827,7 +829,7 @@ LPDWORD lpResumeHandle, LPCWSTR lpGroup) { - DPRINT1("EnumServiceGroupW is unimplemented\n"); + FIXME("EnumServiceGroupW is unimplemented\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -852,7 +854,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount; - DPRINT("EnumServicesStatusA() called\n"); + TRACE("EnumServicesStatusA() called\n"); HandleBind(); @@ -882,12 +884,12 @@ if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrEnumServicesStatusA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumServicesStatusA() done\n"); + ERR("ScmrEnumServicesStatusA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumServicesStatusA() done\n"); return TRUE; } @@ -912,7 +914,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount; - DPRINT("EnumServicesStatusW() called\n"); + TRACE("EnumServicesStatusW() called\n"); HandleBind(); @@ -942,12 +944,12 @@ if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrEnumServicesStatusW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumServicesStatusW() done\n"); + ERR("ScmrEnumServicesStatusW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumServicesStatusW() done\n"); return TRUE; } @@ -974,7 +976,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount; - DPRINT("EnumServicesStatusExA() called\n"); + TRACE("EnumServicesStatusExA() called\n"); HandleBind(); @@ -992,7 +994,7 @@ if (dwError == ERROR_MORE_DATA) { - DPRINT("Required buffer size %ul\n", *pcbBytesNeeded); + WARN("Required buffer size %ul\n", *pcbBytesNeeded); SetLastError(dwError); return FALSE; } @@ -1014,12 +1016,12 @@ } else { - DPRINT1("ScmrEnumServicesStatusExA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumServicesStatusExA() done\n"); + ERR("ScmrEnumServicesStatusExA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumServicesStatusExA() done\n"); return TRUE; } @@ -1046,7 +1048,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount; - DPRINT("EnumServicesStatusExW() called\n"); + TRACE("EnumServicesStatusExW() called\n"); HandleBind(); @@ -1064,7 +1066,7 @@ if (dwError == ERROR_MORE_DATA) { - DPRINT("Required buffer size %ul\n", *pcbBytesNeeded); + WARN("Required buffer size %ul\n", *pcbBytesNeeded); SetLastError(dwError); return FALSE; } @@ -1086,12 +1088,12 @@ } else { - DPRINT1("ScmrEnumServicesStatusExW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumServicesStatusExW() done\n"); + ERR("ScmrEnumServicesStatusExW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumServicesStatusExW() done\n"); return TRUE; } @@ -1110,7 +1112,7 @@ { DWORD dwError; - DPRINT("GetServiceDisplayNameA() called\n"); + TRACE("GetServiceDisplayNameA() called\n"); HandleBind(); @@ -1121,7 +1123,7 @@ lpcchBuffer); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrGetServiceDisplayNameA() failed (Error %lu)\n", dwError); + ERR("ScmrGetServiceDisplayNameA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1145,7 +1147,7 @@ { DWORD dwError; - DPRINT("GetServiceDisplayNameW() called\n"); + TRACE("GetServiceDisplayNameW() called\n"); HandleBind(); @@ -1156,7 +1158,7 @@ lpcchBuffer); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrGetServiceDisplayNameW() failed (Error %lu)\n", dwError); + ERR("ScmrGetServiceDisplayNameW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1180,7 +1182,7 @@ { DWORD dwError; - DPRINT("GetServiceKeyNameA() called\n"); + TRACE("GetServiceKeyNameA() called\n"); HandleBind(); @@ -1191,7 +1193,7 @@ lpcchBuffer); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrGetServiceKeyNameA() failed (Error %lu)\n", dwError); + ERR("ScmrGetServiceKeyNameA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1215,7 +1217,7 @@ { DWORD dwError; - DPRINT("GetServiceKeyNameW() called\n"); + TRACE("GetServiceKeyNameW() called\n"); HandleBind(); @@ -1226,7 +1228,7 @@ lpcchBuffer); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrGetServiceKeyNameW() failed (Error %lu)\n", dwError); + ERR("ScmrGetServiceKeyNameW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1248,7 +1250,7 @@ SC_LOCK hLock; DWORD dwError; - DPRINT("LockServiceDatabase(%x)\n", hSCManager); + TRACE("LockServiceDatabase(%x)\n", hSCManager); HandleBind(); @@ -1258,12 +1260,12 @@ (unsigned int *)&hLock); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); + ERR("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } - DPRINT("hLock = %p\n", hLock); + TRACE("hLock = %p\n", hLock); return hLock; } @@ -1274,7 +1276,7 @@ { HANDLE hEvent; - DPRINT("WaitForSCManager() called\n"); + TRACE("WaitForSCManager() called\n"); /* Try to open the existing event */ hEvent = OpenEventW(SYNCHRONIZE, @@ -1305,7 +1307,7 @@ WaitForSingleObject(hEvent, 180000); CloseHandle(hEvent); - DPRINT("ScmWaitForSCManager() done\n"); + TRACE("ScmWaitForSCManager() done\n"); } @@ -1322,7 +1324,7 @@ SC_HANDLE hScm = NULL; DWORD dwError; - DPRINT("OpenSCManagerA(%s, %s, %lx)\n", + TRACE("OpenSCManagerA(%s, %s, %lx)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); WaitForSCManager(); @@ -1337,12 +1339,12 @@ (unsigned long*)&hScm); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); + ERR("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } - DPRINT("hScm = %p\n", hScm); + TRACE("hScm = %p\n", hScm); return hScm; } @@ -1361,7 +1363,7 @@ SC_HANDLE hScm = NULL; DWORD dwError; - DPRINT("OpenSCManagerW(%S, %S, %lx)\n", + TRACE("OpenSCManagerW(%S, %S, %lx)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); WaitForSCManager(); @@ -1376,12 +1378,12 @@ (unsigned long*)&hScm); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); + ERR("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } - DPRINT("hScm = %p\n", hScm); + TRACE("hScm = %p\n", hScm); return hScm; } @@ -1400,7 +1402,7 @@ SC_HANDLE hService = NULL; DWORD dwError; - DPRINT("OpenServiceA(%p, %s, %lx)\n", + TRACE("OpenServiceA(%p, %s, %lx)\n", hSCManager, lpServiceName, dwDesiredAccess); HandleBind(); @@ -1413,12 +1415,12 @@ (unsigned long*)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); + ERR("ScmrOpenServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } - DPRINT("hService = %p\n", hService); + TRACE("hService = %p\n", hService); return hService; } @@ -1437,7 +1439,7 @@ SC_HANDLE hService = NULL; DWORD dwError; - DPRINT("OpenServiceW(%p, %S, %lx)\n", + TRACE("OpenServiceW(%p, %S, %lx)\n", hSCManager, lpServiceName, dwDesiredAccess); HandleBind(); @@ -1450,12 +1452,12 @@ (unsigned long*)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrOpenServiceW() failed (Error %lu)\n", dwError); + ERR("ScmrOpenServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } - DPRINT("hService = %p\n", hService); + TRACE("hService = %p\n", hService); return hService; } @@ -1474,7 +1476,7 @@ { DWORD dwError; - DPRINT("QueryServiceConfigA(%p, %p, %lu, %p)\n", + TRACE("QueryServiceConfigA(%p, %p, %lu, %p)\n", hService, lpServiceConfig, cbBufSize, pcbBytesNeeded); HandleBind(); @@ -1487,7 +1489,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceConfigA() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceConfigA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1518,7 +1520,7 @@ (LPSTR)((ULONG_PTR)lpServiceConfig + (ULONG_PTR)lpServiceConfig->lpDisplayName); - DPRINT("QueryServiceConfigA() done\n"); + TRACE("QueryServiceConfigA() done\n"); return TRUE; } @@ -1537,7 +1539,7 @@ { DWORD dwError; - DPRINT("QueryServiceConfigW(%p, %p, %lu, %p)\n", + TRACE("QueryServiceConfigW(%p, %p, %lu, %p)\n", hService, lpServiceConfig, cbBufSize, pcbBytesNeeded); HandleBind(); @@ -1550,7 +1552,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceConfigW() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1581,7 +1583,7 @@ (LPWSTR)((ULONG_PTR)lpServiceConfig + (ULONG_PTR)lpServiceConfig->lpDisplayName); - DPRINT("QueryServiceConfigW() done\n"); + TRACE("QueryServiceConfigW() done\n"); return TRUE; } @@ -1601,7 +1603,7 @@ { DWORD dwError; - DPRINT("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", + TRACE("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); HandleBind(); @@ -1615,7 +1617,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceConfig2A() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceConfig2A() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1651,12 +1653,12 @@ break; default: - DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + ERR("Unknown info level 0x%lx\n", dwInfoLevel); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - DPRINT("QueryServiceConfig2A() done\n"); + TRACE("QueryServiceConfig2A() done\n"); return TRUE; } @@ -1676,7 +1678,7 @@ { DWORD dwError; - DPRINT("QueryServiceConfig2W(%p, %lu, %p, %lu, %p)\n", + TRACE("QueryServiceConfig2W(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); HandleBind(); @@ -1690,7 +1692,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceConfig2W() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1726,12 +1728,12 @@ break; default: - DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + WARN("Unknown info level 0x%lx\n", dwInfoLevel); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - DPRINT("QueryServiceConfig2W() done\n"); + TRACE("QueryServiceConfig2W() done\n"); return TRUE; } @@ -1750,7 +1752,7 @@ { DWORD dwError; - DPRINT("QueryServiceLockStatusA() called\n"); + TRACE("QueryServiceLockStatusA() called\n"); HandleBind(); @@ -1762,7 +1764,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceLockStatusA() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceLockStatusA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1773,7 +1775,7 @@ (LPSTR)((UINT_PTR)lpLockStatus + (UINT_PTR)lpLockStatus->lpLockOwner); } - DPRINT("QueryServiceLockStatusA() done\n"); + TRACE("QueryServiceLockStatusA() done\n"); return TRUE; } @@ -1792,7 +1794,7 @@ { DWORD dwError; - DPRINT("QueryServiceLockStatusW() called\n"); + TRACE("QueryServiceLockStatusW() called\n"); HandleBind(); @@ -1804,7 +1806,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceLockStatusW() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceLockStatusW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1815,7 +1817,7 @@ (LPWSTR)((UINT_PTR)lpLockStatus + (UINT_PTR)lpLockStatus->lpLockOwner); } - DPRINT("QueryServiceLockStatusW() done\n"); + TRACE("QueryServiceLockStatusW() done\n"); return TRUE; } @@ -1835,7 +1837,7 @@ { DWORD dwError; - DPRINT("QueryServiceObjectSecurity(%p, %lu, %p)\n", + TRACE("QueryServiceObjectSecurity(%p, %lu, %p)\n", hService, dwSecurityInformation, lpSecurityDescriptor); HandleBind(); @@ -1849,7 +1851,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT1("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError); + ERR("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1912,7 +1914,7 @@ if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrServiceObjectSecurity() failed (Error %lu)\n", dwError); + ERR("ScmrServiceObjectSecurity() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1932,7 +1934,7 @@ { DWORD dwError; - DPRINT("QueryServiceStatus(%p, %p)\n", + TRACE("QueryServiceStatus(%p, %p)\n", hService, lpServiceStatus); HandleBind(); @@ -1943,7 +1945,7 @@ lpServiceStatus); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1966,7 +1968,7 @@ { DWORD dwError; - DPRINT("QueryServiceStatusEx() called\n"); + TRACE("QueryServiceStatusEx() called\n"); HandleBind(); @@ -1979,7 +1981,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceStatusEx() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceStatusEx() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2011,7 +2013,7 @@ dwBufSize += (strlen(lpServiceArgVectors[i]) + 1); } dwBufSize++; - DPRINT1("dwBufSize: %lu\n", dwBufSize); + TRACE("dwBufSize: %lu\n", dwBufSize); lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); if (lpBuffer == NULL) @@ -2040,7 +2042,7 @@ if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrStartServiceA() failed (Error %lu)\n", dwError); + ERR("ScmrStartServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2071,7 +2073,7 @@ dwBufSize += ((wcslen(lpServiceArgVectors[i]) + 1) * sizeof(WCHAR)); } dwBufSize += sizeof(WCHAR); - DPRINT("dwBufSize: %lu\n", dwBufSize); + TRACE("dwBufSize: %lu\n", dwBufSize); lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); if (lpBuffer == NULL) @@ -2098,7 +2100,7 @@ if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrStartServiceW() failed (Error %lu)\n", dwError); + ERR("ScmrStartServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2117,7 +2119,7 @@ { DWORD dwError; - DPRINT("UnlockServiceDatabase(%x)\n", ScLock); + TRACE("UnlockServiceDatabase(%x)\n", ScLock); HandleBind(); @@ -2126,7 +2128,7 @@ (unsigned int)ScLock); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); + ERR("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2145,7 +2147,7 @@ { DWORD dwError; - DPRINT1("NotifyBootConfigStatus()\n"); + TRACE("NotifyBootConfigStatus()\n"); HandleBind(); @@ -2154,7 +2156,7 @@ BootAcceptable); if (dwError != ERROR_SUCCESS) { - DPRINT1("NotifyBootConfigStatus() failed (Error %lu)\n", dwError); + ERR("NotifyBootConfigStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Fri Feb 8 20:04:39 2008 @@ -13,9 +13,9 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* TYPES *********************************************************************/ @@ -79,19 +79,19 @@ lpService = (PACTIVE_SERVICE)Context; - DPRINT("ScServiceMainStub() called\n"); + TRACE("ScServiceMainStub() called\n"); /* Count arguments */ lpPtr = lpService->Arguments; while (*lpPtr) { - DPRINT("arg: %S\n", lpPtr); + TRACE("arg: %S\n", lpPtr); dwLen = wcslen(lpPtr) + 1; dwArgCount++; dwLength += dwLen; lpPtr += dwLen; } - DPRINT("dwArgCount: %ld\ndwLength: %ld\n", dwArgCount, dwLength); + TRACE("dwArgCount: %ld\ndwLength: %ld\n", dwArgCount, dwLength); /* Build the argument vector and call the main service routine */ if (lpService->bUnicode) @@ -219,7 +219,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + ERR("RtlQueryRegistryValues() failed (Status %lx)\n", Status); return RtlNtStatusToDosError(Status); } @@ -227,7 +227,7 @@ if (!WaitNamedPipeW(NtControlPipeName, 15000)) { - DPRINT1("WaitNamedPipe(%S) failed (Error %lu)\n", NtControlPipeName, GetLastError()); + ERR("WaitNamedPipe(%S) failed (Error %lu)\n", NtControlPipeName, GetLastError()); return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; } @@ -240,7 +240,7 @@ NULL); if (*hPipe == INVALID_HANDLE_VALUE) { - DPRINT1("CreateFileW() failed (Error %lu)\n", GetLastError()); + ERR("CreateFileW() failed (Error %lu)\n", GetLastError()); return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; } @@ -259,7 +259,7 @@ &dwBytesWritten, NULL); - DPRINT("Sent SERVICE_HANDLE %lu\n", lpActiveServices->hService); + TRACE("Sent SERVICE_HANDLE %lu\n", lpActiveServices->hService); return ERROR_SUCCESS; } @@ -272,15 +272,15 @@ HANDLE ThreadHandle; DWORD ThreadId; - DPRINT("ScStartService() called\n"); - DPRINT("client handle: %lu\n", ControlPacket->hClient); - DPRINT("Size: %lu\n", ControlPacket->dwSize); - DPRINT("Service: %S\n", &ControlPacket->szArguments[0]); + TRACE("ScStartService() called\n"); + TRACE("client handle: %lu\n", ControlPacket->hClient); + TRACE("Size: %lu\n", ControlPacket->dwSize); + TRACE("Service: %S\n", &ControlPacket->szArguments[0]); lpService = (PACTIVE_SERVICE)ControlPacket->hClient; if (lpService == NULL) { - DPRINT1("Service not found\n"); + TRACE("Service not found\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } @@ -316,14 +316,14 @@ { PACTIVE_SERVICE lpService; - DPRINT("ScControlService() called\n"); - DPRINT("Size: %lu\n", ControlPacket->dwSize); - DPRINT("Service: %S\n", &ControlPacket->szArguments[0]); + TRACE("ScControlService() called\n"); + TRACE("Size: %lu\n", ControlPacket->dwSize); + TRACE("Service: %S\n", &ControlPacket->szArguments[0]); lpService = (PACTIVE_SERVICE)ControlPacket->hClient; if (lpService == NULL) { - DPRINT1("Service not found\n"); + TRACE("Service not found\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } @@ -344,7 +344,7 @@ lpService->Arguments); } - DPRINT("ScControlService() done\n"); + TRACE("ScControlService() done\n"); return ERROR_SUCCESS; } @@ -360,7 +360,7 @@ BOOL bResult; DWORD dwRunningServices = 0; - DPRINT("ScDispatcherLoop() called\n"); + TRACE("ScDispatcherLoop() called\n"); ControlPacket = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -378,7 +378,7 @@ NULL); if (bResult == FALSE) { - DPRINT1("Pipe read failed (Error: %lu)\n", GetLastError()); + ERR("Pipe read failed (Error: %lu)\n", GetLastError()); return FALSE; } @@ -386,19 +386,19 @@ switch (ControlPacket->dwControl) { case SERVICE_CONTROL_START: - DPRINT("Start command - recieved SERVICE_CONTROL_START\n"); + TRACE("Start command - recieved SERVICE_CONTROL_START\n"); if (ScStartService(ControlPacket) == ERROR_SUCCESS) dwRunningServices++; break; case SERVICE_CONTROL_STOP: - DPRINT("Stop command - recieved SERVICE_CONTROL_STOP\n"); + TRACE("Stop command - recieved SERVICE_CONTROL_STOP\n"); if (ScControlService(ControlPacket) == ERROR_SUCCESS) dwRunningServices--; break; default: - DPRINT("Unknown command %lu", ControlPacket->dwControl); + TRACE("Unknown command %lu", ControlPacket->dwControl); continue; } @@ -463,7 +463,7 @@ Service->HandlerFunction = lpHandlerProc; Service->HandlerFunctionEx = NULL; - DPRINT("RegisterServiceCtrlHandler returning %lu\n", Service->hService); + TRACE("RegisterServiceCtrlHandler returning %lu\n", Service->hService); return (SERVICE_STATUS_HANDLE)Service->hService; } @@ -522,7 +522,7 @@ Service->HandlerFunctionEx = lpHandlerProc; Service->HandlerContext = lpContext; - DPRINT("RegisterServiceCtrlHandlerEx returning %lu", Service->hService); + TRACE("RegisterServiceCtrlHandlerEx returning %lu", Service->hService); return (SERVICE_STATUS_HANDLE)Service->hService; } @@ -555,8 +555,8 @@ { DWORD dwError; - DPRINT("SetServiceStatus() called\n"); - DPRINT("hServiceStatus %lu\n", hServiceStatus); + TRACE("SetServiceStatus() called\n"); + TRACE("hServiceStatus %lu\n", hServiceStatus); HandleBind(); @@ -566,12 +566,12 @@ lpServiceStatus); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); + ERR("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } - DPRINT("SetServiceStatus() done (ret %lu)\n", dwError); + TRACE("SetServiceStatus() done (ret %lu)\n", dwError); return TRUE; } @@ -590,7 +590,7 @@ DWORD dwError; PUCHAR lpMessageBuffer; - DPRINT("StartServiceCtrlDispatcherA() called\n"); + TRACE("StartServiceCtrlDispatcherA() called\n"); i = 0; while (lpServiceStartTable[i].lpServiceProc != NULL) @@ -668,7 +668,7 @@ DWORD dwError; PUCHAR lpMessageBuffer; - DPRINT("StartServiceCtrlDispatcherW() called\n"); + TRACE("StartServiceCtrlDispatcherW() called\n"); i = 0; while (lpServiceStartTable[i].lpServiceProc != NULL) Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c Fri Feb 8 20:04:39 2008 @@ -9,9 +9,9 @@ */ #include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* * @implemented @@ -381,7 +381,7 @@ if (!DupRet) { - DPRINT1("Failed to duplicate the primary token!\n"); + WARN("Failed to duplicate the primary token!\n"); return FALSE; } @@ -670,3 +670,4 @@ return PSiteSid; } +

1 0

[gedmurphy] 32221: Rewrite parts of the Virtual Machine class and start to use it to load and save VM's
by gedmurphy＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: gedmurphy Date: Fri Feb 8 18:56:05 2008 New Revision: 32221 URL: http://svn.reactos.org/svn/reactos?rev=32221&view=rev Log: Rewrite parts of the Virtual Machine class and start to use it to load and save VM's Modified: trunk/tools/RosTE/GUI/ConfigHandler.cs trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/NewVMWizard.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/ConfigHandler.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConfigHandler.cs?r… ============================================================================== --- trunk/tools/RosTE/GUI/ConfigHandler.cs (original) +++ trunk/tools/RosTE/GUI/ConfigHandler.cs Fri Feb 8 18:56:05 2008 @@ -75,87 +75,6 @@ return null; } - private bool LoadVirtMachs() - { - bool bRet = false; - - if (dataSet != null) - { - if (virtMachs == null) - { - virtMachs = new List<MainVmInfo>(); - } - - try - { - foreach (DataRow dr in dataSet.Tables["VirtMach"].Rows) - { - virtMachs.Add(new MainVmInfo((int)dr["VMConfigID"], (string)dr["Path"])); - } - - bRet = true; - } - catch (Exception ex) - { - Debug.LogMessage("Failed loading virtual machines", ex.Message, ex.StackTrace, true); - } - } - - return bRet; - } - - private void SaveVirtMachs() - { - if (dataSet != null && virtMachs != null) - { - try - { - DataTable virtMachTable = dataSet.Tables["VirtMach"]; - virtMachTable.Clear(); - - foreach (MainVmInfo vm in virtMachs) - { - DataRow dr = virtMachTable.NewRow(); - dr["VMConfigID"] = vm.id; - dr["Path"] = vm.path; - - virtMachTable.Rows.Add(dr); - } - } - catch (Exception ex) - { - Debug.LogMessage("Failed to save virtual machine table", ex.Message, ex.StackTrace, true); - } - } - } - - public int AddVirtMach(string pathIn) - { - if (dataSet != null && virtMachs != null) - { - int id = virtMachs.Count; - virtMachs.Add(new MainVmInfo(id, pathIn)); - } - - return virtMachs.Count; - } - - public bool DeleteVirtMach(int index) - { - bool bRet = false; - - foreach (MainVmInfo vm in virtMachs) - { - if (vm.id == index) - { - virtMachs.Remove(vm); - bRet = true; - } - } - - return bRet; - } - public int GetNumberOfVms() { return virtMachs.Count; @@ -238,10 +157,12 @@ settingsRow["DefVmPath"] = defVmPath; settingsRow["UpdateSched"] = updateSched; settingsRow["AppDebug"] = appDebug; - } - catch (Exception ex) - { - Debug.LogMessage("Failed to read settings from mainConf dataset", ex.Message); + + + } + catch (Exception ex) + { + Debug.LogMessage("Failed to write settings to mainConf dataset", ex.Message); } } } @@ -290,26 +211,87 @@ return; } - SaveVirtMachs(); - - try - { - FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); - xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); - dataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); - } - catch (Exception ex) - { - Debug.LogMessage("Failed to save main config file", ex.Message, ex.StackTrace, true); - } - finally - { - if (xtw != null) - xtw.Close(); + if (SaveVirtMachs()) + { + try + { + FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); + xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); + dataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); + } + catch (Exception ex) + { + Debug.LogMessage("Failed to save main config file", ex.Message, ex.StackTrace, true); + } + finally + { + if (xtw != null) + xtw.Close(); + } } } #region private methods + private bool LoadVirtMachs() + { + bool bRet = false; + + if (dataSet != null) + { + if (virtMachs == null) + { + virtMachs = new List<MainVmInfo>(); + } + + try + { + foreach (DataRow dr in dataSet.Tables["VirtMach"].Rows) + { + virtMachs.Add(new MainVmInfo((int)dr["VMConfigID"], (string)dr["Path"])); + } + + bRet = true; + } + catch (Exception ex) + { + Debug.LogMessage("Failed loading virtual machines", ex.Message, ex.StackTrace, true); + } + } + + return bRet; + } + + private bool SaveVirtMachs() + { + bool bRet = false; + + if (dataSet != null && virtMachs != null) + { + try + { + DataTable virtMachTable = dataSet.Tables["VirtMach"]; + virtMachTable.Clear(); + + foreach (MainVmInfo vm in virtMachs) + { + DataRow dr = virtMachTable.NewRow(); + dr["VMConfigID"] = vm.id; + dr["Path"] = vm.path; + + virtMachTable.Rows.Add(dr); + } + + bRet = true; + } + catch (Exception ex) + { + Debug.LogMessage("Failed to save virtual machine table", ex.Message, ex.StackTrace, true); + } + } + + return bRet; + } + private bool LoadMainSchema() { XmlTextReader xtr = null; @@ -342,26 +324,6 @@ #endregion } - - public struct VirtMachInfo - { - public int virtMachID; - public string name; - public string machType; - public string defDir; - public int memSize; - public bool setClockToHost; - public bool cdRomEnable; - public bool cdRomUsePhys; - public string cdRomPhysDrv; - public bool cdRomUseIso; - public string cdRomIsoImg; - public bool floppyEnable; - public bool floppyUsePhys; - public string floppyPhysDrv; - public bool floppyUseImg; - public string floppyIsoImg; - } public class VirtMachConfig { @@ -406,6 +368,35 @@ vmi.floppyUseImg = (bool)vmRow["FloppyUseImg"]; vmi.floppyIsoImg = (string)vmRow["FloppyIsoImg"]; + vmi.hardDrives = new List<HardDriveInfo>(); + foreach (DataRow hdRow in dataSet.Tables["HardDisks"].Rows) + { + HardDriveInfo hdi = new HardDriveInfo(); + hdi.diskID = (int)hdRow["DiskID"]; + hdi.name = (string)hdRow["Name"]; + hdi.drive = (string)hdRow["Drive"]; + hdi.path = (string)hdRow["Path"]; + hdi.size = (int)hdRow["Size"]; + hdi.bootImg = (bool)hdRow["BootImg"]; + + vmi.hardDrives.Add(hdi); + } + + vmi.netCards = new List<NetCardInfo>(); + foreach (DataRow hdRow in dataSet.Tables["NetCards"].Rows) + { + NetCardInfo nci = new NetCardInfo(); + nci.cardID = (int)hdRow["CardID"]; + nci.virtMachID = (int)hdRow["VirtMachID"]; + nci.option = (string)hdRow["Option"]; + nci.vlan = (int)hdRow["Vlan"]; + nci.macAddr = (string)hdRow["MacAddr"]; + nci.model = (string)hdRow["Model"]; + nci.hostname = (string)hdRow["HostName"]; + + vmi.netCards.Add(nci); + } + virtMachInfo.Add(vmi); } @@ -420,34 +411,62 @@ return bRet; } - public void SaveVmSettings() + public void SaveVmSettings(VirtMachInfo vmi) { if (dataSet != null) { - dataSet.Tables["VirtMach"].Rows.Clear(); - - try - { - foreach (VirtMachInfo vmi in virtMachInfo) - { - DataRow vmRow = dataSet.Tables["VirtMach"].NewRow(); - - vmRow["VirtMachID"] = vmi.virtMachID; - vmRow["Name"] = vmi.name; - vmRow["MachType"] = vmi.machType; - vmRow["DefDir"] = vmi.defDir; - vmRow["MemSize"] = vmi.memSize; - vmRow["SetClockToHost"] = vmi.setClockToHost; - vmRow["CdRomEnable"] = vmi.cdRomEnable; - vmRow["CdRomUsePhys"] = vmi.cdRomUsePhys; - vmRow["CdRomPhysDrv"] = vmi.cdRomPhysDrv; - vmRow["CdRomUseIso"] = vmi.cdRomUseIso; - vmRow["CdRomIsoImg"] = vmi.cdRomIsoImg; - vmRow["FloppyEnable"] = vmi.floppyEnable; - vmRow["FloppyUsePhys"] = vmi.floppyUsePhys; - vmRow["FloppyPhysDrv"] = vmi.floppyPhysDrv; - vmRow["FloppyUseImg"] = vmi.floppyUseImg; - vmRow["FloppyIsoImg"] = vmi.floppyIsoImg; + try + { + dataSet.Tables["VMConfig"].Rows.Clear(); + + DataRow vmRow = dataSet.Tables["VMConfig"].NewRow(); + + vmRow["VirtMachID"] = vmi.virtMachID; + vmRow["Name"] = vmi.name; + vmRow["MachType"] = vmi.machType; + vmRow["DefDir"] = vmi.defDir; + vmRow["MemSize"] = vmi.memSize; + vmRow["SetClockToHost"] = vmi.setClockToHost; + vmRow["CdRomEnable"] = vmi.cdRomEnable; + vmRow["CdRomUsePhys"] = vmi.cdRomUsePhys; + vmRow["CdRomPhysDrv"] = vmi.cdRomPhysDrv; + vmRow["CdRomUseIso"] = vmi.cdRomUseIso; + vmRow["CdRomIsoImg"] = vmi.cdRomIsoImg; + vmRow["FloppyEnable"] = vmi.floppyEnable; + vmRow["FloppyUsePhys"] = vmi.floppyUsePhys; + vmRow["FloppyPhysDrv"] = vmi.floppyPhysDrv; + vmRow["FloppyUseImg"] = vmi.floppyUseImg; + vmRow["FloppyIsoImg"] = vmi.floppyIsoImg; + + dataSet.Tables["VMConfig"].Rows.Add(vmRow); + + foreach (HardDriveInfo hdi in vmi.hardDrives) + { + DataRow hdRow = dataSet.Tables["HardDisks"].NewRow(); + + hdRow["DiskID"] = hdi.diskID; + hdRow["Name"] = hdi.name; + hdRow["Drive"] = hdi.drive; + hdRow["Path"] = hdi.path; + hdRow["Size"] = hdi.size; + hdRow["BootImg"] = hdi.bootImg; + + dataSet.Tables["HardDisks"].Rows.Add(hdRow); + } + + foreach (NetCardInfo nci in vmi.netCards) + { + DataRow ncRow = dataSet.Tables["NetCards"].NewRow(); + + ncRow["CardID"] = nci.cardID; + ncRow["VirtMachID"] = nci.virtMachID; + ncRow["Option"] = nci.option; + ncRow["Vlan"] = nci.vlan; + ncRow["MacAddr"] = nci.macAddr; + ncRow["Model"] = nci.model; + ncRow["HostName"] = nci.hostname; + + dataSet.Tables["NetCards"].Rows.Add(ncRow); } } catch (Exception ex) @@ -491,19 +510,21 @@ return ret; } - public void SaveVMConfig(string path) + public void SaveVMConfig(VirtualMachine vm) { XmlTextWriter xtw = null; - string fileName = path + "\\Config.xml"; - - if (!Directory.Exists(fileName)) - Directory.CreateDirectory(fileName); + string fileName = vm.VMInfo.defDir + "\\Config.xml"; + + if (!Directory.Exists(vm.VMInfo.defDir)) + Directory.CreateDirectory(vm.VMInfo.defDir); if (dataSet == null) { if (!LoadVirtMachSchema()) return; } + + SaveVmSettings(vm.VMInfo); try { Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.Designer.cs Fri Feb 8 18:56:05 2008 @@ -39,32 +39,32 @@ this.toolbarSep2 = new System.Windows.Forms.ToolStripSeparator(); this.toolbarSep4 = new System.Windows.Forms.ToolStripSeparator(); this.mainToolbar = new System.Windows.Forms.ToolStrip(); + this.toolbarLaunch = new System.Windows.Forms.ToolStripButton(); + this.toolbarStop = new System.Windows.Forms.ToolStripButton(); + this.toolbarImageAdd = new System.Windows.Forms.ToolStripButton(); + this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); + this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); this.toolbarSep3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); + this.toolbarExit = new System.Windows.Forms.ToolStripButton(); this.mainMenu = new System.Windows.Forms.MenuStrip(); this.mainmenuFile = new System.Windows.Forms.ToolStripMenuItem(); this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.virtualMachineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenuFileExit = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenuOptions = new System.Windows.Forms.ToolStripMenuItem(); - this.mainmenuHelp = new System.Windows.Forms.ToolStripMenuItem(); - this.mainmenuHelpContent = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.MainMenuHelpAbout = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolbarLaunch = new System.Windows.Forms.ToolStripButton(); - this.toolbarStop = new System.Windows.Forms.ToolStripButton(); - this.toolbarImageAdd = new System.Windows.Forms.ToolStripButton(); - this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); - this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); - this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); - this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); - this.toolbarExit = new System.Windows.Forms.ToolStripButton(); this.snapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.takeSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.deleteSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mainmenuHelp = new System.Windows.Forms.ToolStripMenuItem(); + this.mainmenuHelpContent = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.MainMenuHelpAbout = new System.Windows.Forms.ToolStripMenuItem(); this.mainToolbar.SuspendLayout(); this.mainMenu.SuspendLayout(); this.SuspendLayout(); @@ -162,10 +162,87 @@ this.mainToolbar.Size = new System.Drawing.Size(540, 25); this.mainToolbar.TabIndex = 10; // + // toolbarLaunch + // + this.toolbarLaunch.Image = ((System.Drawing.Image)(resources.GetObject("toolbarLaunch.Image"))); + this.toolbarLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarLaunch.Name = "toolbarLaunch"; + this.toolbarLaunch.Size = new System.Drawing.Size(66, 22); + this.toolbarLaunch.Text = "Launch"; + this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; + // + // toolbarStop + // + this.toolbarStop.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarStop.Image = ((System.Drawing.Image)(resources.GetObject("toolbarStop.Image"))); + this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarStop.Name = "toolbarStop"; + this.toolbarStop.Size = new System.Drawing.Size(23, 22); + this.toolbarStop.ToolTipText = "Stops the virtual machine"; + // + // toolbarImageAdd + // + this.toolbarImageAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarImageAdd.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageAdd.Image"))); + this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarImageAdd.Name = "toolbarImageAdd"; + this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); + this.toolbarImageAdd.ToolTipText = "Adds a new image"; + this.toolbarImageAdd.Click += new System.EventHandler(this.CreateNewVirtMach); + // + // toolbarImageDel + // + this.toolbarImageDel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarImageDel.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageDel.Image"))); + this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarImageDel.Name = "toolbarImageDel"; + this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); + this.toolbarImageDel.ToolTipText = "Deletes an existing image"; + this.toolbarImageDel.Click += new System.EventHandler(this.DeleteVirtMach); + // + // toolbarSnapShot + // + this.toolbarSnapShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarSnapShot.Image = ((System.Drawing.Image)(resources.GetObject("toolbarSnapShot.Image"))); + this.toolbarSnapShot.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarSnapShot.Name = "toolbarSnapShot"; + this.toolbarSnapShot.Size = new System.Drawing.Size(23, 22); + this.toolbarSnapShot.Text = "toolStripButton1"; + this.toolbarSnapShot.ToolTipText = "Create a snap shot of the current status"; + // + // toolbarScreenShot + // + this.toolbarScreenShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarScreenShot.Image = ((System.Drawing.Image)(resources.GetObject("toolbarScreenShot.Image"))); + this.toolbarScreenShot.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarScreenShot.Name = "toolbarScreenShot"; + this.toolbarScreenShot.Size = new System.Drawing.Size(23, 22); + this.toolbarScreenShot.Text = "toolStripButton2"; + this.toolbarScreenShot.ToolTipText = "Grab a screenshot of the display"; + // // toolbarSep3 // this.toolbarSep3.Name = "toolbarSep3"; this.toolbarSep3.Size = new System.Drawing.Size(6, 25); + // + // toolbarHelpContents + // + this.toolbarHelpContents.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarHelpContents.Image = ((System.Drawing.Image)(resources.GetObject("toolbarHelpContents.Image"))); + this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarHelpContents.Name = "toolbarHelpContents"; + this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); + this.toolbarHelpContents.ToolTipText = "Opens help file"; + // + // toolbarExit + // + this.toolbarExit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarExit.Image = ((System.Drawing.Image)(resources.GetObject("toolbarExit.Image"))); + this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarExit.Name = "toolbarExit"; + this.toolbarExit.Size = new System.Drawing.Size(23, 22); + this.toolbarExit.ToolTipText = "Exits application"; + this.toolbarExit.Click += new System.EventHandler(this.toolbarExit_Click); // // mainMenu // @@ -185,7 +262,7 @@ this.newToolStripMenuItem, this.mainmenuFileExit}); this.mainmenuFile.Name = "mainmenuFile"; - this.mainmenuFile.Size = new System.Drawing.Size(35, 20); + this.mainmenuFile.Size = new System.Drawing.Size(37, 20); this.mainmenuFile.Text = "File"; // // newToolStripMenuItem @@ -193,7 +270,7 @@ this.newToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.virtualMachineToolStripMenuItem}); this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(106, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(98, 22); this.newToolStripMenuItem.Text = "New"; // // virtualMachineToolStripMenuItem @@ -206,7 +283,7 @@ // mainmenuFileExit // this.mainmenuFileExit.Name = "mainmenuFileExit"; - this.mainmenuFileExit.Size = new System.Drawing.Size(106, 22); + this.mainmenuFileExit.Size = new System.Drawing.Size(98, 22); this.mainmenuFileExit.Text = "Exit"; this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -216,125 +293,20 @@ this.toolStripSeparator2, this.settingsToolStripMenuItem}); this.mainmenuOptions.Name = "mainmenuOptions"; - this.mainmenuOptions.Size = new System.Drawing.Size(56, 20); + this.mainmenuOptions.Size = new System.Drawing.Size(61, 20); this.mainmenuOptions.Text = "Options"; // - // mainmenuHelp - // - this.mainmenuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mainmenuHelpContent, - this.toolStripSeparator1, - this.MainMenuHelpAbout}); - this.mainmenuHelp.Name = "mainmenuHelp"; - this.mainmenuHelp.Size = new System.Drawing.Size(40, 20); - this.mainmenuHelp.Text = "Help"; - // - // mainmenuHelpContent - // - this.mainmenuHelpContent.Name = "mainmenuHelpContent"; - this.mainmenuHelpContent.Size = new System.Drawing.Size(124, 22); - this.mainmenuHelpContent.Text = "Content"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(121, 6); - // - // MainMenuHelpAbout - // - this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; - this.MainMenuHelpAbout.Size = new System.Drawing.Size(124, 22); - this.MainMenuHelpAbout.Text = "About"; - this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); - // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(113, 6); // // settingsToolStripMenuItem // this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(116, 22); this.settingsToolStripMenuItem.Text = "Settings"; this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); - // - // toolbarLaunch - // - this.toolbarLaunch.Image = ((System.Drawing.Image)(resources.GetObject("toolbarLaunch.Image"))); - this.toolbarLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarLaunch.Name = "toolbarLaunch"; - this.toolbarLaunch.Size = new System.Drawing.Size(61, 22); - this.toolbarLaunch.Text = "Launch"; - this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; - // - // toolbarStop - // - this.toolbarStop.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarStop.Image = ((System.Drawing.Image)(resources.GetObject("toolbarStop.Image"))); - this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarStop.Name = "toolbarStop"; - this.toolbarStop.Size = new System.Drawing.Size(23, 22); - this.toolbarStop.ToolTipText = "Stops the virtual machine"; - // - // toolbarImageAdd - // - this.toolbarImageAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarImageAdd.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageAdd.Image"))); - this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarImageAdd.Name = "toolbarImageAdd"; - this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); - this.toolbarImageAdd.ToolTipText = "Adds a new image"; - this.toolbarImageAdd.Click += new System.EventHandler(this.CreateNewVirtMach); - // - // toolbarImageDel - // - this.toolbarImageDel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarImageDel.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageDel.Image"))); - this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarImageDel.Name = "toolbarImageDel"; - this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); - this.toolbarImageDel.ToolTipText = "Deletes an existing image"; - this.toolbarImageDel.Click += new System.EventHandler(this.DeleteVirtMach); - // - // toolbarSnapShot - // - this.toolbarSnapShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarSnapShot.Image = ((System.Drawing.Image)(resources.GetObject("toolbarSnapShot.Image"))); - this.toolbarSnapShot.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarSnapShot.Name = "toolbarSnapShot"; - this.toolbarSnapShot.Size = new System.Drawing.Size(23, 22); - this.toolbarSnapShot.Text = "toolStripButton1"; - this.toolbarSnapShot.ToolTipText = "Create a snap shot of the current status"; - // - // toolbarScreenShot - // - this.toolbarScreenShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarScreenShot.Image = ((System.Drawing.Image)(resources.GetObject("toolbarScreenShot.Image"))); - this.toolbarScreenShot.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarScreenShot.Name = "toolbarScreenShot"; - this.toolbarScreenShot.Size = new System.Drawing.Size(23, 22); - this.toolbarScreenShot.Text = "toolStripButton2"; - this.toolbarScreenShot.ToolTipText = "Grab a screenshot of the display"; - // - // toolbarHelpContents - // - this.toolbarHelpContents.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarHelpContents.Image = ((System.Drawing.Image)(resources.GetObject("toolbarHelpContents.Image"))); - this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarHelpContents.Name = "toolbarHelpContents"; - this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); - this.toolbarHelpContents.ToolTipText = "Opens help file"; - // - // toolbarExit - // - this.toolbarExit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarExit.Image = ((System.Drawing.Image)(resources.GetObject("toolbarExit.Image"))); - this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarExit.Name = "toolbarExit"; - this.toolbarExit.Size = new System.Drawing.Size(23, 22); - this.toolbarExit.ToolTipText = "Exits application"; - this.toolbarExit.Click += new System.EventHandler(this.toolbarExit_Click); // // snapshotToolStripMenuItem // @@ -344,31 +316,59 @@ this.toolStripSeparator3, this.deleteSnapshotToolStripMenuItem}); this.snapshotToolStripMenuItem.Name = "snapshotToolStripMenuItem"; - this.snapshotToolStripMenuItem.Size = new System.Drawing.Size(64, 20); + this.snapshotToolStripMenuItem.Size = new System.Drawing.Size(68, 20); this.snapshotToolStripMenuItem.Text = "Snapshot"; // // takeSnapshotToolStripMenuItem // this.takeSnapshotToolStripMenuItem.Name = "takeSnapshotToolStripMenuItem"; - this.takeSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.takeSnapshotToolStripMenuItem.Size = new System.Drawing.Size(158, 22); this.takeSnapshotToolStripMenuItem.Text = "Take snapshot"; // // loadSnapshotToolStripMenuItem // this.loadSnapshotToolStripMenuItem.Name = "loadSnapshotToolStripMenuItem"; - this.loadSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.loadSnapshotToolStripMenuItem.Size = new System.Drawing.Size(158, 22); this.loadSnapshotToolStripMenuItem.Text = "Load snapshot"; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(160, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(155, 6); // // deleteSnapshotToolStripMenuItem // this.deleteSnapshotToolStripMenuItem.Name = "deleteSnapshotToolStripMenuItem"; - this.deleteSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.deleteSnapshotToolStripMenuItem.Size = new System.Drawing.Size(158, 22); this.deleteSnapshotToolStripMenuItem.Text = "Delete snapshot"; + // + // mainmenuHelp + // + this.mainmenuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainmenuHelpContent, + this.toolStripSeparator1, + this.MainMenuHelpAbout}); + this.mainmenuHelp.Name = "mainmenuHelp"; + this.mainmenuHelp.Size = new System.Drawing.Size(44, 20); + this.mainmenuHelp.Text = "Help"; + // + // mainmenuHelpContent + // + this.mainmenuHelpContent.Name = "mainmenuHelpContent"; + this.mainmenuHelpContent.Size = new System.Drawing.Size(117, 22); + this.mainmenuHelpContent.Text = "Content"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6); + // + // MainMenuHelpAbout + // + this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; + this.MainMenuHelpAbout.Size = new System.Drawing.Size(117, 22); + this.MainMenuHelpAbout.Text = "About"; + this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); // // MainForm // Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=32… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Fri Feb 8 18:56:05 2008 @@ -14,6 +14,7 @@ public partial class MainForm : Form { private MainConfig mainConf; + private ArrayList virtualMachines; public MainForm() { @@ -47,7 +48,7 @@ { foreach (VirtMachInfo vmInfo in vmConfig.VMInfo) { - VirtualMachine vm = new VirtualMachine(); + VirtualMachine vm = new VirtualMachine(vmInfo); ListViewItem lvi = VirtMachListView.Items.Add(vmConfig.ToString(), 0); lvi.SubItems.Add(vm.MemSize.ToString() + " MB"); @@ -97,53 +98,30 @@ if (wizFrm.ShowDialog() == DialogResult.OK) { - if (wizFrm.Option == 1) + VirtualMachine virtMach = new VirtualMachine(); + virtMach.Name = wizFrm.VMName; + + switch (wizFrm.Option) { - try - { + case 1: if (!Directory.Exists(wizFrm.DefDir)) Directory.CreateDirectory(wizFrm.DefDir); - } - catch (Exception ex) - { - MessageBox.Show("Failed to create " + wizFrm.DefDir + '\n' + ex.Message); - return; - } - int i = mainConf.AddVirtMach(wizFrm.DefDir); + virtMach.DefDir = wizFrm.DefDir; + break; - VirtualMachine VirtMach = new VirtualMachine(); - VirtMach.CreateVMConfig(wizFrm.VMName, - wizFrm.DefDir, - wizFrm.DiskSizeGB, - wizFrm.ExistImg, - wizFrm.MemSizeMB); + case 2: - ListViewItem lvi = VirtMachListView.Items.Add(VirtMach.ToString(), 0); - lvi.Tag = VirtMach; + break; + + case 3: + virtMach.DefDir = "Images\\" + wizFrm.VMName; + break; } - else if (wizFrm.Option == 2) - { - DirectoryInfo di = Directory.GetParent(wizFrm.ExistImg); - int i = mainConf.AddVirtMach(di.FullName); - VirtualMachine VirtMach = new VirtualMachine(); - VirtMach.CreateVMConfig(wizFrm.VMName, - wizFrm.ExistImg, - wizFrm.MemSizeMB); - - ListViewItem lvi = VirtMachListView.Items.Add(VirtMach.ToString(), 0); - lvi.Tag = VirtMach; - } - else - { - int i = mainConf.AddVirtMach("Images\\" + wizFrm.VMName); - VirtualMachine VirtMach = new VirtualMachine(); - VirtMach.CreateVMConfig(wizFrm.VMName); - - ListViewItem lvi = VirtMachListView.Items.Add(VirtMach.ToString(), 0); - lvi.Tag = VirtMach; - } + ListViewItem lvi = VirtMachListView.Items.Add(virtMach.Name, 0); + lvi.SubItems.Add(virtMach.MemSize.ToString() + " MB"); + lvi.Tag = virtMach; } } @@ -174,7 +152,7 @@ } } - mainConf.DeleteVirtMach(lvi.Index/*lvi.Tag*/); + //mainConf.DeleteVirtMach(lvi.Index/*lvi.Tag*/); VirtMachListView.Items.Remove(lvi); } } @@ -182,10 +160,12 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e) { - foreach(ListViewItem lvi in VirtMachListView.Items) + VirtMachConfig vmc = new VirtMachConfig(); + + foreach (ListViewItem lvi in VirtMachListView.Items) { - VirtMachConfig vm = (VirtMachConfig)lvi.Tag; - vm.SaveVMConfig("err"); + VirtualMachine vm = (VirtualMachine)lvi.Tag; + vmc.SaveVMConfig(vm); } mainConf.SaveSettings(); Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.resx (original) +++ trunk/tools/RosTE/GUI/MainForm.resx Fri Feb 8 18:56:05 2008 @@ -164,9 +164,6 @@ <metadata name="mainToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>358, 23</value> </metadata> - <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>242, 22</value> - </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="toolbarLaunch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> @@ -190,12 +187,12 @@ <data name="toolbarImageAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPtJREFUOE9jYKAV - 8PDwYE9LS2Otr69nIscOxtDw4P/2DvZ/gfQ/EDs+Pp6DJIPCImz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ - 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyr729PQtQMRvI6TADIqLCfkZHR/PhNQDkTyj+B7LdycXh7917d8Au - iIwO/4MkD1aHYRhI8M7dW0B8+z9II4gG4QMH96Pgg4cO4DYAFGhHjh7+f/jIIbwYpwvQnXnm7On/IOzg - BI5OmBexuwDdTyANV65eBuPwSNs/JKcDkAHXb1wDY7INuHzl0n8QJssAUOIJjwz9DcIgNihvEExIA6IA - ADzE3xfN6Q2vAAAAAElFTkSuQmCC + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPpJREFUOE9jYKAV + 8PDwYE9LS2Otr69nIscOxtDw4P/29vZ/gfQ/EDs+Pp6DJIPCIqz/3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ + 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyL1AjC1AxG8jpMAMiosJ+RkdH8+E1AORPKP4Hst3R2f7v3Xt3wC6I + jA7/gyQPVodhGEjwzt1bQHz7P0gjiAbhAwf3o+CDhw7gNgAUaEeOHv5/+MghvBinC9Cdeebs6f8gbO8I + jk6YF7G7AN1PIA1Xrl4G4/BImz8kpwOQAddvXANjsg24fOXSfxAmywBQ4gmPDP0NwiA2KG8QTEgDogAA + Is/fC3RwXJUAAAAASUVORK5CYII= </value> </data> <data name="toolbarImageDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -241,20 +238,20 @@ <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAthJREFUOE+FU11I - U2EYXllBF3VjW91JklGUmCnSxBIVR+aSfgjMm0FKpgRezFwQdCIbQi5N259DcOBMUOjCfpSwFuRkRngj - FhRIprmpzJ2/eXbOztnbeT9Tcl104OF853zP+37P+7zvt0OT8jiuVJVIuaeqlb37zic18iHc3qnZFU4T - uLHdX7723x4cnkiNId8URe3xnNMHB48fUz76/QrPcyBJEoiiCDQdBf/bMeX50SwFOcjdlmRoaCjNk5MT - em+5I0uhEAhTQWAYGqLRCAHDRCEWmID1mRkYq78pIxdjtpJ4zhZ+6DeZEtLcHDB1dUAXFwMT+kWSsCwN - THgJ6LIyYCwtIExPQ5/KxRiSwHm1KteWeVgWZmeBMZmAKS2FSHU1+C4aE6rUOMJ3qSoRra0FtrISGLMZ - +MkA2DIyZPdl42lNh/WBY7THneRfvwK6qAjWamrArtMmXRXlTqqL2o/wqGv7QV0y2thIlHCjb8D/Ylix - Pbzn0nR22n5EIquqUWvAhkMwYjRK7rLip6lOOw0lT97pz8j86jLhhtWyMBbdj8diPDEL30S2empqAqJG - 3ROE9T/G0oRLEmDLsFWCEPtvAlGMEy4aTBKgjJWVZdVtFgSOhZe36kV3RXl7qgK3obRj1GyOi6oClmVg - aWlxowQ0wj/gU/jeXmAbGoAeHwdfZqbirjA4Nk10XTDYB7KOKNz3b8BaHwFnfwZ+l1PBBmiwFQ6tNslb - LEDr9cBTFDCBAIzctUjddiqOGKEoKfZzHmJeL9AFBcDeuAH29PQkjgBR6tUXTATz8yHW3Ax0YSFwLS2A - UmU5oUKGhCQC191Fgjl1HiazswFjtsrEsew7eWI1mJcHXFMTcD1uUidO4QYY4Bx2cjIGI3fbKG9eJq9e - /9mh0yU/tVnlxcUF4jZiYWEBpqytskN7IImcfy7T347br18r6my932Oztc8/trWJCFzjP7zqqd35DfRf - Lu+Mc2gnAAAAAElFTkSuQmCC + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAttJREFUOE+FU11I + U2EYXllBF3VjW91JklGUmCnWxBIVR+aSfgjMm4FKpgRezFwQdMK0oC1Nd/bjEBypCQpdWKmEtQgnM8Ib + saBAspmbytz5m2fn7Jzzdr7PlFwXHXg43znf877f8z7v++3QJD2OqxVFYvapSnnvvguKRjqEtndqdoVT + eHZ895evfbcHhyeTY/A3QRB7POf1gcHjx+SPPp/McSyIogiCIABFRcH3dlx+cTRDRhzE3ZZkaGgoxZOV + FXpvuSOJoRDw0wGgaQqi0QgGTUch5p+E9dlZGK+7KSEuitlK4jmX/+G5yZQQ5+eBrq0FqrAQ6NAvnIRh + KKDDS0CVlABtaQZ+ZgZ6VS6KwQmc1yqyremHJX5uDmiTCejiYohUVkLfJWNClRpH6LtckYjW1ABTXg60 + 2QzclB+saWmS+4rxtKa97YFj1O1SuDevgSoogLWqKrDrtIqrrNRJdBL7ETzq2n5Qp0QbGrASdmwUfC+H + ZVvLPZemo8P2IxJZVY1aAyYcghGjUXSXFD5LdtppKHr67uwZiVtdxtywWhaKRe7HYzEOm4XeWLZ6anIC + rEbd4/n1P8ZSmIsToJahVvF87L8JBCGOuchgnADJWFlZVt1mgGcZeHWrTnCXlVqTFbgNxe1jZnNcUBUw + DA1LS4sbJSAjfAP9MtfTA0x9PVATE9Cfni67ywyOTRNdFw3kQMYRmf3+DZi2VmBJO/hcThk1QINaQWq1 + CmexAKXXA0cQQPv9MHLXInaRRBxhhCDE2M8FiHm9QOXlAVNdDfbUVAWNAFbq1edNBnJzIdbUBFR+PrDN + zYCkSlJChQQJUQC2qxMHs+o8TGVmAorZKhONZe/JE6uBnBxgGxuB7XbjOtEUboAG1kHik1Ew4m4b5c3L + 5NXrP5M6nfLpUau0uBjEbiMEg0GYbm2RSO0BBXH+uUx/O07euF7Q8fB+t81mXXhieywgoDX6h656cnd+ + A8q3Lto1lVQmAAAAAElFTkSuQmCC </value> </data> <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -269,6 +266,9 @@ LCXCNDrnyf/3rlL671en+j+gTut/QL02TgPAyZuYjIQ1L5CTswFNRoUxygqSMgAAAABJRU5ErkJggg== </value> </data> + <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>242, 22</value> + </metadata> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAkAEBAAAAEACABoBQAAlgAAACAgAAABAAgAqAgAAP4FAAAwMAAAAQAIAKgOAACmDgAAEBAAAAEA Modified: trunk/tools/RosTE/GUI/NewVMWizard.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewVMWizard.cs?rev… ============================================================================== --- trunk/tools/RosTE/GUI/NewVMWizard.cs (original) +++ trunk/tools/RosTE/GUI/NewVMWizard.cs Fri Feb 8 18:56:05 2008 @@ -13,6 +13,7 @@ { private MainConfig mainConf; + #region properties public string VMName { get { return nameTxtBox.Text; } @@ -42,6 +43,7 @@ else return 3; } } + #endregion public NewVMWizard(MainConfig mainConfIn) { Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.cs Fri Feb 8 18:56:05 2008 @@ -87,10 +87,9 @@ private void LoadHardDiskPage() { - ArrayList hardDrives = VirtMach.GetHardDisks(); - foreach (VMHardDrive vmhd in hardDrives) - { - harddiskLstBox.Items.Add(vmhd); + foreach (HardDriveInfo hdi in VirtMach.HardDrives) + { + harddiskLstBox.Items.Add(hdi); } if (harddiskLstBox.Items.Count > 0) @@ -308,12 +307,12 @@ ListBox lb = (ListBox)sender; if (lb.SelectedItem != null) { - VMHardDrive vmhd = (VMHardDrive)lb.SelectedItem; - - harddiskDriveName.Text = vmhd.Drive; - harddiskFileNameTxtBox.Text = vmhd.Path; - harddiskSizeLbl.Text = vmhd.Size.ToString(); - harddiskBootImageChk.Checked = vmhd.BootImg; + HardDriveInfo hdi = (HardDriveInfo)lb.SelectedItem; + + harddiskDriveName.Text = hdi.name; + harddiskFileNameTxtBox.Text = hdi.path; + harddiskSizeLbl.Text = hdi.size.ToString(); + harddiskBootImageChk.Checked = hdi.bootImg; } } Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Fri Feb 8 18:56:05 2008 @@ -9,6 +9,50 @@ namespace RosTEGUI { + public struct VirtMachInfo + { + public int virtMachID; + public string name; + public string machType; + public string defDir; + public int memSize; + public bool setClockToHost; + public bool cdRomEnable; + public bool cdRomUsePhys; + public string cdRomPhysDrv; + public bool cdRomUseIso; + public string cdRomIsoImg; + public bool floppyEnable; + public bool floppyUsePhys; + public string floppyPhysDrv; + public bool floppyUseImg; + public string floppyIsoImg; + + public List<HardDriveInfo> hardDrives; + public List<NetCardInfo> netCards; + } + + public struct HardDriveInfo + { + public int diskID; + public string name; + public string drive; + public string path; + public int size; + public bool bootImg; + } + + public struct NetCardInfo + { + public int cardID; + public int virtMachID; + public string option; + public int vlan; + public string macAddr; + public string model; + public string hostname; + } + public class VMHardDrive { private DataRow hdDataRow; @@ -109,222 +153,120 @@ } } + public class VMNetCard + { + } + public class VirtualMachine { - private DataRow vmDataRow; - + private VirtMachInfo vmInfo; + + private ArrayList netCards; private ArrayList hardDrives; - private ArrayList netCards; #region Virtual machine properties - public int VirtMachID { - get { return GetIntValue("VirtMachID"); } - } - + get { return vmInfo.virtMachID; } + } public string Name { - get { return GetStringValue("Name"); } - set { SetStringValue("Name", value); } - } - + get { return vmInfo.name; } + set { vmInfo.name = value; } + } public string MachType { - get { return GetStringValue("MachType"); } - set { SetStringValue("MachType", value); } - } - + get { return vmInfo.machType; } + set { vmInfo.machType = value; } + } public string DefDir { - get { return GetStringValue("DefDir"); } - set { SetStringValue("DefDir", value); } - } - + get { return vmInfo.defDir; } + set { vmInfo.defDir = value; } + } public int MemSize { - get { return GetIntValue("MemSize"); } - set { SetIntValue("MemSize", value); } - } - + get { return vmInfo.memSize; } + set { vmInfo.memSize = value; } + } public bool SetClockToHost { - get { return GetBoolValue("SetClockToHost"); } - set { SetBoolValue("SetClockToHost", value); } - } - + get { return vmInfo.setClockToHost; } + set { vmInfo.setClockToHost = value; } + } public bool CdRomEnable { - get { return GetBoolValue("CdRomEnable"); } - set { SetBoolValue("CdRomEnable", value); } - } - + get { return vmInfo.cdRomEnable; } + set { vmInfo.cdRomEnable = value; } + } public bool CdRomUsePhys { - get { return GetBoolValue("CdRomUsePhys"); } - set { SetBoolValue("CdRomUsePhys", value); } - } - + get { return vmInfo.cdRomUsePhys; } + set { vmInfo.cdRomUsePhys = value; } + } public string CdRomPhysDrv { - get { return GetStringValue("CdRomPhysDrv"); } - set { SetStringValue("CdRomPhysDrv", value); } - } - + get { return vmInfo.cdRomPhysDrv; } + set { vmInfo.cdRomPhysDrv = value; } + } public bool CdRomUseIso { - get { return GetBoolValue("CdRomUseIso"); } - set { SetBoolValue("CdRomUseIso", value); } - } - + get { return vmInfo.cdRomUseIso; } + set { vmInfo.cdRomUseIso = value; } + } public string CdRomIsoImg { - get { return GetStringValue("CdRomIsoImg"); } - set { SetStringValue("CdRomIsoImg", value); } - } - + get { return vmInfo.cdRomIsoImg; } + set { vmInfo.cdRomIsoImg = value; } + } public bool FloppyEnable { - get { return GetBoolValue("FloppyEnable"); } - set { SetBoolValue("FloppyEnable", value); } - } - + get { return vmInfo.floppyEnable; } + set { vmInfo.floppyEnable = value; } + } public bool FloppyUsePhys { - get { return GetBoolValue("FloppyUsePhys"); } - set { SetBoolValue("FloppyUsePhys", value); } - } - + get { return vmInfo.floppyUsePhys; } + set { vmInfo.floppyUsePhys = value; } + } public string FloppyPhysDrv { - get { return GetStringValue("FloppyPhysDrv"); } - set { SetStringValue("FloppyPhysDrv", value); } - } - - public bool FloppyUseIso - { - get { return GetBoolValue("FloppyUseIso"); } - set { SetBoolValue("FloppyUseIso", value); } - } - + get { return vmInfo.floppyPhysDrv; } + set { vmInfo.floppyPhysDrv = value; } + } + public bool FloppyUseImg + { + get { return vmInfo.floppyUseImg; } + set { vmInfo.floppyUseImg = value; } + } public string FloppyIsoImg { - get { return GetStringValue("FloppyIsoImg"); } - set { SetStringValue("FloppyIsoImg", value); } - } - + get { return vmInfo.floppyIsoImg; } + set { vmInfo.floppyIsoImg = value; } + } + public VirtMachInfo VMInfo + { + get { return vmInfo; } + } + public List<HardDriveInfo> HardDrives + { + get { return vmInfo.hardDrives; } + } + public List<NetCardInfo> NetCards + { + get { return vmInfo.netCards; } + } #endregion - #region property helper functions - - private int GetIntValue(string key) - { - try - { - return (int)vmDataRow[key]; - } - catch (ArgumentException e) - { - string message = "Failed to get " + key + " value"; - Debug.LogMessage(message, e.Message, e.StackTrace, true); - return 0; - } - } - - private bool GetBoolValue(string key) - { - try - { - return (bool)vmDataRow[key]; - } - catch (ArgumentException e) - { - string message = "Failed to get " + key + " value"; - Debug.LogMessage(message, e.Message, e.StackTrace, true); - return false; - } - } - - private string GetStringValue(string key) - { - try - { - return (string)vmDataRow[key]; - } - catch (ArgumentException e) - { - string message = "Failed to get " + key + " value"; - Debug.LogMessage(message, e.Message, e.StackTrace, true); - return string.Empty; - } - } - - private void SetIntValue(string key, int value) - { - try - { - vmDataRow[key] = value; - } - catch (ArgumentException e) - { - string message = "Failed to set " + key + " value"; - Debug.LogMessage(message, e.Message, e.StackTrace, true); - } - } - - private void SetBoolValue(string key, bool value) - { - try - { - vmDataRow[key] = value; - } - catch (ArgumentException e) - { - string message = "Failed to set " + key + " value"; - Debug.LogMessage(message, e.Message, e.StackTrace, true); - } - } - - private void SetStringValue(string key, string value) - { - try - { - vmDataRow[key] = value; - } - catch (ArgumentException e) - { - string message = "Failed to set " + key + " value"; - Debug.LogMessage(message, e.Message, e.StackTrace, true); - } - } - - #endregion - - #region database functions - - private bool PopulateVMDatabase(string name, - string dir, - float diskSize, - string existImg, - int memSize) - { - bool ret = false; - - return ret; - } - - - - #endregion - public VirtualMachine() - {/* - vmConfig = new VMConfig(); - if (!vmConfig.LoadVirtMachData()) - MessageBox.Show("Failed to load VM Schema"); - - hardDrives = new ArrayList(3); - netCards = new ArrayList();*/ + { + vmInfo = new VirtMachInfo(); + CreateDefaultConfig(); + } + + public VirtualMachine(VirtMachInfo vmInfoIn) + { + vmInfo = vmInfoIn; } public override string ToString() @@ -369,11 +311,7 @@ ;//FIXME: create a vm image 'qemu-img.exe create' } - return PopulateVMDatabase(name, - dir, - diskSize, - existImg, - memSize); + return false; } public VMHardDrive AddHardDisk(string nameIn, @@ -402,5 +340,48 @@ { return hardDrives; } + + private void CreateDefaultConfig() + { + vmInfo.virtMachID = 0; + vmInfo.name = "New VM " + vmInfo.virtMachID.ToString(); + vmInfo.machType = string.Empty; + vmInfo.defDir = string.Empty; + vmInfo.memSize = 0; + vmInfo.setClockToHost = true; + vmInfo.cdRomEnable = true; + vmInfo.cdRomUsePhys = true; + vmInfo.cdRomPhysDrv = string.Empty; + vmInfo.cdRomUseIso = false; + vmInfo.cdRomIsoImg = string.Empty; + vmInfo.floppyEnable = false; + vmInfo.floppyUsePhys = false; + vmInfo.floppyPhysDrv = string.Empty; + vmInfo.floppyUseImg = false; + vmInfo.floppyIsoImg = string.Empty; + + HardDriveInfo hdi = new HardDriveInfo(); + hdi.bootImg = true; + hdi.diskID = 1; + hdi.drive = string.Empty; + hdi.name = "root"; + hdi.path = string.Empty; + hdi.size = 0; + + vmInfo.hardDrives = new List<HardDriveInfo>(); + vmInfo.hardDrives.Add(hdi); + + NetCardInfo nci = new NetCardInfo(); + nci.cardID = 1; + nci.hostname = string.Empty; + nci.macAddr = string.Empty; + nci.model = string.Empty; + nci.option = string.Empty; + nci.virtMachID = 0; + nci.vlan = 0; + + vmInfo.netCards = new List<NetCardInfo>(); + vmInfo.netCards.Add(nci); + } } }

1 0

[cfinck] 32220: ANSI -> OEM charset conversion
by cfinck＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: cfinck Date: Fri Feb 8 17:46:27 2008 New Revision: 32220 URL: http://svn.reactos.org/svn/reactos?rev=32220&view=rev Log: ANSI -> OEM charset conversion Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Fri Feb 8 17:46:27 2008 @@ -1,4 +1,4 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) +/* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 22-01-2008 */ @@ -10,37 +10,37 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Výber jazyka.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Zvo¾te si jazyk, ktorý sa pouije poèas intalácie.", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Vìber jazyka.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Zvoóte si jazyk, ktorì sa pouzije poas instal cie.", TEXT_NORMAL }, { 8, 11, - " Potom stlaète ENTER.", + " Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Tento jazyk bude predvoleným jazykom naintalovaného systému.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraèova F3 = Skonèi", + "\x07 Tento jazyk bude predvolenìm jazykom nainstalovanho systmu.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova_ F3 = Skoni_", TEXT_STATUS }, { @@ -56,55 +56,55 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Víta Vás Intalátor systému ReactOS", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "V¡ta V s Instal tor systmu ReactOS", TEXT_HIGHLIGHT }, { 6, 11, - "Tento stupeò Intalátora skopíruje operaèný systém ReactOS na Vá", + "Tento stupe Instal tora skop¡ruje operanì systm ReactOS na V s", TEXT_NORMAL }, { 6, 12, - "poèítaè a pripraví druhý stupeò Intalátora.", + "po¡ta a priprav¡ druhì stupe Instal tora.", TEXT_NORMAL }, { 8, 15, - "\x07 Stlaète ENTER pre naintalovanie systému ReactOS.", + "\x07 Stlate ENTER pre nainstalovanie systmu ReactOS.", TEXT_NORMAL }, { 8, 17, - "\x07 Stlaète R pre opravu systému ReactOS.", + "\x07 Stlate R pre opravu systmu ReactOS.", TEXT_NORMAL }, { 8, 19, - "\x07 Stlaète L, ak chcete zobrazi licenèné podmienky systému ReactOS.", + "\x07 Stlate L, ak chcete zobrazi_ licenn podmienky systmu ReactOS.", TEXT_NORMAL }, { 8, 21, - "\x07 Stlaète F3 pre skonèenie intalácie bez naintalovania systému ReactOS.", + "\x07 Stlate F3 pre skonenie instal cie bez nainstalovania systmu ReactOS.", TEXT_NORMAL }, { 6, 23, - "Pre viac informácií o systéme ReactOS, navtívte prosím:", + "Pre viac inform ci¡ o systme ReactOS, navst¡vte pros¡m:", TEXT_NORMAL }, { @@ -116,7 +116,7 @@ { 0, 0, - " ENTER = Pokraèova R = Opravi F3 = Skonèi", + " ENTER = Pokraova_ R = Opravi_ F3 = Skoni_", TEXT_STATUS }, { @@ -132,85 +132,85 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Intalátor systému ReactOS je v zaèiatoènom tádiu vývoja. Zatia¾", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instal tor systmu ReactOS je v zaiatonom st diu vìvoja. Zatiaó", TEXT_NORMAL }, { 6, 9, - "nepodporuje vetky funkcie plne vyuívajúce program Intalátor.", + "nepodporuje vsetky funkcie plne vyuz¡vaj£ce program Instal tor.", TEXT_NORMAL }, { 6, 12, - "Má nasledujúce obmedzenia:", + "M nasleduj£ce obmedzenia:", TEXT_NORMAL }, { 8, 13, - "- Intalátor nepracuje s viac ako 1 primárnou oblasou na 1 disk.", + "- Instal tor nepracuje s viac ako 1 prim rnou oblas_ou na 1 disk.", TEXT_NORMAL }, { 8, 14, - "- Intalátor nevie odstráni primárnu oblas z disku,", + "- Instal tor nevie odstr ni_ prim rnu oblas_ z disku,", TEXT_NORMAL }, { 8, 15, - " pokia¾ existujú rozírené oblasti na disku.", + " pokiaó existuj£ rozs¡ren oblasti na disku.", TEXT_NORMAL }, { 8, 16, - "- Intalátor nevie odstráni prvú rozírenú oblas z disku,", + "- Instal tor nevie odstr ni_ prv£ rozs¡ren£ oblas_ z disku,", TEXT_NORMAL }, { 8, 17, - " pokia¾ existujú iné rozírené oblasti na disku.", + " pokiaó existuj£ in rozs¡ren oblasti na disku.", TEXT_NORMAL }, { 8, 18, - "- Intalátor podporuje iba súborový systém FAT.", + "- Instal tor podporuje iba s£borovì systm FAT.", TEXT_NORMAL }, { 8, 19, - "- Kontrola súborového systému zatia¾ nie je implementovaná.", + "- Kontrola s£borovho systmu zatiaó nie je implementovan .", TEXT_NORMAL }, { 8, 23, - "\x07 Stlaète ENTER pre naintalovanie systému ReactOS.", + "\x07 Stlate ENTER pre nainstalovanie systmu ReactOS.", TEXT_NORMAL }, { 8, 25, - "\x07 Stlaète F3 pre skonèenie intalácie bez naintalovania systému ReactOS.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraèova F3 = Skonèi", + "\x07 Stlate F3 pre skonenie instal cie bez nainstalovania systmu ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova_ F3 = Skoni_", TEXT_STATUS }, { @@ -226,7 +226,7 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { @@ -310,7 +310,7 @@ { 8, 22, - "Záruka:", + "Z ruka:", TEXT_HIGHLIGHT }, { @@ -334,7 +334,7 @@ { 0, 0, - " ENTER = Návrat", + " ENTER = N vrat", TEXT_STATUS }, { @@ -350,19 +350,19 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Zoznam niie, zobrazuje súèasné nastavenia zariadení.", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Zoznam nizsie, zobrazuje s£asn nastavenia zariaden¡.", TEXT_NORMAL }, { 8, 11, - " Poèítaè:", + " Po¡ta:", TEXT_NORMAL }, { @@ -374,60 +374,60 @@ { 8, 13, - " Klávesnica:", + " Kl vesnica:", TEXT_NORMAL }, { 8, 14, - " Rozloenie kl.:", + " Rozlozenie kl.:", TEXT_NORMAL }, { 8, 16, - " Akceptova:", + " Akceptova_:", TEXT_NORMAL }, { 25, - 16, "Akceptova tieto nastavenia zariadení", + 16, "Akceptova_ tieto nastavenia zariaden¡", TEXT_NORMAL }, { 6, 19, - "Môete zmeni hardvérové nastavenia stlaèením klávesov HORE alebo DOLE", + "Mzete zmeni_ hardvrov nastavenia stlaen¡m kl vesov HORE alebo DOLE", TEXT_NORMAL }, { 6, 20, - "pre výber poloky. Potom stlaète kláves ENTER pre výber alternatívnych", + "pre vìber polozky. Potom stlate kl ves ENTER pre vìber alternat¡vnych", TEXT_NORMAL }, { 6, 21, - "nastavení.", + "nastaven¡.", TEXT_NORMAL }, { 6, 23, - "Ak sú vetky nastavenia správne, vyberte \"Akceptova tieto nastavenia zariadení\"", + "Ak s£ vsetky nastavenia spr vne, vyberte \"Akceptova_ tieto nastavenia zariaden¡\"", TEXT_NORMAL }, { 6, 24, - "a stlaète ENTER.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraèova F3 = Skonèi", + "a stlate ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova_ F3 = Skoni_", TEXT_STATUS }, { @@ -443,55 +443,55 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Intalátor systému ReactOS je v zaèiatoènom tádiu vývoja. Zatia¾", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instal tor systmu ReactOS je v zaiatonom st diu vìvoja. Zatiaó", TEXT_NORMAL }, { 6, 9, - "nepodporuje vetky funkcie plne vyuívajúce program Intalátor.", + "nepodporuje vsetky funkcie plne vyuz¡vaj£ce program Instal tor.", TEXT_NORMAL }, { 6, 12, - "Funkcie na opravu systému zatia¾ nie sú implementované.", + "Funkcie na opravu systmu zatiaó nie s£ implementovan.", TEXT_NORMAL }, { 8, 15, - "\x07 Stlaète U pre aktualizáciu OS.", + "\x07 Stlate U pre aktualiz ciu OS.", TEXT_NORMAL }, { 8, 17, - "\x07 Stlaète R pre záchrannú konzolu.", + "\x07 Stlate R pre z chrann£ konzolu.", TEXT_NORMAL }, { 8, 19, - "\x07 Stlaète ESC pre návrat na hlavnú stránku.", + "\x07 Stlate ESC pre n vrat na hlavn£ str nku.", TEXT_NORMAL }, { 8, 21, - "\x07 Stlaète ENTER pre retart poèítaèa.", - TEXT_NORMAL - }, - { - 0, - 0, - " ESC = Hlavná stránka ENTER = Retart", + "\x07 Stlate ENTER pre restart po¡taa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Hlavn str nka ENTER = Restart", TEXT_STATUS }, { @@ -506,43 +506,43 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Chcete zmeni typ poèítaèa, ktorý má by naintalovaný.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného typu poèítaèa.", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni_ typ po¡taa, ktorì m by_ nainstalovanì.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlate kl ves HORE alebo DOLE pre vìber pozadovanho typu po¡taa.", TEXT_NORMAL }, { 8, 11, - " Potom stlaète ENTER.", + " Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", TEXT_NORMAL }, { 8, 14, - " typu poèítaèa.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + " typu po¡taa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", TEXT_STATUS }, { @@ -558,25 +558,25 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 10, - 6, - "Systém práve overuje vetky uloené údaje na Vaom disku", - TEXT_NORMAL - }, - { - 10, - 8, - "To môe trva nieko¾ko minút", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Systm pr ve overuje vsetky ulozen £daje na Vasom disku", + TEXT_NORMAL + }, + { + 10, + 8, + "To mze trva_ niekoóko min£t", TEXT_NORMAL }, { 10, 9, - "Keï skonèí, poèítaè sa automaticky retartuje", + "Ke skon¡, po¡ta sa automaticky restartuje", TEXT_NORMAL }, { @@ -598,13 +598,13 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 10, - 6, - "Systém ReactOS nie je naintalovaný kompletne", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Systm ReactOS nie je nainstalovanì kompletne", TEXT_NORMAL }, { @@ -616,19 +616,19 @@ { 10, 9, - "vetky médiá CD-ROM z CD mechaník.", + "vsetky mdi CD-ROM z CD mechan¡k.", TEXT_NORMAL }, { 10, 11, - "Stlaète ENTER pre retart poèítaèa.", - TEXT_NORMAL - }, - { - 0, - 0, - " Poèkajte, prosím ...", + "Stlate ENTER pre restart po¡taa.", + TEXT_NORMAL + }, + { + 0, + 0, + " Pokajte, pros¡m ...", TEXT_STATUS, }, { @@ -644,30 +644,30 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Chcete zmeni typ monitora, ktorý má by naintalovaný.", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni_ typ monitora, ktorì m by_ nainstalovanì.", TEXT_NORMAL }, { 8, 10, - "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného typu monitora.", + "\x07 Stlate kl ves HORE alebo DOLE pre vìber pozadovanho typu monitora.", TEXT_NORMAL }, { 8, 11, - " Potom stlaète ENTER.", + " Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", TEXT_NORMAL }, { @@ -679,7 +679,7 @@ { 0, 0, - " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", TEXT_STATUS }, { @@ -695,13 +695,13 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 10, - 6, - "Základné súèastí systému ReactOS boli úspene naintalované.", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Z kladn s£ast¡ systmu ReactOS boli £spesne nainstalovan.", TEXT_NORMAL }, { @@ -713,19 +713,19 @@ { 10, 9, - "vetky médiá CD-ROM z CD mechaník.", + "vsetky mdi CD-ROM z CD mechan¡k.", TEXT_NORMAL }, { 10, 11, - "Stlaète ENTER pre retart poèítaèa.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Retart poèítaèa", + "Stlate ENTER pre restart po¡taa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Restart po¡taa", TEXT_STATUS }, { @@ -741,37 +741,37 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Intalátor nemôe naintalova zavádzaè systému na pevný disk Váho", //bootloader = zavádzaè systému + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instal tor nemze nainstalova_ zav dza systmu na pevnì disk V sho", //bootloader = zav dza systmu TEXT_NORMAL }, { 6, 9, - "poèítaèa", + "po¡taa", TEXT_NORMAL }, { 6, 13, - "Vlote prosím, naformátovanú disketu do mechaniky A:", + "Vlozte pros¡m, naform tovan£ disketu do mechaniky A:", TEXT_NORMAL }, { 6, 14, - "a stlaète ENTER.", + "a stlate ENTER.", TEXT_NORMAL, }, { 0, 0, - " ENTER = Pokraèova F3 = Skonèi", + " ENTER = Pokraova_ F3 = Skoni_", TEXT_STATUS }, { @@ -788,7 +788,7 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { @@ -806,31 +806,31 @@ { 8, 11, - "\x07 Stlaète HORE alebo DOLE pre výber zo zoznamu poloiek.", + "\x07 Stlate HORE alebo DOLE pre vìber zo zoznamu poloziek.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlaète ENTER to install ReactOS onto the selected partition.", + "\x07 Stlate ENTER to install ReactOS onto the selected partition.", TEXT_NORMAL }, { 8, 15, - "\x07 Stlaète C pre vytvorenie novej oblasti.", + "\x07 Stlate C pre vytvorenie novej oblasti.", TEXT_NORMAL }, { 8, 17, - "\x07 Stlaète D pre vymazanie existujúcej oblasti.", - TEXT_NORMAL - }, - { - 0, - 0, - " Poèkajte, prosím ...", + "\x07 Stlate D pre vymazanie existuj£cej oblasti.", + TEXT_NORMAL + }, + { + 0, + 0, + " Pokajte, pros¡m ...", TEXT_STATUS }, { @@ -846,25 +846,25 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Formátovanie oblasti", - TEXT_NORMAL - }, - { - 6, - 10, - "Intalátor teraz naformátuje oblas. Stlaète ENTER pre pokraèovanie.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraèova F3 = Skonèi", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Form tovanie oblasti", + TEXT_NORMAL + }, + { + 6, + 10, + "Instal tor teraz naform tuje oblas_. Stlate ENTER pre pokraovanie.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova_ F3 = Skoni_", TEXT_STATUS }, { @@ -880,19 +880,19 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Intalátor intaluje súbory systému ReactOS na zvolenú oblas.", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instal tor instaluje s£bory systmu ReactOS na zvolen£ oblas_.", TEXT_NORMAL }, { 6, 9, - "Vyberte adresár kam chcete naintalova systém ReactOS:", + "Vyberte adres r kam chcete nainstalova_ systm ReactOS:", TEXT_NORMAL }, { @@ -916,7 +916,7 @@ { 0, 0, - " ENTER = Pokraèova F3 = Skonèi", + " ENTER = Pokraova_ F3 = Skoni_", TEXT_STATUS }, { @@ -932,31 +932,31 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { 11, 12, - "Poèkajte, prosím, kým Intalátor systému ReactOS skopíruje súbory", + "Pokajte, pros¡m, kìm Instal tor systmu ReactOS skop¡ruje s£bory", TEXT_NORMAL }, { 30, 13, - "do Váho intalaèného prieèinka pre ReactOS.", + "do V sho instalanho prieinka pre ReactOS.", TEXT_NORMAL }, { 20, 14, - "Dokonèenie môe trva nieko¾ko minút.", - TEXT_NORMAL - }, - { - 0, - 0, - " \xB3 Poèkajte, prosím ... ", + "Dokonenie mze trva_ niekoóko min£t.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Pokajte, pros¡m ... ", TEXT_STATUS }, { @@ -972,37 +972,37 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Intalátor intaluje zavádzaè operaèného systému", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instal tor instaluje zav dza operanho systmu", TEXT_NORMAL }, { 8, 12, - "Naintalova zavádzaè systému na pevný disk (MBR).", + "Nainstalova_ zav dza systmu na pevnì disk (MBR).", TEXT_NORMAL }, { 8, 13, - "Naintalova zavádzaè systému na disketu.", + "Nainstalova_ zav dza systmu na disketu.", TEXT_NORMAL }, { 8, 14, - "Preskoèi intaláciu zavádzaèa systému.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraèova F3 = Skonèi", + "Preskoi_ instal ciu zav dzaa systmu.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova_ F3 = Skoni_", TEXT_STATUS }, { @@ -1018,43 +1018,43 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Chcete zmeni typ klávesnice, ktorý má by naintalovaný.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného typu klávesnice.", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni_ typ kl vesnice, ktorì m by_ nainstalovanì.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlate kl ves HORE alebo DOLE pre vìber pozadovanho typu kl vesnice.", TEXT_NORMAL }, { 8, 11, - " Potom stlaète ENTER.", + " Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", TEXT_NORMAL }, { 8, 14, - " typu klávesnice.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + " typu kl vesnice.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", TEXT_STATUS }, { @@ -1070,43 +1070,43 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Chcete zmeni rozloenie klávesnice, ktoré má by naintalované.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného rozloenia", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni_ rozlozenie kl vesnice, ktor m by_ nainstalovan.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlate kl ves HORE alebo DOLE pre vìber pozadovanho rozlozenia", TEXT_NORMAL }, { 8, 11, - " klávesnice. Potom stlaète ENTER.", + " kl vesnice. Potom stlate ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + "\x07 Stlate kl ves ESC pre n vrat na predch dzaj£cu str nku bez zmeny", TEXT_NORMAL }, { 8, 14, - " rozloenia klávesnice.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + " rozlozenia kl vesnice.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", TEXT_STATUS }, { @@ -1123,19 +1123,19 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Pripravuje sa kopírovanie súborov systému ReactOS. ", - TEXT_NORMAL - }, - { - 0, - 0, - " Vytvára sa zoznam potrebných súborov ...", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Pripravuje sa kop¡rovanie s£borov systmu ReactOS. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Vytv ra sa zoznam potrebnìch s£borov ...", TEXT_STATUS }, { @@ -1152,37 +1152,37 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, TEXT_UNDERLINE }, { 6, 17, - "Vyberte systém súborov zo zoznamu uvedeného niie.", + "Vyberte systm s£borov zo zoznamu uvedenho nizsie.", 0 }, { 8, 19, - "\x07 Stlaète HORE alebo DOLE pre výber systému súborov.", + "\x07 Stlate HORE alebo DOLE pre vìber systmu s£borov.", 0 }, { 8, 21, - "\x07 Stlaète ENTER pre formátovanie oblasti.", + "\x07 Stlate ENTER pre form tovanie oblasti.", 0 }, { 8, 23, - "\x07 Stlaète ESC pre výber inej oblasti.", - 0 - }, - { - 0, - 0, - " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + "\x07 Stlate ESC pre vìber inej oblasti.", + 0 + }, + { + 0, + 0, + " ENTER = Pokraova_ ESC = Zrusi_ F3 = Skoni_", TEXT_STATUS }, @@ -1199,37 +1199,37 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Vybrali Ste si odstránenie oblasti", + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Vybrali Ste si odstr nenie oblasti", TEXT_NORMAL }, { 8, 18, - "\x07 Stlaète D pre odstránenie oblasti.", + "\x07 Stlate D pre odstr nenie oblasti.", TEXT_NORMAL }, { 11, 19, - "UPOZORNENIE: Vetky údaje na tejto oblasti sa nenávratne stratia!", + "UPOZORNENIE: Vsetky £daje na tejto oblasti sa nen vratne stratia!", TEXT_NORMAL }, { 8, 21, - "\x07 Stlaète ESC pre zruenie.", - TEXT_NORMAL - }, - { - 0, - 0, - " D = Odstráni oblas ESC = Zrui F3 = Skonèi", + "\x07 Stlate ESC pre zrusenie.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Odstr ni_ oblas_ ESC = Zrusi_ F3 = Skoni_", TEXT_STATUS }, { @@ -1245,19 +1245,19 @@ { 4, 3, - " Intalátor systému ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Aktualizujú sa systémové nastavenia.", - TEXT_NORMAL - }, - { - 0, - 0, - " Vytvárajú sa poloky registrov ...", //registry hives + " Instal tor systmu ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Aktualizuj£ sa systmov nastavenia.", + TEXT_NORMAL + }, + { + 0, + 0, + " Vytv raj£ sa polozky registrov ...", //registry hives TEXT_STATUS }, { @@ -1273,197 +1273,197 @@ { { //ERROR_NOT_INSTALLED - "Systém ReactOS nie je kompletne naintalovaný na Vá\n" - "poèítaè. Ak teraz preruíte intaláciu, budete musie\n" - "spusti Intalátor znova, aby sa systém ReactOS naintaloval.\n" + "Systm ReactOS nie je kompletne nainstalovanì na V s\n" + "po¡ta. Ak teraz prerus¡te instal ciu, budete musie_\n" + "spusti_ Instal tor znova, aby sa systm ReactOS nainstaloval.\n" "\n" - " \x07 Stlaète ENTER pre pokraèovanie v intalácii.\n" - " \x07 Stlaète F3 pre skonèenie intalácie.", - "F3 = Skonèi ENTER = Pokraèova" + " \x07 Stlate ENTER pre pokraovanie v instal cii.\n" + " \x07 Stlate F3 pre skonenie instal cie.", + "F3 = Skoni_ ENTER = Pokraova_" }, { //ERROR_NO_HDD - "Intalátoru sa nepodarilo nájs pevný disk.\n", - "ENTER = Retart poèítaèa" + "Instal toru sa nepodarilo n js_ pevnì disk.\n", + "ENTER = Restart po¡taa" }, { //ERROR_NO_SOURCE_DRIVE - "Intalátoru sa nepodarilo nájs jej zdrojovú mechaniku.\n", - "ENTER = Retart poèítaèa" + "Instal toru sa nepodarilo n js_ jej zdrojov£ mechaniku.\n", + "ENTER = Restart po¡taa" }, { //ERROR_LOAD_TXTSETUPSIF - "Intalátor zlyhal pri nahrávaní súboru TXTSETUP.SIF.\n", - "ENTER = Retart poèítaèa" + "Instal tor zlyhal pri nahr van¡ s£boru TXTSETUP.SIF.\n", + "ENTER = Restart po¡taa" }, { //ERROR_CORRUPT_TXTSETUPSIF - "Intalátor naiel pokodený súbor TXTSETUP.SIF.\n", - "ENTER = Retart poèítaèa" + "Instal tor nasiel poskodenì s£bor TXTSETUP.SIF.\n", + "ENTER = Restart po¡taa" }, { //ERROR_SIGNATURE_TXTSETUPSIF, - "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybný (neplatný) podpis (znak, znaèka, ifra) - "ENTER = Retart poèítaèa" + "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybnì (neplatnì) podpis (znak, znaka, sifra) + "ENTER = Restart po¡taa" }, { //ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_LOAD_COMPUTER, - "Intalátor zlyhal pri nahrávaní zoznamu typov poèítaèov.\n", - "ENTER = Retart poèítaèa" + "Instal tor zlyhal pri nahr van¡ zoznamu typov po¡taov.\n", + "ENTER = Restart po¡taa" }, { //ERROR_LOAD_DISPLAY, - "Intalátor zlyhal pri nahrávaní zoznamu nastavení monitora.\n", - "ENTER = Retart poèítaèa" + "Instal tor zlyhal pri nahr van¡ zoznamu nastaven¡ monitora.\n", + "ENTER = Restart po¡taa" }, { //ERROR_LOAD_KEYBOARD, - "Intalátor zlyhal pri nahrávaní zoznamu typov klávesníc.\n", - "ENTER = Retart poèítaèa" + "Instal tor zlyhal pri nahr van¡ zoznamu typov kl vesn¡c.\n", + "ENTER = Restart po¡taa" }, { //ERROR_LOAD_KBLAYOUT, - "Intalátor zlyhal pri nahrávaní zoznamu rozloenia klávesníc.\n", - "ENTER = Retart poèítaèa" + "Instal tor zlyhal pri nahr van¡ zoznamu rozlozenia kl vesn¡c.\n", + "ENTER = Restart po¡taa" }, { //ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" - "Vytvorenie alebo odstránenie oblastí môe znièi tabu¾ku oblastí.\n" + "Vytvorenie alebo odstr nenie oblast¡ mze znii_ tabuóku oblast¡.\n" "\n" - " \x07 Stlaète F3 pre skonèenie intalácie." - " \x07 Stlaète ENTER pre pokraèovanie.", - "F3 = Skonèi ENTER = Pokraèova" + " \x07 Stlate F3 pre skonenie instal cie." + " \x07 Stlate ENTER pre pokraovanie.", + "F3 = Skoni_ ENTER = Pokraova_" }, { //ERROR_NEW_PARTITION, - "Nemôete vytvori novú oblas\n" - "vo vnútri u existujúcej oblasti!\n" + "Nemzete vytvori_ nov£ oblas_\n" + "vo vn£tri uz existuj£cej oblasti!\n" "\n" - " * Pokraèujte stlaèením ¾ubovo¾ného klávesu.", + " * Pokraujte stlaen¡m óubovoónho kl vesu.", NULL }, { //ERROR_DELETE_SPACE, - "Nemôete odstráni miesto na disku, ktoré nie je oblasou!\n" + "Nemzete odstr ni_ miesto na disku, ktor nie je oblas_ou!\n" "\n" - " * Pokraèujte stlaèením ¾ubovo¾ného klávesu.", + " * Pokraujte stlaen¡m óubovoónho kl vesu.", NULL }, { //ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_NO_FLOPPY, "V mechanike A: nie je disketa.", - "ENTER = Pokraèova" + "ENTER = Pokraova_" }, { //ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_INITIALIZE_REGISTRY, "Setup failed to set the initialize the registry.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_CABINET_MISSING, "Cabinet not found.\n", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_CREATE_DIR, "Setup could not create install directories.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_TXTSETUP_SECTION, "Setup failed to find the 'Directories' section\n" "in TXTSETUP.SIF.\n", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_CABINET_SECTION, "Setup failed to find the 'Directories' section\n" "in the cabinet.\n", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_FIND_SETUPDATA, - "Intalátor zlyhal pri h¾adaní sekcie 'SetupData'\n" - "v súbore TXTSETUP.SIF.\n", - "ENTER = Retart poèítaèa" + "Instal tor zlyhal pri hóadan¡ sekcie 'SetupData'\n" + "v s£bore TXTSETUP.SIF.\n", + "ENTER = Restart po¡taa" }, { //ERROR_WRITE_PTABLE, - "Intalátor zlyhal pri zápise do tabuliek oblastí.\n" - "ENTER = Retart poèítaèa" + "Instal tor zlyhal pri z pise do tabuliek oblast¡.\n" + "ENTER = Restart po¡taa" }, { //ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { //ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" - "ENTER = Retart poèítaèa" + "ENTER = Restart po¡taa" }, { NULL,

1 0

[dreimer] 32219: Update German translation
by dreimer＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: dreimer Date: Fri Feb 8 17:10:52 2008 New Revision: 32219 URL: http://svn.reactos.org/svn/reactos?rev=32219&view=rev Log: Update German translation Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Fri Feb 8 17:10:52 2008 @@ -118,18 +118,18 @@ IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size:", -1, 14, 20, 222, 8 +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Anzeige", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Schriftgröße:", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 - GROUPBOX "Compatibility", -1, 7, 67, 237, 97 - LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 - AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 - AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 + GROUPBOX "Kompatibilität", -1, 7, 67, 237, 97 + LTEXT "Einige Programme könnten fehlerhaft arbeiten, wenn nach Änderung der Farbeinstellungen nicht neugestartet wird.\r\n\nNach Änderung der Farbeinstellungen:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Computer vor dem Anwenden der Farbeinstellungen neustarten.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Farbeinstellungen ohne Neustart übernehmen.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Vor dem Anwenden der neuen Farbeinstellungen nachfragen.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU

1 0

[dchapyshev] 32218: - Add WinBoard and Opera to downloader.xml
by dchapyshev＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: dchapyshev Date: Fri Feb 8 16:14:22 2008 New Revision: 32218 URL: http://svn.reactos.org/svn/reactos?rev=32218&view=rev Log: - Add WinBoard and Opera to downloader.xml Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Fri Feb 8 16:14:22 2008 @@ -13,6 +13,13 @@ <version>2.0.0.11</version> <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.11/win32/en-U…</location> + </application> + <application name="Opera"> + <regname>Opera</regname> + <licence>Freeware</licence> + <version>9.24</version> + <description>The most popular and one of the best free Web Browsers out there.</description> + <location>http://mirror.nwps.ws/opera/win/924/en/Opera_9.24_Classic_Setup.exe</location> </application> <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> @@ -174,6 +181,13 @@ <description>Atomix Clone using SDL libs.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> </application> + <application name="WinBoard"> + <regname>WinBoard 4.2.6</regname> + <version>4.2.6</version> + <licence>GPL 3</licence> + <description>WinBoard is a graphical chessboard for the Windows/ReactOS that can serve as a user interface for GNU Chess, Crafty, and other chess engines, for the Internet Chess Servers, and for electronic mail correspondence chess.</description> + <location>http://ftp.gnu.org/gnu/winboard/winboard-4_2_6.exe</location> + </application> </category> <category name="Science" icon="11"> </category>

1 0

[dchapyshev] 32217: - Update Russian translation
by dchapyshev＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: dchapyshev Date: Fri Feb 8 16:11:55 2008 New Revision: 32217 URL: http://svn.reactos.org/svn/reactos?rev=32217&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Fri Feb 8 16:11:55 2008 @@ -826,7 +826,7 @@ { 0, 0, - " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥...", + " Please wait...", TEXT_STATUS }, { @@ -1568,4 +1568,31 @@ } }; +MUI_STRING ruRUStrings[] = +{ + {STRING_INSTALLCREATEPARTITION, + " ENTER = áâ ®¢¨âì C = ®§¤ âì à §¤¥« F3 = ëå®¤"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = áâ ®¢¨âì D = ¤ «¨âì à §¤¥« F3 = ëå®¤"}, + {STRING_PARTITIONSIZE, + " §¬¥à ®¢®£® à §¤¥« :"}, + {STRING_PLEASEWAIT, + " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥..."}, + {STRING_CHOOSENEWPARTITION, + "ë å®â¨â¥ á®§¤ âì ®¢ë© à §¤¥« "}, + {STRING_CREATEPARTITION, + " ENTER = ®§¤ âì à §¤¥« ESC = â¬¥ F3 = ëå®¤"}, + {STRING_COPYING, + " \xB3 ®¯¨à®¢ ¨¥: %S"}, + {STRING_SETUPCOPYINGFILES, + "à®£à ¬¬ ãáâ ®¢ª¨ ª®¯¨àã¥â ä ©«ë..."}, + {STRING_PAGEDMEM, + " âà ¨ç ï"}, + {STRING_NONPAGEDMEM, + " ¥áâà ¨ç ï"}, + {STRING_FREEMEM, + "¢®¡®¤ ï ¯ ¬ïâì"}, + {0, 0} +}; + #endif

1 0

[fireball] 32216: - Implement one more hack to obtain LaskKrnlPhysAddr (not really a solution for reactos, since ntldr allows kernel+drivers+hal to not be continuous in memory), when booting via ntldr/winldr.
by fireball＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: fireball Date: Fri Feb 8 16:11:01 2008 New Revision: 32216 URL: http://svn.reactos.org/svn/reactos?rev=32216&view=rev Log: - Implement one more hack to obtain LaskKrnlPhysAddr (not really a solution for reactos, since ntldr allows kernel+drivers+hal to not be continuous in memory), when booting via ntldr/winldr. Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Feb 8 16:11:01 2008 @@ -319,8 +319,31 @@ /* Get the addresses */ FirstKrnlPhysAddr = (ULONG_PTR)LdrEntry->DllBase - KSEG0_BASE; - - /* FIXME: How do we get the last address? */ + } + + /* Get the last kernel address */ + if (!LastKrnlPhysAddr) + { + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + if (Md->MemoryType == LoaderBootDriver || + Md->MemoryType == LoaderSystemCode || + Md->MemoryType == LoaderHalCode) + { + if (Md->BasePage+Md->PageCount > LastKrnlPhysAddr) + LastKrnlPhysAddr = Md->BasePage+Md->PageCount; + } + } + + /* Convert to a physical address */ + LastKrnlPhysAddr = LastKrnlPhysAddr << PAGE_SHIFT; + LastKernelAddress = LastKrnlPhysAddr | KSEG0_BASE; } /* Set memory limits */

1 0

[dchapyshev] 32215: - Start implement Advanced General page - Update Russian translation
by dchapyshev＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: dchapyshev Date: Fri Feb 8 16:07:37 2008 New Revision: 32215 URL: http://svn.reactos.org/svn/reactos?rev=32215&view=rev Log: - Start implement Advanced General page - Update Russian translation Added: trunk/reactos/dll/cpl/desk/general.c (with props) Modified: trunk/reactos/dll/cpl/desk/advmon.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/resource.h Modified: trunk/reactos/dll/cpl/desk/advmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/advmon.c (original) +++ trunk/reactos/dll/cpl/desk/advmon.c Fri Feb 8 16:07:37 2008 @@ -46,31 +46,6 @@ } return FALSE; -} - -static INT_PTR CALLBACK -AdvGeneralPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - PDISPLAY_DEVICE_ENTRY DispDevice = NULL; - INT_PTR Ret = 0; - - if (uMsg != WM_INITDIALOG) - DispDevice = (PDISPLAY_DEVICE_ENTRY)GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch (uMsg) - { - case WM_INITDIALOG: - DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice); - - Ret = TRUE; - break; - } - - return Ret; } static VOID Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=32… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h (original) +++ trunk/reactos/dll/cpl/desk/desk.h Fri Feb 8 16:07:37 2008 @@ -93,5 +93,8 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); +INT_PTR CALLBACK +AdvGeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + #endif /* __CPL_DESK_H__ */ Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Fri Feb 8 16:07:37 2008 @@ -33,5 +33,6 @@ <file>advappdlg.c</file> <file>settings.c</file> <file>monslctl.c</file> + <file>general.c</file> <file>desk.rc</file> </module> Added: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c (added) +++ trunk/reactos/dll/cpl/desk/general.c Fri Feb 8 16:07:37 2008 @@ -1,0 +1,140 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Display Control Panel + * FILE: dll/cpl/desk/general.c + * PURPOSE: Advanced General settings + */ + +#include "desk.h" + +static VOID +InitFontSizeList(HWND hWnd) +{ + HINF hInf; + HKEY hKey; + HWND hFontSize; + INFCONTEXT Context; + int i, ci = 0; + + hFontSize = GetDlgItem(hWnd, IDC_FONTSIZE_COMBO); + + hInf = SetupOpenInfFile(L"font.inf", NULL, + INF_STYLE_WIN4, NULL); + + if (hInf != INVALID_HANDLE_VALUE) + { + if (SetupFindFirstLine(hInf, L"Font Sizes", NULL, &Context)) + { + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontDPI", + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + for (;;) + { + TCHAR Desc[LINE_LEN]; + + if (SetupGetStringField(&Context, 0, Desc, sizeof(Desc), NULL) && + SetupGetIntField(&Context, 1, &ci)) + { + _stprintf(Desc, L"%s (%d DPI)", Desc, ci); + i = SendMessage(hFontSize, CB_ADDSTRING, 0, (LPARAM)Desc); + if (i != CB_ERR) + SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, (LPARAM)ci); + + DWORD dwSize = MAX_PATH, dwValue, dwType = REG_DWORD; + + if (RegQueryValueEx(hKey, L"LogPixels", NULL, + &dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + { + if ((int)dwValue == ci) + { + SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); + SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_COSTOM), Desc); + } + } + } + + if (!SetupFindNextLine(&Context, &Context)) + { + RegCloseKey(hKey); + break; + } + } + } + } + + SetupCloseInfFile(hInf); +} + +static VOID +InitRadioButtons(HWND hWnd) +{ + HKEY hKey; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\Display", + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + TCHAR szBuf[64]; + DWORD dwSize = 64; + + if (RegQueryValueEx(hKey, L"DynaSettingsChange", 0, NULL, + (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS); + + switch (_ttoi(szBuf)) + { + case 0: + SendDlgItemMessage(hWnd, IDC_RESTART_RB, BM_SETCHECK, 1, 1); + break; + case 1: + SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); + break; + case 3: + SendDlgItemMessage(hWnd, IDC_ASKME_RB, BM_SETCHECK, 1, 1); + break; + } + + RegCloseKey(hKey); + } +} + +INT_PTR CALLBACK +AdvGeneralPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PDISPLAY_DEVICE_ENTRY DispDevice = NULL; + INT_PTR Ret = 0; + + if (uMsg != WM_INITDIALOG) + DispDevice = (PDISPLAY_DEVICE_ENTRY)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice); + + InitFontSizeList(hwndDlg); + InitRadioButtons(hwndDlg); + + Ret = TRUE; + break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_FONTSIZE_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + case IDC_RESTART_RB: + case IDC_WITHOUTREBOOT_RB: + case IDC_ASKME_RB: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + } + + return Ret; +} Propchange: trunk/reactos/dll/cpl/desk/general.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Fri Feb 8 16:07:37 2008 @@ -120,11 +120,20 @@ PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,306,165,56,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Îáùè" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc Fri Feb 8 16:07:37 2008 @@ -117,11 +117,20 @@ PUSHBUTTON "R&ozíøené nastavení...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Allgemein" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "Ãéá &ðñï÷ùñçìÝíïõò...",IDC_SETTINGS_ADVANCED,166,173,74,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "ÃåíéêÜ" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc Fri Feb 8 16:07:37 2008 @@ -118,11 +118,20 @@ PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc Fri Feb 8 16:07:37 2008 @@ -124,11 +124,20 @@ PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Fri Feb 8 16:07:37 2008 @@ -119,11 +119,20 @@ PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Général" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc Fri Feb 8 16:07:37 2008 @@ -117,11 +117,20 @@ PUSHBUTTON "&Haladóknak...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "&Lanjutan...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "A&vanzate...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Generale" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "Ú×Ýè(&V)...",IDC_SETTINGS_ADVANCED,170,205,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" -FONT 9, "MS UI Gothic" -BEGIN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc Fri Feb 8 16:07:37 2008 @@ -118,11 +118,20 @@ PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc Fri Feb 8 16:07:37 2008 @@ -126,11 +126,20 @@ PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ogólne" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Fri Feb 8 16:07:37 2008 @@ -28,20 +28,20 @@ 70, 10, 105, 70, WS_EX_STATICEDGE GROUPBOX "&Çàñòàâêà",IDC_SCREENS_DUMMY, 7, 92, 231, 52 COMBOBOX IDC_SCREENS_LIST, 14, 104, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Ïàðàìåòðû",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Ï&ðîñìîòð",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "È&íòåðâàë:",IDC_WAITTEXT, 14, 125, 36, 9 + PUSHBUTTON "&Ïàðàìåòðû",IDC_SCREENS_SETTINGS, 120, 104, 50, 14, WS_GROUP + PUSHBUTTON "Ï&ðîñìîòð",IDC_SCREENS_TESTSC, 175, 104, 50, 14 + LTEXT "È&íòåðâàë:",IDC_WAITTEXT, 14, 124, 40, 10 EDITTEXT IDC_SCREENS_TIMEDELAY, 55, 121, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "ìèí.", IDC_MINTEXT, 90, 125, 20, 9 + LTEXT "ìèí.", IDC_MINTEXT, 90, 124, 19, 10 CONTROL "Íà&÷èíàòü ñ ýêðàíà ïðèâåòñòâèÿ",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 109, 118, 122, 23 - GROUPBOX "&Ýíåðãîñáåðåæåíèå", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + BS_AUTOCHECKBOX | WS_TABSTOP, 110, 124, 124, 12 + GROUPBOX "&Ýíåðãîñáåðåæåíèå", IDC_SCREENS_DUMMY2, 6, 155, 232, 37 LTEXT "Äëÿ èçìåíåíèÿ ïàðàìåòðîâ ïèòàíèÿ ìîíèòîðà íàæìèòå êíîïêó ""Ïèòàíèå"".", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "Ï&èòàíèå...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "Ï&èòàíèå...", IDC_SCREENS_POWER_BUTTON, 171, 168, 55, 14 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -51,9 +51,9 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Öâåòîâàÿ ñõåìà", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 178, 150, 60, 15 + LTEXT "Öâåòîâàÿ ñõåìà:", IDC_STATIC, 7, 139, 154, 10 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 155, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 168, 150, 70, 14 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,33 +94,42 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 249, 197 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ïàðàìåòðû" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 - CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE - LTEXT "&Äèñïëåé:",1820,3,100,30,8 - LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Ðàçðåøåíèå ýêðàíà",1818,3,120,119,43 + LTEXT "Ðàçìåñòèòå çíà÷êè ìîíèòîðîâ â ñîîòâåòñòâèè ñ èõ ðàñïîëîæåíèåì.",-1,3,7,244,17 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,21,240,82,WS_EX_CLIENTEDGE + LTEXT "&Äèñïëåé:",1820,3,105,40,8 + LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,115,224,8 + GROUPBOX "&Ðàçðåøåíèå ýêðàíà",1818,3,129,119,46 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", - TBS_AUTOTICKS | WS_TABSTOP,33,130,58,17 - LTEXT "Ìåíüøå",1815,6,130,29,8,NOT WS_GROUP - LTEXT "Áîëüøå",1816,91,130,27,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Êà÷åñòâî öâåòîïåðåäà÷è",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + TBS_AUTOTICKS | WS_TABSTOP,33,141,58,17 + LTEXT "ìåí.",1815,12,146,21,8,NOT WS_GROUP + LTEXT "áîë.",1816,94,146,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,161,105,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Êà÷åñòâî öâåòîïåðåäà÷è",1817,129,129,115,46 + COMBOBOX IDC_SETTINGS_BPP,135,141,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 - PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,170,165,70,14 -END - -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,135,161,103,9 + PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,173,182,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ýêðàí", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Ðàçìåð øðèôòà:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Ñîâìåñòèìîñòü", -1, 7, 67, 237, 97 + LTEXT "Íåêîòîðûå ïðîãðàììû ìîãóò ðàáîòàòü íåïðàâèëüíî, åñëè âû íå ïåðåçàãðóçèòå êîìïüþòåð ïîñëå èçìåíåíèÿ ïàðàìåòðîâ ýêðàíà.\r\n\nÏîñëå èçìåíåíèÿ ïàðàìåòðîâ ýêðàíà ñëåäóåò:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "Ïåðå&çàãðóçèòü êîìïüþòåð ñ íîâûìè ïàðàìåòðàìè ýêðàíà", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "&Ïðèìåíèòü íîâûå ïàðàìåòðû ýêðàíà áåç ïåðåçàãðóçêè", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ç&àïðîñèòü ïåðåä ïðèìåíåíèåì íîâûõ ïàðàìåòðîâ ýêðàíà", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU @@ -138,15 +147,15 @@ MENUITEM "&Primary", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "&Ñâîéñòâà", ID_MENU_PROPERTIES END END STRINGTABLE BEGIN - IDS_MULTIPLEMONITORS "(Multiple Monitors)" - IDS_UNKNOWNMONITOR "(Unknown Monitor)" - IDS_ADVANCEDTITLEFMT "%s and %s" + IDS_MULTIPLEMONITORS "(Íåñêîëüêî ýêðàíîâ)" + IDS_UNKNOWNMONITOR "(Íåèçâåñòíûé ýêðàí)" + IDS_ADVANCEDTITLEFMT "%s è %s" END STRINGTABLE @@ -171,7 +180,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Êàðòèíêè (*.bmp;*.dib)\000*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Èçîáðàæåíèÿ (*.bmp;*.dib)\000*.bmp;*.dib" IDS_SUPPORTED_EXT "*.bmp;*.dib" END Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Fri Feb 8 16:07:37 2008 @@ -125,11 +125,20 @@ PUSHBUTTON "&Spresni...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Veobecné" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc Fri Feb 8 16:07:37 2008 @@ -119,11 +119,20 @@ PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Fri Feb 8 16:07:37 2008 @@ -124,11 +124,20 @@ PUSHBUTTON "Äîä&àòêîâî...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Çàãàëüí³" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Fri Feb 8 16:07:37 2008 @@ -2,14 +2,14 @@ #define __CPL_DESK_RESOURCE_H__ /* metrics */ -#define PROPSHEETWIDTH 246 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 +#define PROPSHEETWIDTH 246 +#define PROPSHEETHEIGHT 228 +#define PROPSHEETPADDING 6 -#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) -#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) +#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) +#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) -#define ICONSIZE 16 +#define ICONSIZE 16 /* ids */ #define IDC_DESK_ICON 40 @@ -17,6 +17,7 @@ #define IDC_STATIC -1 +/* Dialogs */ #define IDD_BACKGROUND 100 #define IDD_SCREENSAVER 101 #define IDD_APPEARANCE 102 @@ -34,7 +35,6 @@ #define IDS_BACKGROUND_COMDLG_FILTER 1006 #define IDS_SUPPORTED_EXT 1007 - /* Screensaver Page */ #define IDC_SCREENS_PREVIEW 1010 #define IDC_SCREENS_LIST 1011 @@ -51,116 +51,118 @@ #define IDC_SCREENS_CHOICES -1 -#define IDS_CPLNAME 2000 -#define IDS_CPLDESCRIPTION 2001 +#define IDS_CPLNAME 2000 +#define IDS_CPLDESCRIPTION 2001 -#define IDS_NONE 2002 -#define IDS_CENTER 2003 -#define IDS_STRETCH 2004 -#define IDS_TILE 2005 +#define IDS_NONE 2002 +#define IDS_CENTER 2003 +#define IDS_STRETCH 2004 +#define IDS_TILE 2005 -#define IDC_SETTINGS_DEVICE 201 -#define IDC_SETTINGS_BPP 202 -#define IDC_SETTINGS_RESOLUTION 203 -#define IDC_SETTINGS_RESOLUTION_TEXT 204 -#define IDC_SETTINGS_ADVANCED 205 -#define IDC_SETTINGS_MONSEL 206 -#define IDC_SETTINGS_SPECTRUM 207 +#define IDC_SETTINGS_DEVICE 201 +#define IDC_SETTINGS_BPP 202 +#define IDC_SETTINGS_RESOLUTION 203 +#define IDC_SETTINGS_RESOLUTION_TEXT 204 +#define IDC_SETTINGS_ADVANCED 205 +#define IDC_SETTINGS_MONSEL 206 +#define IDC_SETTINGS_SPECTRUM 207 -#define IDB_SPECTRUM_4 208 -#define IDB_SPECTRUM_8 209 -#define IDB_SPECTRUM_16 210 +#define IDB_SPECTRUM_4 208 +#define IDB_SPECTRUM_8 209 +#define IDB_SPECTRUM_16 210 -#define IDR_PREVIEW_MENU 2100 -#define ID_MENU_NORMAL 2101 -#define ID_MENU_DISABLED 2102 -#define ID_MENU_SELECTED 2103 +#define IDR_PREVIEW_MENU 2100 +#define ID_MENU_NORMAL 2101 +#define ID_MENU_DISABLED 2102 +#define ID_MENU_SELECTED 2103 -#define IDM_MONITOR_MENU 2110 -#define ID_MENU_ATTACHED 2111 -#define ID_MENU_PRIMARY 2112 -#define ID_MENU_IDENTIFY 2113 -#define ID_MENU_PROPERTIES 2114 +#define IDM_MONITOR_MENU 2110 +#define ID_MENU_ATTACHED 2111 +#define ID_MENU_PRIMARY 2112 +#define ID_MENU_IDENTIFY 2113 +#define ID_MENU_PROPERTIES 2114 /* Settings Page */ - -#define IDS_PIXEL 2301 - -#define IDS_COLOR_4BIT 2904 -#define IDS_COLOR_8BIT 2908 -#define IDS_COLOR_16BIT 2916 -#define IDS_COLOR_24BIT 2924 -#define IDS_COLOR_32BIT 2932 - +#define IDS_PIXEL 2301 +#define IDS_COLOR_4BIT 2904 +#define IDS_COLOR_8BIT 2908 +#define IDS_COLOR_16BIT 2916 +#define IDS_COLOR_24BIT 2924 +#define IDS_COLOR_32BIT 2932 /* Appearance Page */ -#define IDC_APPEARANCE_PREVIEW 1500 -#define IDC_APPEARANCE_UI_ITEM 1501 -#define IDC_APPEARANCE_COLORSCHEME 1502 -#define IDC_APPEARANCE_FONTSIZE 1503 -#define IDC_APPEARANCE_EFFECTS 1504 -#define IDC_APPEARANCE_ADVANCED 1505 +#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_UI_ITEM 1501 +#define IDC_APPEARANCE_COLORSCHEME 1502 +#define IDC_APPEARANCE_FONTSIZE 1503 +#define IDC_APPEARANCE_EFFECTS 1504 +#define IDC_APPEARANCE_ADVANCED 1505 -#define IDS_INACTWIN 1510 -#define IDS_ACTWIN 1511 -#define IDS_WINTEXT 1512 -#define IDS_MESSBOX 1513 -#define IDS_MESSTEXT 1514 -#define IDS_BUTTEXT 1515 +#define IDS_INACTWIN 1510 +#define IDS_ACTWIN 1511 +#define IDS_WINTEXT 1512 +#define IDS_MESSBOX 1513 +#define IDS_MESSTEXT 1514 +#define IDS_BUTTEXT 1515 /* Update these IDs when you change the string id list */ -#define IDS_ITEM_FIRST (IDS_ITEM_3D_OBJECTS) -#define IDS_ITEM_LAST (IDS_ITEM_CAPTION_BUTTONS + 1) +#define IDS_ITEM_FIRST (IDS_ITEM_3D_OBJECTS) +#define IDS_ITEM_LAST (IDS_ITEM_CAPTION_BUTTONS + 1) +/* Advanced Appearance Dialog */ +#define IDC_ADVAPPEARANCE_PREVIEW 3101 +#define IDC_ADVAPPEARANCE_ELEMENT 3102 +#define IDC_ADVAPPEARANCE_SIZE_T 3103 +#define IDC_ADVAPPEARANCE_SIZE_E 3104 +#define IDC_ADVAPPEARANCE_SIZE_UD 3105 +#define IDC_ADVAPPEARANCE_COLOR1_T 3106 +#define IDC_ADVAPPEARANCE_COLOR1_B 3107 +#define IDC_ADVAPPEARANCE_COLOR2_T 3108 +#define IDC_ADVAPPEARANCE_COLOR2_B 3109 +#define IDC_ADVAPPEARANCE_FONT_T 3110 +#define IDC_ADVAPPEARANCE_FONT_C 3111 +#define IDC_ADVAPPEARANCE_FONTSIZE_T 3112 +#define IDC_ADVAPPEARANCE_FONTSIZE_E 3113 +#define IDC_ADVAPPEARANCE_FONTCOLOR_T 3114 +#define IDC_ADVAPPEARANCE_FONTCOLOR_B 3115 +#define IDC_ADVAPPEARANCE_FONTBOLD 3116 +#define IDC_ADVAPPEARANCE_FONTITALIC 3117 -/* Advanced Appearance Dialog */# +#define IDS_ELEMENT_0 3200 +#define IDS_ELEMENT_1 3201 +#define IDS_ELEMENT_2 3202 +#define IDS_ELEMENT_3 3203 +#define IDS_ELEMENT_4 3204 +#define IDS_ELEMENT_5 3205 +#define IDS_ELEMENT_6 3206 +#define IDS_ELEMENT_7 3207 +#define IDS_ELEMENT_8 3208 +#define IDS_ELEMENT_9 3209 +#define IDS_ELEMENT_10 3210 +#define IDS_ELEMENT_11 3211 +#define IDS_ELEMENT_12 3212 +#define IDS_ELEMENT_13 3213 +#define IDS_ELEMENT_14 3214 +#define IDS_ELEMENT_15 3215 +#define IDS_ELEMENT_16 3216 +#define IDS_ELEMENT_17 3217 +#define IDS_ELEMENT_18 3218 +#define IDS_ELEMENT_19 3219 +#define IDS_ELEMENT_20 3220 +#define IDS_ELEMENT_21 3221 +#define IDS_ELEMENT_22 3222 +#define IDS_ELEMENT_23 3223 -#define IDC_ADVAPPEARANCE_PREVIEW 3101 -#define IDC_ADVAPPEARANCE_ELEMENT 3102 -#define IDC_ADVAPPEARANCE_SIZE_T 3103 -#define IDC_ADVAPPEARANCE_SIZE_E 3104 -#define IDC_ADVAPPEARANCE_SIZE_UD 3105 -#define IDC_ADVAPPEARANCE_COLOR1_T 3106 -#define IDC_ADVAPPEARANCE_COLOR1_B 3107 -#define IDC_ADVAPPEARANCE_COLOR2_T 3108 -#define IDC_ADVAPPEARANCE_COLOR2_B 3109 -#define IDC_ADVAPPEARANCE_FONT_T 3110 -#define IDC_ADVAPPEARANCE_FONT_C 3111 -#define IDC_ADVAPPEARANCE_FONTSIZE_T 3112 -#define IDC_ADVAPPEARANCE_FONTSIZE_E 3113 -#define IDC_ADVAPPEARANCE_FONTCOLOR_T 3114 -#define IDC_ADVAPPEARANCE_FONTCOLOR_B 3115 -#define IDC_ADVAPPEARANCE_FONTBOLD 3116 -#define IDC_ADVAPPEARANCE_FONTITALIC 3117 +#define IDS_MULTIPLEMONITORS 3300 +#define IDS_UNKNOWNMONITOR 3301 +#define IDS_ADVANCEDTITLEFMT 3302 -#define IDS_ELEMENT_0 3200 -#define IDS_ELEMENT_1 3201 -#define IDS_ELEMENT_2 3202 -#define IDS_ELEMENT_3 3203 -#define IDS_ELEMENT_4 3204 -#define IDS_ELEMENT_5 3205 -#define IDS_ELEMENT_6 3206 -#define IDS_ELEMENT_7 3207 -#define IDS_ELEMENT_8 3208 -#define IDS_ELEMENT_9 3209 -#define IDS_ELEMENT_10 3210 -#define IDS_ELEMENT_11 3211 -#define IDS_ELEMENT_12 3212 -#define IDS_ELEMENT_13 3213 -#define IDS_ELEMENT_14 3214 -#define IDS_ELEMENT_15 3215 -#define IDS_ELEMENT_16 3216 -#define IDS_ELEMENT_17 3217 -#define IDS_ELEMENT_18 3218 -#define IDS_ELEMENT_19 3219 -#define IDS_ELEMENT_20 3220 -#define IDS_ELEMENT_21 3221 -#define IDS_ELEMENT_22 3222 -#define IDS_ELEMENT_23 3223 - -#define IDS_MULTIPLEMONITORS 3300 -#define IDS_UNKNOWNMONITOR 3301 -#define IDS_ADVANCEDTITLEFMT 3302 +/* Advanced General Dialog */ +#define IDC_FONTSIZE_COMBO 5000 +#define IDC_FONTSIZE_COSTOM 5001 +#define IDC_RESTART_RB 5002 +#define IDC_WITHOUTREBOOT_RB 5003 +#define IDC_ASKME_RB 5004 #endif /* __CPL_DESK_RESOURCE_H__ */

1 0

[fireball] 32214: - Implement MiCountFreePagesInLoaderBlock() to correctly count free pages (instead of using a variable introduced somewhere below r2000 (MemHigher), and later converted to MmFreeLdrMemHigher). - Get rid of MmFreeLdrMemHigher and MmFreeLdrMemLower (they were not actually used for anything except getting number of free pages).
by fireball＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: fireball Date: Fri Feb 8 13:55:40 2008 New Revision: 32214 URL: http://svn.reactos.org/svn/reactos?rev=32214&view=rev Log: - Implement MiCountFreePagesInLoaderBlock() to correctly count free pages (instead of using a variable introduced somewhere below r2000 (MemHigher), and later converted to MmFreeLdrMemHigher). - Get rid of MmFreeLdrMemHigher and MmFreeLdrMemLower (they were not actually used for anything except getting number of free pages). Modified: trunk/reactos/include/reactos/rosldr.h trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosldr.h?r… ============================================================================== --- trunk/reactos/include/reactos/rosldr.h (original) +++ trunk/reactos/include/reactos/rosldr.h Fri Feb 8 13:55:40 2008 @@ -45,7 +45,6 @@ ULONG ArchExtra; } ROS_LOADER_PARAMETER_BLOCK, *PROS_LOADER_PARAMETER_BLOCK; -extern ULONG MmFreeLdrMemHigher, MmFreeLdrMemLower; extern BOOLEAN AcpiTableDetected; extern ULONG MmFreeLdrPageDirectoryStart, MmFreeLdrPageDirectoryEnd; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Fri Feb 8 13:55:40 2008 @@ -32,7 +32,6 @@ /* FreeLDR Memory Data */ ULONG_PTR MmFreeLdrFirstKrnlPhysAddr, MmFreeLdrLastKrnlPhysAddr; ULONG_PTR MmFreeLdrLastKernelAddress; -ULONG MmFreeLdrMemHigher; ULONG MmFreeLdrPageDirectoryEnd; /* FreeLDR Loader Data */ @@ -926,7 +925,6 @@ /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; - MmFreeLdrMemHigher = RosLoaderBlock->MemHigher; MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Feb 8 13:55:40 2008 @@ -203,6 +203,35 @@ * */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); +} + +ULONG +NTAPI +MiCountFreePagesInLoaderBlock(PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG TotalPages = 0; + + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + + if (Md->MemoryType == LoaderBad || + Md->MemoryType == LoaderFirmwarePermanent || + Md->MemoryType == LoaderSpecialMemory || + Md->MemoryType == LoaderBBTMemory) + { + /* Don't count these blocks */ + continue; + } + + TotalPages += Md->PageCount; + } + + return TotalPages; } PCHAR @@ -247,7 +276,6 @@ * FUNCTION: Initalize memory managment */ { - ULONG i; ULONG kernel_len; ULONG_PTR MappingAddress; PLDR_DATA_TABLE_ENTRY LdrEntry; @@ -280,26 +308,7 @@ DPRINT("CurrentProcess: %x\n", PsGetCurrentProcess()); PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); - if ((BIOSMemoryMap != NULL) && (AddressRangeCount > 0)) - { - // If we have a bios memory map, recalulate the memory size - ULONG last = 0; - for (i = 0; i < AddressRangeCount; i++) - { - if (BIOSMemoryMap[i].Type == 1 - && (BIOSMemoryMap[i].BaseAddrLow + BIOSMemoryMap[i].LengthLow + PAGE_SIZE -1) / PAGE_SIZE > last) - { - last = (BIOSMemoryMap[i].BaseAddrLow + BIOSMemoryMap[i].LengthLow + PAGE_SIZE -1) / PAGE_SIZE; - } - } - if ((last - 256) * 4 > MmFreeLdrMemHigher) - { - MmFreeLdrMemHigher = (last - 256) * 4; - } - } - /* NTLDR Hacks */ - if (!MmFreeLdrMemHigher) MmFreeLdrMemHigher = 65536; if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; if (!FirstKrnlPhysAddr) { @@ -312,11 +321,6 @@ FirstKrnlPhysAddr = (ULONG_PTR)LdrEntry->DllBase - KSEG0_BASE; /* FIXME: How do we get the last address? */ - } - - if (MmFreeLdrMemHigher >= (MaxMem - 1) * 1024) - { - MmFreeLdrMemHigher = (MaxMem - 1) * 1024; } /* Set memory limits */ @@ -346,13 +350,13 @@ * (we assume the kernel occupies a continuous range of physical * memory) */ - DPRINT("first krnl %x\nlast krnl %x\n",FirstKrnlPhysAddr, + DPRINT("first krnl %x, last krnl %x\n",FirstKrnlPhysAddr, LastKrnlPhysAddr); /* * Free physical memory not used by the kernel */ - MmStats.NrTotalPages = MmFreeLdrMemHigher/4; + MmStats.NrTotalPages = MiCountFreePagesInLoaderBlock(KeLoaderBlock); MmNumberOfPhysicalPages = MmStats.NrTotalPages; if (!MmStats.NrTotalPages) { @@ -361,12 +365,9 @@ } else { - /* add 1MB for standard memory (not extended) */ + /* HACK: add 1MB for standard memory (not extended). Why? */ MmStats.NrTotalPages += 256; } -#ifdef BIOS_MEM_FIX - MmStats.NrTotalPages += 16; -#endif /* * Initialize the kernel address space

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
46
Older →

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 February 2008