Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 24766: - Remove internal HAL function from ntifs - Make sure obfuncs.h includes obtypes.h if it's ever included separately. - Add ARC_STATUS and ARC Error Codes.
by ion＠svn.reactos.org 16 Nov '06

16 Nov '06

Author: ion Date: Thu Nov 16 09:55:59 2006 New Revision: 24766 URL: http://svn.reactos.org/svn/reactos?rev=24766&view=rev Log: - Remove internal HAL function from ntifs - Make sure obfuncs.h includes obtypes.h if it's ever included separately. - Add ARC_STATUS and ARC Error Codes. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/reactos/arc/arc.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=24… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Thu Nov 16 09:55:59 2006 @@ -3061,13 +3061,6 @@ IN PCHAR String ); -NTHALAPI -VOID -NTAPI -HalSetRealTimeClock ( - IN PTIME_FIELDS TimeFields -); - NTKERNELAPI NTSTATUS NTAPI Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h (original) +++ trunk/reactos/include/ndk/obfuncs.h Thu Nov 16 09:55:59 2006 @@ -23,6 +23,7 @@ // Dependencies // #include <umtypes.h> +#include <obtypes.h> #ifndef NTOS_MODE_USER Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Thu Nov 16 09:55:59 2006 @@ -1,5 +1,34 @@ #ifndef _ARC_ #define _ARC_ + +typedef ULONG ARC_STATUS; + +typedef enum _ARC_CODES +{ + ESUCCESS, + E2BIG, + EACCES, + EAGAIN, + EBADF, + EBUSY, + EFAULT, + EINVAL, + EIO, + EISDIR, + EMFILE, + EMLINK, + ENAMETOOLONG, + ENODEV, + ENOENT, + ENOEXEC, + ENOMEM, + ENOSPC, + ENOTDIR, + ENOTTY, + ENXIO, + EROFS, + EMAXIMUM +} ARC_CODES; typedef enum _IDENTIFIER_FLAG {

1 0

[weiden] 24765: Fix some compilation errors
by weiden＠svn.reactos.org 15 Nov '06

15 Nov '06

Author: weiden Date: Wed Nov 15 23:24:55 2006 New Revision: 24765 URL: http://svn.reactos.org/svn/reactos?rev=24765&view=rev Log: Fix some compilation errors Modified: trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/fs/filelock.c trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c (original) +++ trunk/reactos/hal/halx86/generic/processor.c Wed Nov 15 23:24:55 2006 @@ -31,7 +31,7 @@ /* Update the interrupt affinity and processor mask */ InterlockedBitTestAndSet(&HalpActiveProcessors, ProcessorNumber); - InterlockedBitTestAndSet(&HalpDefaultInterruptAffinity, ProcessorNumber); + InterlockedBitTestAndSet((PLONG)&HalpDefaultInterruptAffinity, ProcessorNumber); /* FIXME: Register routines for KDCOM */ } Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Wed Nov 15 23:24:55 2006 @@ -7037,12 +7037,6 @@ OUT PLARGE_INTEGER LocalTime); NTKERNELAPI -BOOLEAN -NTAPI -ExTryToAcquireResourceExclusiveLite( - IN PERESOURCE Resource); - -NTKERNELAPI VOID NTAPI ExUnregisterCallback( Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h (original) +++ trunk/reactos/include/ndk/exfuncs.h Wed Nov 15 23:24:55 2006 @@ -96,6 +96,7 @@ // // Resource Functions // +NTKERNELAPI BOOLEAN NTAPI ExTryToAcquireResourceExclusiveLite( @@ -151,6 +152,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateKeyedEvent( @@ -205,7 +207,7 @@ IN PUNICODE_STRING DisplayString ); - +NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateSystemEnvironmentValuesEx( @@ -361,6 +363,7 @@ PULONG ReturnLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemEnvironmentValueEx( @@ -509,6 +512,7 @@ IN PUNICODE_STRING Value ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemEnvironmentValueEx( Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h (original) +++ trunk/reactos/include/ndk/psfuncs.h Wed Nov 15 23:24:55 2006 @@ -30,24 +30,28 @@ // // Win32K Process/Thread Functions // +NTKERNELAPI struct _W32THREAD* NTAPI PsGetCurrentThreadWin32Thread( VOID ); +NTKERNELAPI struct _W32PROCESS* NTAPI PsGetCurrentProcessWin32Process( VOID ); +NTKERNELAPI PVOID NTAPI PsGetProcessWin32Process( PEPROCESS Process ); +NTKERNELAPI VOID NTAPI PsSetProcessWin32Process( @@ -55,6 +59,7 @@ PVOID Win32Process ); +NTKERNELAPI VOID NTAPI PsSetThreadWin32Thread( @@ -62,18 +67,21 @@ PVOID Win32Thread ); +NTKERNELAPI PVOID NTAPI PsGetThreadWin32Thread( PETHREAD Thread ); +NTKERNELAPI BOOLEAN NTAPI PsGetThreadHardErrorsAreDisabled( PETHREAD Thread ); +NTKERNELAPI VOID NTAPI PsSetThreadHardErrorsAreDisabled( @@ -81,12 +89,14 @@ IN BOOLEAN Disabled ); +NTKERNELAPI VOID NTAPI PsEstablishWin32Callouts( PWIN32_CALLOUTS_FPNS CalloutData ); +NTKERNELAPI VOID NTAPI PsReturnProcessNonPagedPoolQuota( @@ -97,6 +107,7 @@ // // Process Impersonation Functions // +NTKERNELAPI VOID NTAPI PsRevertThreadToSelf( @@ -106,10 +117,12 @@ // // Misc. Functions // +NTKERNELAPI HANDLE NTAPI PsGetProcessId(PEPROCESS Process); +NTKERNELAPI NTSTATUS NTAPI PsLookupProcessThreadByCid( @@ -132,6 +145,7 @@ ); typedef ULONG APPHELPCACHESERVICECLASS; +NTSYSCALLAPI NTSTATUS NTAPI NtApphelpCacheControl( Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Wed Nov 15 23:24:55 2006 @@ -104,7 +104,7 @@ PAGED_CODE(); /* Check if this process has already been notified */ - ProcessFlags = InterlockedAnd(&Process->Flags, + ProcessFlags = InterlockedAnd((PLONG)&Process->Flags, PSF_CREATE_REPORTED_BIT | PSF_IMAGE_NOTIFY_DONE_BIT); if (!(ProcessFlags & PSF_IMAGE_NOTIFY_DONE_BIT) && (PsImageNotifyEnabled)) Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Wed Nov 15 23:24:55 2006 @@ -1055,8 +1055,9 @@ else { /* Set the process flags */ - InterlockedOr(&Process->Flags, PSF_NO_DEBUG_INHERIT_BIT | - PSF_CREATE_REPORTED_BIT); + InterlockedOr((PLONG)&Process->Flags, + PSF_NO_DEBUG_INHERIT_BIT | + PSF_CREATE_REPORTED_BIT); /* Reference the debug object */ ObDereferenceObject(DebugObject); Modified: trunk/reactos/ntoskrnl/fs/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/filelock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/fs/filelock.c (original) +++ trunk/reactos/ntoskrnl/fs/filelock.c Wed Nov 15 23:24:55 2006 @@ -1068,7 +1068,7 @@ /* Acquire cancel spinlock and clear the cancel routine */ IoAcquireCancelSpinLock(&Irp->CancelIrql); - IoSetCancelRoutine(Irp, NULL); + (void)IoSetCancelRoutine(Irp, NULL); IoReleaseCancelSpinLock(Irp->CancelIrql); /* Complete the IRP */ Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Wed Nov 15 23:24:55 2006 @@ -1329,7 +1329,8 @@ PDRIVE_LAYOUT_INFORMATION DriveLayoutInfo = NULL; LONG j = -1, i = -1, k; DISK_GEOMETRY DiskGeometry; - LONGLONG EndSector, MaxSector, StartOffset, MaxOffset; + LONGLONG EndSector, MaxSector, StartOffset; + ULONGLONG MaxOffset; LARGE_INTEGER Offset, VolumeOffset; BOOLEAN IsPrimary = TRUE, IsEzDrive = FALSE, MbrFound = FALSE; BOOLEAN IsValid, IsEmpty = TRUE;

1 0

[fireball] 24764: Properly use the second param.
by fireball＠svn.reactos.org 15 Nov '06

15 Nov '06

Author: fireball Date: Wed Nov 15 19:57:15 2006 New Revision: 24764 URL: http://svn.reactos.org/svn/reactos?rev=24764&view=rev Log: Properly use the second param. Modified: trunk/reactos/hal/halx86/mp/processor_mp.c Modified: trunk/reactos/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/processor_mp… ============================================================================== --- trunk/reactos/hal/halx86/mp/processor_mp.c (original) +++ trunk/reactos/hal/halx86/mp/processor_mp.c Wed Nov 15 19:57:15 2006 @@ -113,8 +113,7 @@ DPRINT1("Attempting to boot CPU %d\n", CPU); - //FIXME: ProcessorStack? - //HaliStartApplicationProcessor(CPU, ProcessorStack); + HaliStartApplicationProcessor(CPU, (ULONG)ProcessorState); return TRUE; }

1 0

[fireball] 24763: Fix build by: - Matching HAL MP HalStartNextProcessor() and commenting out a call to HaliStartApplicationProcessor() (because it needs ProcessorContext). Proper fix should be done. - Removing HalReportResourceUsage from MP version, and marking what it did differently as FIXME in the generic version.
by fireball＠svn.reactos.org 15 Nov '06

15 Nov '06

Author: fireball Date: Wed Nov 15 13:42:46 2006 New Revision: 24763 URL: http://svn.reactos.org/svn/reactos?rev=24763&view=rev Log: Fix build by: - Matching HAL MP HalStartNextProcessor() and commenting out a call to HaliStartApplicationProcessor() (because it needs ProcessorContext). Proper fix should be done. - Removing HalReportResourceUsage from MP version, and marking what it did differently as FIXME in the generic version. Removed: trunk/reactos/hal/halx86/mp/resource_mp.c Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/mp/halmp.rbuild trunk/reactos/hal/halx86/mp/processor_mp.c Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Wed Nov 15 13:42:46 2006 @@ -62,6 +62,9 @@ /* Initialize PCI bus. */ HalpInitPciBus(); + /* FIXME: This is done in ReactOS MP HAL only*/ + //HaliReconfigurePciInterrupts(); + /* FIXME: Report HAL Usage to kernel */ } Modified: trunk/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/mp/halmp.rbuild (original) +++ trunk/reactos/hal/halx86/mp/halmp.rbuild Wed Nov 15 13:42:46 2006 @@ -19,7 +19,6 @@ <file>mpsboot.asm</file> <file>mpsirql.c</file> <file>processor_mp.c</file> - <file>resource_mp.c</file> <file>spinlock.c</file> <file>halmp.rc</file> </module> Modified: trunk/reactos/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/processor_mp… ============================================================================== --- trunk/reactos/hal/halx86/mp/processor_mp.c (original) +++ trunk/reactos/hal/halx86/mp/processor_mp.c Wed Nov 15 13:42:46 2006 @@ -88,19 +88,21 @@ return FALSE; } -BOOLEAN STDCALL -HalStartNextProcessor(ULONG Unknown1, - ULONG ProcessorStack) +BOOLEAN +NTAPI +HalStartNextProcessor( + IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN PKPROCESSOR_STATE ProcessorState) { ULONG CPU; - DPRINT("HalStartNextProcessor(%x %x)\n", Unknown1, ProcessorStack); + DPRINT("HalStartNextProcessor(%x %x)\n", LoaderBlock, ProcessorState); for (CPU = 0; CPU < CPUCount; CPU++) { if (!(OnlineCPUs & (1<<CPU))) { - break; + break; } } @@ -111,7 +113,8 @@ DPRINT1("Attempting to boot CPU %d\n", CPU); - HaliStartApplicationProcessor(CPU, ProcessorStack); + //FIXME: ProcessorStack? + //HaliStartApplicationProcessor(CPU, ProcessorStack); return TRUE; } Removed: trunk/reactos/hal/halx86/mp/resource_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/resource_mp.… ============================================================================== --- trunk/reactos/hal/halx86/mp/resource_mp.c (original) +++ trunk/reactos/hal/halx86/mp/resource_mp.c (removed) @@ -1,36 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/mp/resource_mp.c - * PURPOSE: Miscellaneous resource functions for MP - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -VOID -HaliReconfigurePciInterrupts(VOID); - - -VOID STDCALL -HalReportResourceUsage(VOID) -{ - /* - * FIXME: Report all resources used by hal. - * Calls IoReportHalResourceUsage() - */ - - /* Initialize PCI bus. */ - HalpInitPciBus (); - - HaliReconfigurePciInterrupts(); -} - -/* EOF */

1 0

[ion] 24762: - Export ExiTryToAcquireFastMutex from ntoskrnl, I had forgotten to export this ages ago when adding the other Exi*FastMutex* stuff. - Remove fmutex.c and fastmutex functions from HAL. The whole point of having the Exi ones in the kernel was that HAL calls them through forward exports now (so any old driver can still link with HAL). Now we don't duplicate the implementation anymore. - Remove DriverEntry, it's useless. Also move HalReportResourceUsage to halinit because it's a call-o
by ion＠svn.reactos.org 15 Nov '06

15 Nov '06

Author: ion Date: Wed Nov 15 03:08:51 2006 New Revision: 24762 URL: http://svn.reactos.org/svn/reactos?rev=24762&view=rev Log: - Export ExiTryToAcquireFastMutex from ntoskrnl, I had forgotten to export this ages ago when adding the other Exi*FastMutex* stuff. - Remove fmutex.c and fastmutex functions from HAL. The whole point of having the Exi ones in the kernel was that HAL calls them through forward exports now (so any old driver can still link with HAL). Now we don't duplicate the implementation anymore. - Remove DriverEntry, it's useless. Also move HalReportResourceUsage to halinit because it's a call-once-on-boot function much akin a HalInitPhase2 function, so delete resource.c - Keep track of interrupt affinity and active processor mask each time a new CPU initializes. Removed: trunk/reactos/hal/halx86/generic/fmutex.c trunk/reactos/hal/halx86/generic/resource.c Modified: trunk/reactos/hal/hal/hal.def trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/hal/halx86/generic/sysinfo.c trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/hal/hal/hal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.def?rev=24762&… ============================================================================== --- trunk/reactos/hal/hal/hal.def (original) +++ trunk/reactos/hal/hal/hal.def Wed Nov 15 03:08:51 2006 @@ -3,9 +3,9 @@ LIBRARY hal.dll EXPORTS -@ExAcquireFastMutex@4 -@ExReleaseFastMutex@4 -@ExTryToAcquireFastMutex@4 +@ExAcquireFastMutex@4=@ExiAcquireFastMutex@4 +@ExReleaseFastMutex@4=@ExiReleaseFastMutex@4 +@ExTryToAcquireFastMutex@4=@ExiTryToAcquireFastMutex@4 HalAcquireDisplayOwnership@4 HalAdjustResourceList@4 HalAllProcessorsStarted@0 Removed: trunk/reactos/hal/halx86/generic/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/fmutex.… ============================================================================== --- trunk/reactos/hal/halx86/generic/fmutex.c (original) +++ trunk/reactos/hal/halx86/generic/fmutex.c (removed) @@ -1,101 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS HAL - * FILE: ntoskrnl/hal/x86/fmutex.c - * PURPOSE: Deprecated HAL Fast Mutex - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - */ - -/* - * NOTE: Even HAL itself has #defines to use the Exi* APIs inside NTOSKRNL. - * These are only exported here for compatibility with really old - * drivers. Also note that in theory, these can be made much faster - * by using assembly and inlining all the operations, including - * raising and lowering irql. - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -#undef ExAcquireFastMutex -#undef ExReleaseFastMutex -#undef ExTryToAcquireFastMutex - -/* FUNCTIONS *****************************************************************/ - -VOID -FASTCALL -ExAcquireFastMutex(PFAST_MUTEX FastMutex) -{ - KIRQL OldIrql; - - /* Raise IRQL to APC */ - OldIrql = KfRaiseIrql(APC_LEVEL); - - /* Decrease the count */ - if (InterlockedDecrement(&FastMutex->Count)) - { - /* Someone is still holding it, use slow path */ - FastMutex->Contention++; - KeWaitForSingleObject(&FastMutex->Gate, - WrExecutive, - KernelMode, - FALSE, - NULL); - } - - /* Set the owner and IRQL */ - FastMutex->Owner = KeGetCurrentThread(); - FastMutex->OldIrql = OldIrql; -} - -VOID -FASTCALL -ExReleaseFastMutex(PFAST_MUTEX FastMutex) -{ - KIRQL OldIrql; - - /* Erase the owner */ - FastMutex->Owner = (PVOID)1; - OldIrql = FastMutex->OldIrql; - - /* Increase the count */ - if (InterlockedIncrement(&FastMutex->Count) <= 0) - { - /* Someone was waiting for it, signal the waiter */ - KeSetEventBoostPriority(&FastMutex->Gate, IO_NO_INCREMENT); - } - - /* Lower IRQL back */ - KfLowerIrql(OldIrql); -} - -BOOLEAN -FASTCALL -ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) -{ - KIRQL OldIrql; - - /* Raise to APC_LEVEL */ - OldIrql = KfRaiseIrql(APC_LEVEL); - - /* Check if we can quickly acquire it */ - if (InterlockedCompareExchange(&FastMutex->Count, 0, 1) == 1) - { - /* We have, set us as owners */ - FastMutex->Owner = KeGetCurrentThread(); - FastMutex->OldIrql = OldIrql; - return TRUE; - } - else - { - /* Acquire attempt failed */ - KfLowerIrql(OldIrql); - return FALSE; - } -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Wed Nov 15 03:08:51 2006 @@ -8,7 +8,6 @@ <file>bus.c</file> <file>dma.c</file> <file>drive.c</file> - <file>fmutex.c</file> <file>halinit.c</file> <file>isa.c</file> <file>kdbg.c</file> @@ -31,7 +30,6 @@ <define name="__USE_W32API" /> <file>irql.c</file> <file>processor.c</file> - <file>resource.c</file> <file>spinlock.c</file> <file>systimer.S</file> </module> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Wed Nov 15 03:08:51 2006 @@ -1,60 +1,69 @@ -/* $Id$ - * - * 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 +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/hal/halx86/generic/processor.c + * PURPOSE: HAL Processor Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> -/* GLOBALS *****************************************************************/ +/* GLOBALS *******************************************************************/ PVOID HalpZeroPageMapping = NULL; HALP_HOOKS HalpHooks; -/* FUNCTIONS ***************************************************************/ +/* FUNCTIONS *****************************************************************/ -NTSTATUS -STDCALL -DriverEntry( - PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) +/* + * @implemented + */ +BOOLEAN +NTAPI +HalInitSystem(IN ULONG BootPhase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - return STATUS_SUCCESS; + PHYSICAL_ADDRESS Null = {{0}}; + + if (BootPhase == 0) + { + RtlZeroMemory(&HalpHooks, sizeof(HALP_HOOKS)); + HalpInitPhase0(LoaderBlock); + } + else if (BootPhase == 1) + { + /* Initialize the clock interrupt */ + //HalpInitPhase1(); + + /* Initialize BUS handlers and DMA */ + HalpInitBusHandlers(); + HalpInitDma(); + } + else if (BootPhase == 2) + { + HalpZeroPageMapping = MmMapIoSpace(Null, PAGE_SIZE, MmNonCached); + } + + /* All done, return */ + return TRUE; } -BOOLEAN STDCALL -HalInitSystem (ULONG BootPhase, - PLOADER_PARAMETER_BLOCK LoaderBlock) +/* + * @implemented + */ +VOID +NTAPI +HalReportResourceUsage(VOID) { - if (BootPhase == 0) - { - RtlZeroMemory(&HalpHooks, sizeof(HALP_HOOKS)); - HalpInitPhase0(LoaderBlock); - } - else if (BootPhase == 1) - { - /* Initialize the clock interrupt */ - //HalpInitPhase1(); + /* Initialize PCI bus. */ + HalpInitPciBus(); - /* Initialize BUS handlers and DMA */ - HalpInitBusHandlers(); - HalpInitDma(); - } - else if (BootPhase == 2) - { - HalpZeroPageMapping = MmMapIoSpace((LARGE_INTEGER)0LL, PAGE_SIZE, MmNonCached); - } - - return TRUE; + /* FIXME: Report HAL Usage to kernel */ } + /* EOF */ Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c (original) +++ trunk/reactos/hal/halx86/generic/processor.c Wed Nov 15 03:08:51 2006 @@ -1,22 +1,19 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/generic/processor.c - * PURPOSE: Intel MultiProcessor specification support - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * NOTES: Parts adapted from linux SMP code - * UPDATE HISTORY: - * 22/05/1998 DW Created - * 12/04/2001 CSH Added MultiProcessor specification support +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/hal/halx86/generic/processor.c + * PURPOSE: HAL Processor Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> + +LONG HalpActiveProcessors; +KAFFINITY HalpDefaultInterruptAffinity; /* FUNCTIONS *****************************************************************/ @@ -28,9 +25,15 @@ HalInitializeProcessor(IN ULONG ProcessorNumber, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - /* Set default IDR */ + /* Set default IDR and stall count */ KeGetPcr()->IDR = 0xFFFFFFFB; KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; + + /* Update the interrupt affinity and processor mask */ + InterlockedBitTestAndSet(&HalpActiveProcessors, ProcessorNumber); + InterlockedBitTestAndSet(&HalpDefaultInterruptAffinity, ProcessorNumber); + + /* FIXME: Register routines for KDCOM */ } /* @@ -63,6 +66,7 @@ NTAPI HalProcessorIdle(VOID) { + /* Enable interrupts and halt the processor */ _enable(); Ki386HaltProcessor(); } Removed: trunk/reactos/hal/halx86/generic/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/resourc… ============================================================================== --- trunk/reactos/hal/halx86/generic/resource.c (original) +++ trunk/reactos/hal/halx86/generic/resource.c (removed) @@ -1,31 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/generic/resource.c - * PURPOSE: Miscellaneous resource functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -/* FUNCTIONS ****************************************************************/ - -VOID STDCALL -HalReportResourceUsage(VOID) -{ - /* - * FIXME: Report all resources used by hal. - * Calls IoReportHalResourceUsage() - */ - - /* Initialize PCI bus. */ - HalpInitPciBus (); -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysinfo.c (original) +++ trunk/reactos/hal/halx86/generic/sysinfo.c Wed Nov 15 03:08:51 2006 @@ -1,12 +1,12 @@ /* -* PROJECT: ReactOS HA: -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/hal/halx86/generic/sysinfo.c -* PURPOSE: HAL Information Routines -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ + * PROJECT: ReactOS HA: + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/hal/halx86/generic/sysinfo.c + * PURPOSE: HAL Information Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <hal.h> #define NDEBUG Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Wed Nov 15 03:08:51 2006 @@ -157,6 +157,7 @@ ExSetTimerResolution@8 ExSystemExceptionFilter@0 ExSystemTimeToLocalTime@8 +@ExiTryToAcquireFastMutex@4=@ExTryToAcquireFastMutex@4 ExTryToAcquireResourceExclusiveLite@4 ExUnregisterCallback@4 ExUuidCreate@4

1 0

[gedmurphy] 24761: - split the main header file into seperate files as it was becoming annoying to maintain - split the open / new file code - Add a dialog for adjusting the brightness. The code for adjusting the brightness will follow soon, as will many other image adjusting dialogs. - change the menus to show the image adjustment tools which will be present - remove the horrible image property dialog code. I'll rewrite it at a later stage - Set Arial as the default font - fix a few API's to be
by gedmurphy＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: gedmurphy Date: Wed Nov 15 02:15:02 2006 New Revision: 24761 URL: http://svn.reactos.org/svn/reactos?rev=24761&view=rev Log: - split the main header file into seperate files as it was becoming annoying to maintain - split the open / new file code - Add a dialog for adjusting the brightness. The code for adjusting the brightness will follow soon, as will many other image adjusting dialogs. - change the menus to show the image adjustment tools which will be present - remove the horrible image property dialog code. I'll rewrite it at a later stage - Set Arial as the default font - fix a few API's to be 64-bit compatable - reduce msvc warnings Added: trunk/reactos/base/applications/imagesoft/imgedwnd.h trunk/reactos/base/applications/imagesoft/mainwnd.h trunk/reactos/base/applications/imagesoft/misc.h trunk/reactos/base/applications/imagesoft/tooldock.h Modified: trunk/reactos/base/applications/imagesoft/custcombo.c trunk/reactos/base/applications/imagesoft/floatwindow.c trunk/reactos/base/applications/imagesoft/font.c trunk/reactos/base/applications/imagesoft/imageprop.c trunk/reactos/base/applications/imagesoft/imagesoft.c trunk/reactos/base/applications/imagesoft/imagesoft.rc trunk/reactos/base/applications/imagesoft/imgedwnd.c trunk/reactos/base/applications/imagesoft/lang/En.rc trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/misc.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/resource.h Modified: trunk/reactos/base/applications/imagesoft/custcombo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/custcombo.c (original) +++ trunk/reactos/base/applications/imagesoft/custcombo.c Wed Nov 15 02:15:02 2006 @@ -201,13 +201,13 @@ LONG OldComboProc; /* Remember old window procedure */ - OldComboProc = GetWindowLong(hwndCombo, GWL_WNDPROC); - SetWindowLong(hwndCombo, - GWL_USERDATA, - OldComboProc); + OldComboProc = GetWindowLongPtr(hwndCombo, GWL_WNDPROC); + SetWindowLongPtr(hwndCombo, + GWL_USERDATA, + OldComboProc); /* Perform the subclass */ - OldComboProc = SetWindowLong(hwndCombo, - GWL_WNDPROC, - (LONG)FlatComboProc); + SetWindowLongPtr(hwndCombo, + GWL_WNDPROC, + (LONG_PTR)FlatComboProc); } Modified: trunk/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floatwindow.c (original) +++ trunk/reactos/base/applications/imagesoft/floatwindow.c Wed Nov 15 02:15:02 2006 @@ -365,10 +365,10 @@ FltInfo->bOpaque = FALSE; - SetWindowLong(hwnd, - GWL_EXSTYLE, - GetWindowLong(hwnd, - GWL_EXSTYLE) | WS_EX_LAYERED); + SetWindowLongPtr(hwnd, + GWL_EXSTYLE, + GetWindowLongPtr(hwnd, + GWL_EXSTYLE) | WS_EX_LAYERED); /* set the tranclucency to 60% */ SetLayeredWindowAttributes(hwnd, @@ -404,10 +404,10 @@ FltInfo->bOpaque = FALSE; - SetWindowLong(hwnd, - GWL_EXSTYLE, - GetWindowLong(hwnd, - GWL_EXSTYLE) | WS_EX_LAYERED); + SetWindowLongPtr(hwnd, + GWL_EXSTYLE, + GetWindowLongPtr(hwnd, + GWL_EXSTYLE) | WS_EX_LAYERED); /* set the tranclucency to 60% */ SetLayeredWindowAttributes(hwnd, @@ -426,10 +426,10 @@ { if (FltInfo->bOpaque == FALSE) { - SetWindowLong(hwnd, - GWL_EXSTYLE, - GetWindowLong(hwnd, - GWL_EXSTYLE) & ~WS_EX_LAYERED); + SetWindowLongPtr(hwnd, + GWL_EXSTYLE, + GetWindowLongPtr(hwnd, + GWL_EXSTYLE) & ~WS_EX_LAYERED); RedrawWindow(hwnd, NULL, Modified: trunk/reactos/base/applications/imagesoft/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/font.c (original) +++ trunk/reactos/base/applications/imagesoft/font.c Wed Nov 15 02:15:02 2006 @@ -1,5 +1,4 @@ #include <precomp.h> - int CALLBACK EnumFontSizes(ENUMLOGFONTEX *lpelfe, @@ -20,8 +19,16 @@ for (i = 0; i < (sizeof(ttsizes) / sizeof(ttsizes[0])); i++) { wsprintf(ach, _T("%d"), ttsizes[i]); - idx = (INT)SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)ach); - SendMessage(hwndCombo, CB_SETITEMDATA, idx, ttsizes[i]); + + idx = (INT)SendMessage(hwndCombo, + CB_ADDSTRING, + 0, + (LPARAM)ach); + + SendMessage(hwndCombo, + CB_SETITEMDATA, + idx, + ttsizes[i]); } return 0; } @@ -92,25 +99,42 @@ lf.lfPitchAndFamily = 0; /* empty the list */ - SendMessage(hwndCombo, CB_RESETCONTENT, 0, 0); + SendMessage(hwndCombo, + CB_RESETCONTENT, + 0, + 0); /* enumerate font sizes */ - EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC)EnumFontSizes, (LONG)hwndCombo, 0); + EnumFontFamiliesEx(hdc, + &lf, + (FONTENUMPROC)EnumFontSizes, + (LPARAM)hwndCombo, + 0); /* set selection to first item */ - count = (INT)SendMessage(hwndCombo, CB_GETCOUNT, 0, 0); + count = (INT)SendMessage(hwndCombo, + CB_GETCOUNT, + 0, + 0); for(i = 0; i < count; i++) { - INT n = (INT)SendMessage(hwndCombo, CB_GETITEMDATA, i, 0); + INT n = (INT)SendMessage(hwndCombo, + CB_GETITEMDATA, + i, + 0); if (n <= cursize) nearest = i; } - SendMessage(hwndCombo, CB_SETCURSEL, nearest, 0); + SendMessage(hwndCombo, + CB_SETCURSEL, + nearest, + 0); - ReleaseDC(hwndCombo, hdc); + ReleaseDC(hwndCombo, + hdc); } @@ -144,8 +168,11 @@ ReleaseDC(hwndCombo, hdc); + /* set default to Arial */ SendMessage(hwndCombo, - CB_SETCURSEL, - 0, - 0); + CB_SELECTSTRING, + -1, + (LPARAM)_T("Arial")); + + } Modified: trunk/reactos/base/applications/imagesoft/imageprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imageprop.c (original) +++ trunk/reactos/base/applications/imagesoft/imageprop.c Wed Nov 15 02:15:02 2006 @@ -1,261 +1,112 @@ #include <precomp.h> -static HWND hImageType, hUnitType, hHeightUnit, hWidthUnit, hResUnit; - -UINT ConvertValue(HWND hDlg, UINT EdBoxChanged, UINT LastUnitSel) +INT_PTR CALLBACK +BrightnessProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) { - LONG Resolution = GetDlgItemInt(hDlg, IDC_RES_EDIT, NULL, FALSE); - FLOAT Width = (FLOAT)GetDlgItemInt(hDlg, IDC_WIDTH_EDIT, NULL, FALSE); - FLOAT Height = (FLOAT)GetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, NULL, FALSE); - USHORT CurUnit = (USHORT)SendMessage(hUnitType, CB_GETCURSEL, 0, 0); - - /* if the user typed in the resolution box */ - if ((EdBoxChanged == IDC_RES_EDIT) && (CurUnit != PIXELS)) - { - Width = Width / Resolution * 100; - Height = Height / Resolution * 100; - - - /* something wrong with these */ - SetDlgItemInt(hDlg, IDC_WIDTH_EDIT, Width, TRUE); - SetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, Height, FALSE); - - return LastUnitSel; - } - - - /* if the user changed the unit combobox */ - if (EdBoxChanged == IDC_UNIT) - { - switch(LastUnitSel) - { - case PIXELS: - if (CurUnit == CENTIMETERS) - ; - else if (CurUnit == INCHES) - ; - break; - - case CENTIMETERS: - if (CurUnit == PIXELS) - ; - else if (CurUnit == INCHES) - { - Width /= 2.54; - Height /= 2.54; - Resolution *= 2.54; - - SetDlgItemInt(hDlg, IDC_WIDTH_EDIT, Width, FALSE); - SetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, Height, FALSE); - SetDlgItemInt(hDlg, IDC_RES_EDIT, Resolution, FALSE); - } - break; - - case INCHES: - if (CurUnit == PIXELS) - ; - else if (CurUnit == CENTIMETERS) - { - Width *= 2.54; - Height *= 2.54; - Resolution /= 2.54; - - SetDlgItemInt(hDlg, IDC_WIDTH_EDIT, Width, FALSE); - SetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, Height, FALSE); - SetDlgItemInt(hDlg, IDC_RES_EDIT, Resolution, FALSE); - } - break; - } - } - - return CurUnit; -} - - -VOID SetImageSize(HWND hDlg) -{ - DWORD Size; - USHORT Type = 0; - TCHAR buf[20]; - TCHAR SizeUnit[25]; - - FLOAT Width = GetDlgItemInt(hDlg, IDC_WIDTH_EDIT, NULL, FALSE); - FLOAT Height = GetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, NULL, FALSE); - USHORT sel = SendMessage(hImageType, CB_GETCURSEL, 0, 0); - - if (sel == 0) - Type = MONOCHROMEBITS; - else if (sel == 1) - Type = GREYSCALEBITS; - else if (sel == 2) - Type = PALLETEBITS; - else if (sel == 3) - Type = TRUECOLORBITS; - - Size = ((Width * Height * Type) / 8) / 1024; - - if (Size > 1000) - { - Size /= 1024; - LoadString(hInstance, IDS_UNIT_MB, SizeUnit, sizeof(SizeUnit) / sizeof(TCHAR)); - } - else - LoadString(hInstance, IDS_UNIT_KB, SizeUnit, sizeof(SizeUnit) / sizeof(TCHAR)); - - _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), SizeUnit, Size); - SendDlgItemMessage(hDlg, IDC_IMAGE_SIZE, WM_SETTEXT, 0, (LPARAM)buf); - -} - -INT_PTR CALLBACK -ImagePropDialogProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) -{ - static PIMAGE_PROP ImageProp = NULL; - static UINT LastUnitSel; - TCHAR buf[35]; + static PMAIN_WND_INFO Info = NULL; switch (message) { case WM_INITDIALOG: + { + Info = (PMAIN_WND_INFO)lParam; - ImageProp = (PIMAGE_PROP)lParam; + SendDlgItemMessage(hDlg, + IDC_BRI_FULL, + BM_SETCHECK, + BST_CHECKED, + 0); - /* get handles to the windows */ - hImageType = GetDlgItem(hDlg, IDC_IMAGETYPE); - hUnitType = GetDlgItem(hDlg, IDC_UNIT); - hWidthUnit = GetDlgItem(hDlg, IDC_WIDTH_STAT); - hHeightUnit = GetDlgItem(hDlg, IDC_HEIGHT_STAT); - hResUnit = GetDlgItem(hDlg, IDC_RES_STAT); + SendDlgItemMessage(hDlg, + IDC_BRI_TRACKBAR, + TBM_SETRANGE, + TRUE, + (LPARAM)MAKELONG(0, 200)); - /* fill image type combo box */ - LoadString(hInstance, IDS_IMAGE_MONOCHROME, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hImageType, CB_ADDSTRING, 0, (LPARAM)buf); - LoadString(hInstance, IDS_IMAGE_GREYSCALE, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hImageType, CB_ADDSTRING, 0, (LPARAM)buf); - LoadString(hInstance, IDS_IMAGE_PALETTE, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hImageType, CB_ADDSTRING, 0, (LPARAM)buf); - LoadString(hInstance, IDS_IMAGE_TRUECOLOR, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hImageType, CB_ADDSTRING, 0, (LPARAM)buf); - /* default 24bit */ - SendMessage(hImageType, CB_SETCURSEL, 3, 0); + SendDlgItemMessage(hDlg, + IDC_BRI_TRACKBAR, + TBM_SETPOS, + TRUE, + (LPARAM)100); - /* fill unit combo box */ - LoadString(hInstance, IDS_UNIT_PIXELS, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hUnitType, CB_ADDSTRING, 0, (LPARAM)buf); - LoadString(hInstance, IDS_UNIT_CM, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hUnitType, CB_ADDSTRING, 0, (LPARAM)buf); - LoadString(hInstance, IDS_UNIT_INCHES, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hUnitType, CB_ADDSTRING, 0, (LPARAM)buf); - /* default pixels */ - SendMessage(hUnitType, CB_SETCURSEL, 0, 0); + SetDlgItemText(hDlg, + IDC_BRI_EDIT, + _T("100")); - /* default pixels */ - LoadString(hInstance, IDS_UNIT_PIXELS, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hWidthUnit, WM_SETTEXT, 0, (LPARAM)buf); - SendMessage(hHeightUnit, WM_SETTEXT, 0, (LPARAM)buf); - LoadString(hInstance, IDS_UNIT_DPI, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hResUnit, WM_SETTEXT, 0, (LPARAM)buf); - LastUnitSel = PIXELS; - /* temperary. Default vals should be loaded from registry */ - SendDlgItemMessage(hDlg, IDC_WIDTH_EDIT, WM_SETTEXT, 0, (LPARAM)_T("400")); - SendDlgItemMessage(hDlg, IDC_HEIGHT_EDIT, WM_SETTEXT, 0, (LPARAM)_T("300")); - SendDlgItemMessage(hDlg, IDC_RES_EDIT, WM_SETTEXT, 0, (LPARAM)_T("50")); - SetImageSize(hDlg); + return TRUE; + } - break; + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDrawItem; + HWND hPicPrev = GetDlgItem(hDlg, IDC_PICPREVIEW); + RECT ImageRect = {0}; + HDC hdcMem; - case WM_COMMAND: + lpDrawItem = (LPDRAWITEMSTRUCT)lParam; - switch(LOWORD(wParam)) + GetClientRect(hPicPrev, + &ImageRect); + + hdcMem = CreateCompatibleDC(lpDrawItem->hDC); + + if(lpDrawItem->CtlID == IDC_PICPREVIEW) + { + SelectObject(hdcMem, + Info->ImageEditors->hBitmap); + + StretchBlt(lpDrawItem->hDC, + ImageRect.left, + ImageRect.top, + ImageRect.right, + ImageRect.bottom, + hdcMem, + 0, + 0, + Info->ImageEditors->Width, + Info->ImageEditors->Height, + SRCCOPY); + + DeleteDC(hdcMem); + } + return TRUE; + } + + case WM_HSCROLL: { - case IDOK: + if (LOWORD(wParam) == TB_THUMBTRACK || + LOWORD(wParam) == TB_ENDTRACK) { - /* FIXME: default vals should be taken from registry */ + DWORD Pos = (DWORD)SendDlgItemMessage(hDlg, + IDC_BRI_TRACKBAR, + TBM_GETPOS, + 0, + 0); + SetDlgItemInt(hDlg, + IDC_BRI_EDIT, + Pos, + FALSE); + } - INT Ret = GetTextFromEdit(ImageProp->lpImageName, hDlg, IDC_IMAGE_NAME_EDIT); - if (Ret == 0) - ImageProp->lpImageName = NULL; + return TRUE; + } - ImageProp->Type = SendMessage(hImageType, CB_GETCURSEL, 0, 0); - ImageProp->Resolution = GetDlgItemInt(hDlg, IDC_RES_EDIT, NULL, FALSE); - ImageProp->Width = GetDlgItemInt(hDlg, IDC_WIDTH_EDIT, NULL, FALSE); - ImageProp->Height = GetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, NULL, FALSE); - ImageProp->Unit = SendMessage(hUnitType, CB_GETCURSEL, 0, 0); - - EndDialog(hDlg, 1); + case WM_COMMAND: + { + if (LOWORD(wParam) == IDOK || + LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, + LOWORD(wParam)); + return TRUE; } - break; - - case IDCANCEL: - ImageProp = NULL; - EndDialog(hDlg, 0); - break; - - case IDC_UNIT: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - INT unit = SendMessage(hUnitType, CB_GETCURSEL, 0, 0); - - LastUnitSel = ConvertValue(hDlg, IDC_UNIT, LastUnitSel); - - switch (unit) - { - case 0: /* pixels */ - { - LoadString(hInstance, IDS_UNIT_PIXELS, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hWidthUnit, WM_SETTEXT, 0, (LPARAM)buf); - SendMessage(hHeightUnit, WM_SETTEXT, 0, (LPARAM)buf); - LoadString(hInstance, IDS_UNIT_DPI, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hResUnit, WM_SETTEXT, 0, (LPARAM)buf); - } - break; - - case 1: - /* cm */ - LoadString(hInstance, IDS_UNIT_CM, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hWidthUnit, WM_SETTEXT, 0, (LPARAM)buf); - SendMessage(hHeightUnit, WM_SETTEXT, 0, (LPARAM)buf); - LoadString(hInstance, IDS_UNIT_DOTSCM, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hResUnit, WM_SETTEXT, 0, (LPARAM)buf); - break; - - case 2: - /* inch */ - LoadString(hInstance, IDS_UNIT_INCHES, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hWidthUnit, WM_SETTEXT, 0, (LPARAM)buf); - SendMessage(hHeightUnit, WM_SETTEXT, 0, (LPARAM)buf); - LoadString(hInstance, IDS_UNIT_DPI, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hResUnit, WM_SETTEXT, 0, (LPARAM)buf); - break; - } - } - break; - - case IDC_IMAGETYPE: - if (HIWORD(wParam) == CBN_SELCHANGE) - SetImageSize(hDlg); - break; - - case IDC_WIDTH_EDIT: - case IDC_HEIGHT_EDIT: - if (HIWORD(wParam) == EN_UPDATE) - SetImageSize(hDlg); - break; - - case IDC_RES_EDIT: - if (HIWORD(wParam) == EN_UPDATE) - ConvertValue(hDlg, IDC_RES_EDIT, LastUnitSel); - break; } break; - - default: - return FALSE; } - return TRUE; + return FALSE; } Modified: trunk/reactos/base/applications/imagesoft/imagesoft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.c (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.c Wed Nov 15 02:15:02 2006 @@ -3,9 +3,6 @@ HINSTANCE hInstance; HANDLE ProcessHeap; -#ifdef _MSC_VER -#pragma warning(disable : 4100) -#endif int WINAPI WinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rc (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rc Wed Nov 15 02:15:02 2006 @@ -2,10 +2,10 @@ #include <commctrl.h> #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS image editor\0" -#define REACTOS_STR_INTERNAL_NAME "imagesoft\0" -#define REACTOS_STR_ORIGINAL_FILENAME "imagesoft.exe\0" -#include <reactos/version.rc> +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS image editor\0" +#define REACTOS_STR_INTERNAL_NAME "imagesoft\0" +#define REACTOS_STR_ORIGINAL_FILENAME "imagesoft.exe\0" +//#include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -24,7 +24,6 @@ IDB_MAINPRINTICON BITMAP DISCARDABLE "res/icons/std/MainPrintIcon.bmp" IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/std/MainPrintPreIcon.bmp" IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/std/MainSaveIcon.bmp" - /* text toolbar icons */ IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/text/TextBoldIcon.bmp" Modified: trunk/reactos/base/applications/imagesoft/imgedwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imgedwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/imgedwnd.c Wed Nov 15 02:15:02 2006 @@ -3,7 +3,6 @@ static const TCHAR szImageEditWndClass[] = TEXT("ImageSoftEditWndClass"); #define IMAGE_FRAME_SIZE 1 - static VOID EditWndUpdateScrollInfo(PEDIT_WND_INFO Info) @@ -33,119 +32,136 @@ TRUE); } + +static VOID +LoadBlankCanvas(PEDIT_WND_INFO Info) +{ + /* FIXME: convert this to a DIB Section */ + /* set bitmap dimensions */ + Info->Width = Info->OpenInfo->New.Width; + Info->Height = Info->OpenInfo->New.Height; +} + static BOOL -InitEditWnd(PEDIT_WND_INFO Info) +LoadDIBImage(PEDIT_WND_INFO Info) { BITMAPFILEHEADER bmfh; - PBITMAPINFO pbmi = NULL; - PBYTE pBits; HANDLE hFile; BITMAP bitmap; - - Info->Zoom = 100; - - if (Info->OpenInfo != NULL) - { - HDC hDC = GetDC(Info->hSelf); - Info->hDCMem = CreateCompatibleDC(hDC); - ReleaseDC(Info->hSelf, hDC); - - if (Info->OpenInfo->CreateNew) - { - /* FIXME: convert this to a DIB Section */ - /* set bitmap dimensions */ - Info->Width = Info->OpenInfo->New.Width; - Info->Height = Info->OpenInfo->New.Height; - - } - else - { - DWORD InfoSize, BytesRead; - BOOL bSuccess; - - hFile = CreateFile(Info->OpenInfo->Open.lpImagePath, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_FLAG_SEQUENTIAL_SCAN, - NULL); - if (hFile == INVALID_HANDLE_VALUE) - return FALSE; - + DWORD BytesRead; + BOOL bSuccess, bRet = FALSE; + + hFile = CreateFile(Info->OpenInfo->Open.lpImagePath, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_FLAG_SEQUENTIAL_SCAN, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + return bRet; + + bSuccess = ReadFile(hFile, + &bmfh, + sizeof(BITMAPFILEHEADER), + &BytesRead, + NULL); + + if (bSuccess && (BytesRead == sizeof(BITMAPFILEHEADER)) + && (bmfh.bfType == *(WORD *)"BM")) + { + PBITMAPINFO pbmi; + DWORD InfoSize; + + InfoSize = bmfh.bfOffBits - sizeof(BITMAPFILEHEADER); + + pbmi = HeapAlloc(ProcessHeap, + 0, + InfoSize); + if (pbmi) + { bSuccess = ReadFile(hFile, - &bmfh, - sizeof(BITMAPFILEHEADER), + pbmi, + InfoSize, &BytesRead, NULL); - if ( bSuccess && (BytesRead == sizeof(BITMAPFILEHEADER)) - /* FIXME: Why is this failing?? */ - /*&& (bmfh.bfType == *(WORD *)_T("BM"))*/) + if (bSuccess && (BytesRead == InfoSize)) { - InfoSize = bmfh.bfOffBits - sizeof(BITMAPFILEHEADER); - - pbmi = HeapAlloc(ProcessHeap, - 0, - InfoSize); - - bSuccess = ReadFile(hFile, - pbmi, - InfoSize, - &BytesRead, - NULL); - - if (bSuccess && (BytesRead == InfoSize)) + PBYTE pBits; + + Info->hBitmap = CreateDIBSection(NULL, + pbmi, + DIB_RGB_COLORS, + (VOID *)&pBits, + NULL, + 0); + if (Info->hBitmap != NULL) { - Info->hBitmap = CreateDIBSection(NULL, - pbmi, - DIB_RGB_COLORS, - (VOID *)&pBits, - NULL, - 0); - if (Info->hBitmap != NULL) - { - ReadFile(hFile, - pBits, - bmfh.bfSize - bmfh.bfOffBits, - &BytesRead, - NULL); - } - else - { - goto fail; - } - } - else - { - goto fail; + ReadFile(hFile, + pBits, + bmfh.bfSize - bmfh.bfOffBits, + &BytesRead, + NULL); + + /* get bitmap dimensions */ + GetObject(Info->hBitmap, + sizeof(BITMAP), + &bitmap); + + Info->Width = bitmap.bmWidth; + Info->Height = bitmap.bmHeight; + + bRet = TRUE; } } - else - { - if (! bSuccess) - GetError(0); - - goto fail; - } - - CloseHandle(hFile); HeapFree(ProcessHeap, 0, pbmi); } + } + else if (!bSuccess) + { + GetError(0); + } + + CloseHandle(hFile); + + return bRet; +} + + +static BOOL +InitEditWnd(PEDIT_WND_INFO Info) +{ + Info->Zoom = 100; + + if (Info->OpenInfo != NULL) + { + HDC hDC; + + if (Info->hDCMem) + { + DeleteObject(Info->hDCMem); + Info->hDCMem = NULL; + } + + hDC = GetDC(Info->hSelf); + Info->hDCMem = CreateCompatibleDC(hDC); + ReleaseDC(Info->hSelf, hDC); + + if (Info->OpenInfo->CreateNew) + { + LoadBlankCanvas(Info); + } + else + { + LoadDIBImage(Info); + } Info->OpenInfo = NULL; } - - /* get bitmap dimensions */ - GetObject(Info->hBitmap, - sizeof(BITMAP), - &bitmap); - - Info->Width = bitmap.bmWidth; - Info->Height = bitmap.bmHeight; EditWndUpdateScrollInfo(Info); @@ -159,18 +175,6 @@ /* FIXME - if returning FALSE, remove the image editor from the list! */ return TRUE; - - -fail: - if (! hFile) - CloseHandle(hFile); - - if (! pbmi) - HeapFree(ProcessHeap, - 0, - pbmi); - - return FALSE; } static VOID @@ -452,7 +456,7 @@ } BOOL -CreateImageEditWindow(struct _MAIN_WND_INFO *MainWnd, +CreateImageEditWindow(PMAIN_WND_INFO MainWnd, POPEN_IMAGE_EDIT_INFO OpenInfo) { PEDIT_WND_INFO Info; Added: trunk/reactos/base/applications/imagesoft/imgedwnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imgedwnd.h (added) +++ trunk/reactos/base/applications/imagesoft/imgedwnd.h Wed Nov 15 02:15:02 2006 @@ -1,0 +1,92 @@ +#define MONOCHROMEBITS 1 +#define GREYSCALEBITS 8 +#define PALLETEBITS 8 +#define TRUECOLORBITS 24 + +#define PIXELS 0 +#define CENTIMETERS 1 +#define INCHES 2 + + +/* generic definitions and forward declarations */ +struct _MAIN_WND_INFO; +struct _EDIT_WND_INFO; + + +typedef enum _MDI_EDITOR_TYPE { + metUnknown = 0, + metImageEditor, +} MDI_EDITOR_TYPE, *PMDI_EDITOR_TYPE; + +typedef enum +{ + tSelect = 0, + tMove, + tLasso, + tZoom, + tMagicWand, + tBrush, + tEraser, + tPencil, + tColorPick, + tStamp, + tFill, + tLine, + tPolyline, + tRectangle, + tRoundRectangle, + tPolygon, + tElipse, +} TOOL; + +typedef struct _OPEN_IMAGE_EDIT_INFO +{ + BOOL CreateNew; + union + { + struct + { + LONG Width; + LONG Height; + } New; + struct + { + LPTSTR lpImagePath; + } Open; + }; + LPTSTR lpImageName; + USHORT Type; + LONG Resolution; +} OPEN_IMAGE_EDIT_INFO, *POPEN_IMAGE_EDIT_INFO; + +typedef struct _EDIT_WND_INFO +{ + MDI_EDITOR_TYPE MdiEditorType; /* Must be first member! */ + + HWND hSelf; + HBITMAP hBitmap; + HDC hDCMem; + struct _MAIN_WND_INFO *MainWnd; + struct _EDIT_WND_INFO *Next; + POINT ScrollPos; + USHORT Zoom; + DWORD Tool; + + POPEN_IMAGE_EDIT_INFO OpenInfo; /* Only valid during initialization */ + + /* Canvas properties */ + USHORT Type; + LONG Resolution; + /* size of drawing area */ + LONG Width; + LONG Height; + +} EDIT_WND_INFO, *PEDIT_WND_INFO; + + +BOOL CreateImageEditWindow(struct _MAIN_WND_INFO *MainWnd, + POPEN_IMAGE_EDIT_INFO OpenInfo); +VOID SetImageEditorEnvironment(PEDIT_WND_INFO Info, + BOOL Setup); +BOOL InitImageEditWindowImpl(VOID); +VOID UninitImageEditWindowImpl(VOID); Modified: trunk/reactos/base/applications/imagesoft/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/lang/En.rc (original) +++ trunk/reactos/base/applications/imagesoft/lang/En.rc Wed Nov 15 02:15:02 2006 @@ -10,52 +10,57 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&New...", ID_NEW - MENUITEM "&Open...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Close\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "C&lose all", ID_CLOSEALL, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Save", ID_SAVE, GRAYED - MENUITEM "Save &As...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Print Pre&view", ID_PRINTPRE, GRAYED - MENUITEM "&Print...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pr&operties...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "E&xit\tAlt+F4", ID_EXIT + MENUITEM "&New...", ID_NEW + MENUITEM "&Open...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "&Close\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "C&lose all", ID_CLOSEALL,GRAYED + MENUITEM SEPARATOR + MENUITEM "&Save", ID_SAVE, GRAYED + MENUITEM "Save &As...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Print Pre&view", ID_PRINTPRE,GRAYED + MENUITEM "&Print...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Pr&operties...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "E&xit\tAlt+F4", ID_EXIT END POPUP "&Edit" BEGIN - MENUITEM "&Undo", ID_UNDO, GRAYED - MENUITEM "&Redo", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "Cu&t", ID_CUT, GRAYED - MENUITEM "&Copy", ID_COPY, GRAYED - MENUITEM "&Paste", ID_PASTE, GRAYED + MENUITEM "&Undo", ID_UNDO, GRAYED + MENUITEM "&Redo", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Cu&t", ID_CUT, GRAYED + MENUITEM "&Copy", ID_COPY, GRAYED + MENUITEM "&Paste", ID_PASTE, GRAYED MENUITEM "Paste as new &image", ID_PASTENEWIMAGE, GRAYED MENUITEM SEPARATOR - MENUITEM "Select &All", ID_SELALL, GRAYED + MENUITEM "Select &All", ID_SELALL, GRAYED END POPUP "&View" BEGIN - MENUITEM "&Tools", ID_TOOLS - MENUITEM "&Colors", ID_COLOR - MENUITEM "&History", ID_HISTORY - MENUITEM "&Status Bar", ID_STATUSBAR - END - POPUP "&Image" - BEGIN - MENUITEM "&Crop...", -1, GRAYED - MENUITEM "&Resize...", -1, GRAYED - MENUITEM "R&otate...", -1, GRAYED - MENUITEM "&Flip...", -1, GRAYED - MENUITEM "&Stretch...", -1, GRAYED - MENUITEM "S&kew...", -1, GRAYED - MENUITEM "&Invert Colors", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Attributes...", -1, GRAYED + MENUITEM "&Tools", ID_TOOLS + MENUITEM "&Colors", ID_COLOR + MENUITEM "&History", ID_HISTORY + MENUITEM "&Status Bar", ID_STATUSBAR + END + POPUP "&Adjust" + BEGIN + MENUITEM "Brightness...", ID_BRIGHTNESS + MENUITEM "Contrast...", -1, GRAYED + MENUITEM "Hue/Saturation...", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Blur", -1, GRAYED + MENUITEM "Sharpen", -1, GRAYED + MENUITEM "Smooth Edges", -1, GRAYED + MENUITEM "Add Shadow", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Image Size...", -1, GRAYED + MENUITEM "Flip", -1, GRAYED + MENUITEM "Mirror", -1, GRAYED + MENUITEM "Rotate", -1, GRAYED + END POPUP "&Colors" BEGIN @@ -87,16 +92,34 @@ END +IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 +CAPTION "Brightness" +FONT 8,"MS Sans Serif", 0, 0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN + LTEXT "Color form:", IDC_STATIC, 135, 5, 36, 9 + GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 + CONTROL "Full (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 + CONTROL "Red", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 + CONTROL "Green", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 + CONTROL "Blue", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 + EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 + CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 + PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 + PUSHBUTTON "Cancel", IDCANCEL, 142, 105, 48, 13 +END + IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "About ImageSoft" -FONT 8,"Tahoma",0,0 +FONT 8,"MS Sans Serif",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME //EXSTYLE WS_EX_LAYERED BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE + ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END @@ -105,24 +128,24 @@ FONT 8,"MS Sans Serif",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Name:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Canvas properties", IDC_STATIC, 4, 22, 148, 98 - LTEXT "Image type:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Width:", IDC_STATIC, 12, 51, 42, 9 - EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 - LTEXT "Height:", IDC_STATIC, 12, 68, 42, 9 - EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 - LTEXT "Resolution:", IDC_STATIC, 12, 84, 42, 9 - EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 - LTEXT "Unit:", IDC_STATIC, 12, 99, 42, 9 - CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 - LTEXT "Image size:", IDC_STATIC, 12, 125, 42, 9 - LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 + LTEXT "Name:", IDC_STATIC, 12, 5, 38, 9 + EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Canvas properties", IDC_STATIC, 4, 22, 148, 98 + LTEXT "Image type:", IDC_STATIC, 12, 36, 42, 9 + CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 + LTEXT "Width:", IDC_STATIC, 12, 51, 42, 9 + EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 + LTEXT "Height:", IDC_STATIC, 12, 68, 42, 9 + EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 + LTEXT "Resolution:", IDC_STATIC, 12, 84, 42, 9 + EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 + LTEXT "Unit:", IDC_STATIC, 12, 99, 42, 9 + CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 + LTEXT "Image size:", IDC_STATIC, 12, 125, 42, 9 + LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 PUSHBUTTON "Cancel", IDCANCEL, 102, 144, 48, 13 END Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Wed Nov 15 02:15:02 2006 @@ -817,49 +817,8 @@ { case ID_NEW: { - OPEN_IMAGE_EDIT_INFO OpenInfo; - PIMAGE_PROP ImageProp = NULL; - - ImageProp = HeapAlloc(ProcessHeap, - 0, - sizeof(IMAGE_PROP)); - if (ImageProp == NULL) - break; - - /* load the properties dialog */ - if (DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_IMAGE_PROP), - Info->hSelf, - ImagePropDialogProc, - (LPARAM)ImageProp)) - { - /* if an image name isn't provided, load a default name */ - if (! ImageProp->lpImageName) - LoadAndFormatString(hInstance, - IDS_IMAGE_NAME, - &OpenInfo.lpImageName, - ++Info->ImagesCreated); - else - OpenInfo.lpImageName = ImageProp->lpImageName; - - OpenInfo.CreateNew = TRUE; - OpenInfo.Type = ImageProp->Type; - OpenInfo.Resolution = ImageProp->Resolution; - OpenInfo.New.Width = ImageProp->Width; - OpenInfo.New.Height = ImageProp->Height; - - HeapFree(ProcessHeap, - 0, - ImageProp); - - CreateImageEditWindow(Info, - &OpenInfo); - } - } - break; - - case ID_BOLD: - MessageBox(NULL, _T("Bingo"), NULL, 0); + MessageBox(NULL, _T("Not yet implemented"), NULL, 0); + } break; case ID_OPEN: @@ -938,6 +897,14 @@ } } break; + + case ID_BRIGHTNESS: + DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_BRIGHTNESS), + Info->hSelf, + BrightnessProc, + (LPARAM)Info); + break; case ID_EXIT: SendMessage(Info->hSelf, Added: trunk/reactos/base/applications/imagesoft/mainwnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.h (added) +++ trunk/reactos/base/applications/imagesoft/mainwnd.h Wed Nov 15 02:15:02 2006 @@ -1,0 +1,41 @@ + +typedef struct _MENU_HINT +{ + WORD CmdId; + UINT HintId; +} MENU_HINT, *PMENU_HINT; + +typedef struct _MAIN_WND_INFO +{ + HWND hSelf; + HWND hMdiClient; + HWND hStatus; + int nCmdShow; + + struct _FLT_WND *fltTools; + struct _FLT_WND *fltColors; + struct _FLT_WND *fltHistory; + + struct _TOOLBAR_DOCKS ToolDocks; + + /* Editors */ + PEDIT_WND_INFO ImageEditors; + UINT ImagesCreated; + + PVOID ActiveEditor; + + /* status flags */ + BOOL InMenuLoop : 1; +} MAIN_WND_INFO, *PMAIN_WND_INFO; + +BOOL InitMainWindowImpl(VOID); +VOID UninitMainWindowImpl(VOID); +HWND CreateMainWindow(LPCTSTR lpCaption, + int nCmdShow); +BOOL MainWndTranslateMDISysAccel(HWND hwnd, + LPMSG lpMsg); +VOID MainWndSwitchEditorContext(PMAIN_WND_INFO Info, + HWND hDeactivate, + HWND hActivate); +MDI_EDITOR_TYPE MainWndGetCurrentEditor(PMAIN_WND_INFO MainWnd, + PVOID *Info); Modified: trunk/reactos/base/applications/imagesoft/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/misc.c (original) +++ trunk/reactos/base/applications/imagesoft/misc.c Wed Nov 15 02:15:02 2006 @@ -249,10 +249,10 @@ 0, 0) & CCS_VERT) != 0); - nButtons = SendMessage(hWndToolbar, - TB_BUTTONCOUNT, - 0, - 0); + nButtons = (DWORD)SendMessage(hWndToolbar, + TB_BUTTONCOUNT, + 0, + 0); for (i = 0; i != nButtons; @@ -376,7 +376,8 @@ { HBITMAP hBitmap; HIMAGELIST hImageList; - INT i, k, Ret; + UINT i, k; + INT Ret; /* Create the toolbar icon image list */ Added: trunk/reactos/base/applications/imagesoft/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/misc.h (added) +++ trunk/reactos/base/applications/imagesoft/misc.h Wed Nov 15 02:15:02 2006 @@ -1,0 +1,44 @@ + +INT AllocAndLoadString(OUT LPTSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID); + +DWORD LoadAndFormatString(IN HINSTANCE hInstance, + IN UINT uID, + OUT LPTSTR *lpTarget, + ...); + +BOOL StatusBarLoadAndFormatString(IN HWND hStatusBar, + IN INT PartId, + IN HINSTANCE hInstance, + IN UINT uID, + ...); + +BOOL StatusBarLoadString(IN HWND hStatusBar, + IN INT PartId, + IN HINSTANCE hInstance, + IN UINT uID); + +INT GetTextFromEdit(OUT LPTSTR lpString, + IN HWND hDlg, + IN UINT Res); + +VOID GetError(DWORD err); + +BOOL ToolbarDeleteControlSpace(HWND hWndToolbar, + const TBBUTTON *ptbButton); + +typedef VOID (*ToolbarChangeControlCallback)(HWND hWndToolbar, + HWND hWndControl, + BOOL Vert); +VOID ToolbarUpdateControlSpaces(HWND hWndToolbar, + ToolbarChangeControlCallback ChangeCallback); + +BOOL ToolbarInsertSpaceForControl(HWND hWndToolbar, + HWND hWndControl, + INT Index, + INT iCmd, + BOOL HideVertical); + +HIMAGELIST InitImageList(UINT NumButtons, + UINT StartResource); Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Wed Nov 15 02:15:02 2006 @@ -3,26 +3,16 @@ //#define WIN32_LEAN_AND_MEAN #include <windows.h> -#include <windowsx.h> /* GET_X/Y_LPARAM */ +#include <windowsx.h> #include <stdio.h> #include <tchar.h> #include <commctrl.h> #include "resource.h" -/* FIXME - add to headers !!! */ -#ifndef SB_SIMPLEID -#define SB_SIMPLEID 0xFF -#endif -#ifndef RBBS_USECHEVRON -#define RBBS_USECHEVRON 0x200 -#endif -#ifndef RBN_CHEVRONPUSHED -#define RBN_CHEVRONPUSHED (RBN_FIRST - 10) -#endif - -#ifdef _MSC_VER -#pragma warning(disable : 4100) -#endif +#include "tooldock.h" +#include "imgedwnd.h" +#include "mainwnd.h" +#include "misc.h" #define MAX_KEY_LENGTH 256 #define NUM_MAINTB_IMAGES 10 @@ -33,28 +23,8 @@ #define COLORS 1 #define HISTORY 2 -#define MONOCHROMEBITS 1 -#define GREYSCALEBITS 8 -#define PALLETEBITS 8 -#define TRUECOLORBITS 24 - -#define PIXELS 0 -#define CENTIMETERS 1 -#define INCHES 2 - -#ifdef _MSC_VER -#pragma warning(disable : 4100) -#endif - -/* generic definitions and forward declarations */ -struct _MAIN_WND_INFO; -struct _EDIT_WND_INFO; -struct _FLT_WND; - -typedef enum _MDI_EDITOR_TYPE { - metUnknown = 0, - metImageEditor, -} MDI_EDITOR_TYPE, *PMDI_EDITOR_TYPE; +extern HINSTANCE hInstance; +extern HANDLE ProcessHeap; /* about.c */ INT_PTR CALLBACK AboutDialogProc(HWND hDlg, @@ -63,306 +33,14 @@ LPARAM lParam); /* imageprop.c */ -typedef struct _IMAGE_PROP -{ - LPTSTR lpImageName; - /* Canvas properties */ - USHORT Type; - USHORT Unit; - LONG Resolution; - /* size of drawing area */ - LONG Width; - LONG Height; -} IMAGE_PROP, *PIMAGE_PROP; - -INT_PTR CALLBACK -ImagePropDialogProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam); - - -/* imagesoft.c */ -extern HINSTANCE hInstance; -extern HANDLE ProcessHeap; - -/* imgedwnd.c */ -typedef enum -{ - tSelect = 0, - tMove, - tLasso, - tZoom, - tMagicWand, - tBrush, - tEraser, - tPencil, - tColorPick, - tStamp, - tFill, - tLine, - tPolyline, - tRectangle, - tRoundRectangle, - tPolygon, - tElipse, -} TOOL; - -typedef struct _OPEN_IMAGE_EDIT_INFO -{ - BOOL CreateNew; - union - { - struct - { - LONG Width; - LONG Height; - } New; - struct - { - LPTSTR lpImagePath; - } Open; - }; - LPTSTR lpImageName; - USHORT Type; - LONG Resolution; -} OPEN_IMAGE_EDIT_INFO, *POPEN_IMAGE_EDIT_INFO; - -typedef struct _EDIT_WND_INFO -{ - MDI_EDITOR_TYPE MdiEditorType; /* Must be first member! */ - - HWND hSelf; - HBITMAP hBitmap; - HDC hDCMem; - struct _MAIN_WND_INFO *MainWnd; - struct _EDIT_WND_INFO *Next; - POINT ScrollPos; - USHORT Zoom; - DWORD Tool; - - POPEN_IMAGE_EDIT_INFO OpenInfo; /* Only valid during initialization */ - - /* Canvas properties */ - USHORT Type; - LONG Resolution; - /* size of drawing area */ - LONG Width; - LONG Height; - -} EDIT_WND_INFO, *PEDIT_WND_INFO; - - -BOOL CreateImageEditWindow(struct _MAIN_WND_INFO *MainWnd, - POPEN_IMAGE_EDIT_INFO OpenInfo); -VOID SetImageEditorEnvironment(PEDIT_WND_INFO Info, - BOOL Setup); -BOOL InitImageEditWindowImpl(VOID); -VOID UninitImageEditWindowImpl(VOID); - - -/* tooldock.c */ -typedef enum -{ - TOP_DOCK = 0, - LEFT_DOCK, - RIGHT_DOCK, - BOTTOM_DOCK, - NO_DOCK -} DOCK_POSITION; - -typedef struct _DOCKBAR -{ - UINT BarId; - LPCTSTR lpName; - UINT DisplayTextId; - DOCK_POSITION Position; -} DOCKBAR, *PDOCKBAR; - -struct _TOOLBAR_DOCKS; - -typedef BOOL (CALLBACK *PDOCKBAR_CREATECLIENT)(struct _TOOLBAR_DOCKS *TbDocks, - const DOCKBAR *Dockbar, - PVOID Context, - HWND hParent, - HWND *hwnd); -typedef BOOL (CALLBACK *PDOCKBAR_DESTROYCLIENT)(struct _TOOLBAR_DOCKS *TbDocks, - const DOCKBAR *Dockbar, - PVOID Context, - HWND hwnd); -typedef BOOL (CALLBACK *PDOCKBAR_INSERTBAND)(struct _TOOLBAR_DOCKS *TbDocks, - const DOCKBAR *Dockbar, - PVOID Context, - UINT *Index, - LPREBARBANDINFO rbi); -typedef VOID (CALLBACK *PDOCKBAR_DOCKBAND)(struct _TOOLBAR_DOCKS *TbDocks, - const DOCKBAR *Dockbar, - PVOID Context, - DOCK_POSITION DockFrom, - DOCK_POSITION DockTo, - LPREBARBANDINFO rbi); -typedef VOID (CALLBACK *PDOCKBAR_CHEVRONPUSHED)(struct _TOOLBAR_DOCKS *TbDocks, - const DOCKBAR *Dockbar, - PVOID Context, - HWND hwndChild, - LPNMREBARCHEVRON lpnm); - -typedef struct _DOCKBAR_ITEM_CALLBACKS -{ - PDOCKBAR_CREATECLIENT CreateClient; - PDOCKBAR_DESTROYCLIENT DestroyClient; - PDOCKBAR_INSERTBAND InsertBand; - PDOCKBAR_DOCKBAND DockBand; - PDOCKBAR_CHEVRONPUSHED ChevronPushed; -} DOCKBAR_ITEM_CALLBACKS, *PDOCKBAR_ITEM_CALLBACKS; - -typedef struct _DOCKBAR_ITEM -{ - struct _DOCKBAR_ITEM *Next; - DOCKBAR DockBar; - PVOID Context; - HWND hWndTool; - HWND hWndClient; - DOCK_POSITION PrevDock; - UINT PrevBandIndex; - const DOCKBAR_ITEM_CALLBACKS *Callbacks; -} DOCKBAR_ITEM, *PDOCKBAR_ITEM; - -typedef VOID (CALLBACK *PDOCKBAR_PARENTRESIZE)(PVOID Context, - WORD cx, - WORD cy); - -#define DOCKS_COUNT 4 -typedef struct _TOOLBAR_DOCKS -{ - HWND hParent; - PVOID Context; - HWND hRebar[DOCKS_COUNT]; - RECT rcRebar[DOCKS_COUNT]; - RECT rcClient; - PDOCKBAR_ITEM Items; - PDOCKBAR_PARENTRESIZE ParentResize; - PDOCKBAR_ITEM Dragging; - UINT DraggingBandId; - TCHAR szTempText[255]; -} TOOLBAR_DOCKS, *PTOOLBAR_DOCKS; - -VOID TbdInitializeDocks(PTOOLBAR_DOCKS TbDocks, - HWND hWndParent, - PVOID Context, - PDOCKBAR_PARENTRESIZE ParentResizeProc); -INT TbdAdjustUpdateClientRect(PTOOLBAR_DOCKS TbDocks, - PRECT rcClient); -HDWP TbdDeferDocks(HDWP hWinPosInfo, - PTOOLBAR_DOCKS TbDocks); -BOOL TbdAddToolbar(PTOOLBAR_DOCKS TbDocks, - const DOCKBAR *Dockbar, - PVOID Context, - const DOCKBAR_ITEM_CALLBACKS *DockbarCallbacks); -BOOL TbdDockBarIdFromClientWindow(PTOOLBAR_DOCKS TbDocks, - HWND hWndClient, - UINT *Id); -BOOL TbdHandleNotifications(PTOOLBAR_DOCKS TbDocks, - LPNMHDR pnmh, - LRESULT *Result); -VOID TbdHandleEnabling(PTOOLBAR_DOCKS TbDocks, - HWND hWnd, - BOOL Enable); -VOID TbdHandleActivation(PTOOLBAR_DOCKS TbDocks, - HWND hWnd, - WPARAM *wParam, - LPARAM *lParam); -VOID TbdShowFloatingToolbars(PTOOLBAR_DOCKS TbDocks, - BOOL Show); -BOOL TbdInitImpl(VOID); -VOID TbdUninitImpl(VOID); - -/* mainwnd.c */ -typedef struct _MENU_HINT -{ - WORD CmdId; - UINT HintId; -} MENU_HINT, *PMENU_HINT; - -typedef struct _MAIN_WND_INFO -{ - HWND hSelf; - HWND hMdiClient; - HWND hStatus; - int nCmdShow; - - struct _FLT_WND *fltTools; - struct _FLT_WND *fltColors; - struct _FLT_WND *fltHistory; - - TOOLBAR_DOCKS ToolDocks; - - /* Editors */ - PEDIT_WND_INFO ImageEditors; - UINT ImagesCreated; - - PVOID ActiveEditor; - - /* status flags */ - BOOL InMenuLoop : 1; -} MAIN_WND_INFO, *PMAIN_WND_INFO; - -BOOL InitMainWindowImpl(VOID); -VOID UninitMainWindowImpl(VOID); -HWND CreateMainWindow(LPCTSTR lpCaption, - int nCmdShow); -BOOL MainWndTranslateMDISysAccel(HWND hwnd, - LPMSG lpMsg); -VOID MainWndSwitchEditorContext(PMAIN_WND_INFO Info, - HWND hDeactivate, - HWND hActivate); -MDI_EDITOR_TYPE MainWndGetCurrentEditor(PMAIN_WND_INFO MainWnd, - PVOID *Info); - -/* misc.c */ -INT AllocAndLoadString(OUT LPTSTR *lpTarget, - IN HINSTANCE hInst, - IN UINT uID); - -DWORD LoadAndFormatString(IN HINSTANCE hInstance, - IN UINT uID, - OUT LPTSTR *lpTarget, - ...); - -BOOL StatusBarLoadAndFormatString(IN HWND hStatusBar, - IN INT PartId, - IN HINSTANCE hInstance, - IN UINT uID, - ...); - -BOOL StatusBarLoadString(IN HWND hStatusBar, - IN INT PartId, - IN HINSTANCE hInstance, - IN UINT uID); - -INT GetTextFromEdit(OUT LPTSTR lpString, - IN HWND hDlg, - IN UINT Res); - -VOID GetError(DWORD err); - -BOOL ToolbarDeleteControlSpace(HWND hWndToolbar, - const TBBUTTON *ptbButton); - -typedef VOID (*ToolbarChangeControlCallback)(HWND hWndToolbar, - HWND hWndControl, - BOOL Vert); -VOID ToolbarUpdateControlSpaces(HWND hWndToolbar, - ToolbarChangeControlCallback ChangeCallback); - -BOOL ToolbarInsertSpaceForControl(HWND hWndToolbar, - HWND hWndControl, - INT Index, - INT iCmd, - BOOL HideVertical); - -HIMAGELIST InitImageList(UINT NumButtons, - UINT StartResource); +INT_PTR CALLBACK ImagePropDialogProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam); +INT_PTR CALLBACK BrightnessProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam); /* opensave.c */ VOID FileInitialize(HWND hwnd); Modified: trunk/reactos/base/applications/imagesoft/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/resource.h (original) +++ trunk/reactos/base/applications/imagesoft/resource.h Wed Nov 15 02:15:02 2006 @@ -78,7 +78,10 @@ #define ID_TEXT 2068 #define ID_ZOOM 2069 -#define ID_ABOUT 2100 +/* Adjust */ +#define ID_BRIGHTNESS 2100 + +#define ID_ABOUT 2400 #define ID_REFRESH 3000 #define ID_HELP 3001 @@ -240,6 +243,17 @@ /* DIALOGS */ +#define IDC_PICPREVIEW 2999 + +/* brightness dialog */ +#define IDD_BRIGHTNESS 3000 +#define IDC_BRI_GROUP 3001 +#define IDC_BRI_FULL 3002 +#define IDC_BRI_RED 3003 +#define IDC_BRI_GREEN 3004 +#define IDC_BRI_BLUE 3005 +#define IDC_BRI_EDIT 3006 +#define IDC_BRI_TRACKBAR 3007 /* image property dialog */ #define IDD_IMAGE_PROP 4000 Added: trunk/reactos/base/applications/imagesoft/tooldock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/tooldock.h (added) +++ trunk/reactos/base/applications/imagesoft/tooldock.h Wed Nov 15 02:15:02 2006 @@ -1,0 +1,115 @@ + +typedef enum +{ + TOP_DOCK = 0, + LEFT_DOCK, + RIGHT_DOCK, + BOTTOM_DOCK, + NO_DOCK +} DOCK_POSITION; + +typedef struct _DOCKBAR +{ + UINT BarId; + LPCTSTR lpName; + UINT DisplayTextId; + DOCK_POSITION Position; +} DOCKBAR, *PDOCKBAR; + +struct _TOOLBAR_DOCKS; + +typedef BOOL (CALLBACK *PDOCKBAR_CREATECLIENT)(struct _TOOLBAR_DOCKS *TbDocks, + const DOCKBAR *Dockbar, + PVOID Context, + HWND hParent, + HWND *hwnd); +typedef BOOL (CALLBACK *PDOCKBAR_DESTROYCLIENT)(struct _TOOLBAR_DOCKS *TbDocks, + const DOCKBAR *Dockbar, + PVOID Context, + HWND hwnd); +typedef BOOL (CALLBACK *PDOCKBAR_INSERTBAND)(struct _TOOLBAR_DOCKS *TbDocks, + const DOCKBAR *Dockbar, + PVOID Context, + UINT *Index, + LPREBARBANDINFO rbi); +typedef VOID (CALLBACK *PDOCKBAR_DOCKBAND)(struct _TOOLBAR_DOCKS *TbDocks, + const DOCKBAR *Dockbar, + PVOID Context, + DOCK_POSITION DockFrom, + DOCK_POSITION DockTo, + LPREBARBANDINFO rbi); +typedef VOID (CALLBACK *PDOCKBAR_CHEVRONPUSHED)(struct _TOOLBAR_DOCKS *TbDocks, + const DOCKBAR *Dockbar, + PVOID Context, + HWND hwndChild, + LPNMREBARCHEVRON lpnm); + +typedef struct _DOCKBAR_ITEM_CALLBACKS +{ + PDOCKBAR_CREATECLIENT CreateClient; + PDOCKBAR_DESTROYCLIENT DestroyClient; + PDOCKBAR_INSERTBAND InsertBand; + PDOCKBAR_DOCKBAND DockBand; + PDOCKBAR_CHEVRONPUSHED ChevronPushed; +} DOCKBAR_ITEM_CALLBACKS, *PDOCKBAR_ITEM_CALLBACKS; + +typedef struct _DOCKBAR_ITEM +{ + struct _DOCKBAR_ITEM *Next; + DOCKBAR DockBar; + PVOID Context; + HWND hWndTool; + HWND hWndClient; + DOCK_POSITION PrevDock; + UINT PrevBandIndex; + const DOCKBAR_ITEM_CALLBACKS *Callbacks; +} DOCKBAR_ITEM, *PDOCKBAR_ITEM; + +typedef VOID (CALLBACK *PDOCKBAR_PARENTRESIZE)(PVOID Context, + WORD cx, + WORD cy); + +#define DOCKS_COUNT 4 +typedef struct _TOOLBAR_DOCKS +{ + HWND hParent; + PVOID Context; + HWND hRebar[DOCKS_COUNT]; + RECT rcRebar[DOCKS_COUNT]; + RECT rcClient; + PDOCKBAR_ITEM Items; + PDOCKBAR_PARENTRESIZE ParentResize; + PDOCKBAR_ITEM Dragging; + UINT DraggingBandId; + TCHAR szTempText[255]; +} TOOLBAR_DOCKS, *PTOOLBAR_DOCKS; + +VOID TbdInitializeDocks(PTOOLBAR_DOCKS TbDocks, + HWND hWndParent, + PVOID Context, + PDOCKBAR_PARENTRESIZE ParentResizeProc); +INT TbdAdjustUpdateClientRect(PTOOLBAR_DOCKS TbDocks, + PRECT rcClient); +HDWP TbdDeferDocks(HDWP hWinPosInfo, + PTOOLBAR_DOCKS TbDocks); +BOOL TbdAddToolbar(PTOOLBAR_DOCKS TbDocks, + const DOCKBAR *Dockbar, + PVOID Context, + const DOCKBAR_ITEM_CALLBACKS *DockbarCallbacks); +BOOL TbdDockBarIdFromClientWindow(PTOOLBAR_DOCKS TbDocks, + HWND hWndClient, + UINT *Id); +BOOL TbdHandleNotifications(PTOOLBAR_DOCKS TbDocks, + LPNMHDR pnmh, + LRESULT *Result); +VOID TbdHandleEnabling(PTOOLBAR_DOCKS TbDocks, + HWND hWnd, + BOOL Enable); +VOID TbdHandleActivation(PTOOLBAR_DOCKS TbDocks, + HWND hWnd, + WPARAM *wParam, + LPARAM *lParam); +VOID TbdShowFloatingToolbars(PTOOLBAR_DOCKS TbDocks, + BOOL Show); +BOOL TbdInitImpl(VOID); +VOID TbdUninitImpl(VOID);

1 0

[ion] 24760: - Build fixes.
by ion＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: ion Date: Wed Nov 15 01:42:59 2006 New Revision: 24760 URL: http://svn.reactos.org/svn/reactos?rev=24760&view=rev Log: - Build fixes. Modified: trunk/reactos/hal/hal/hal.c trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=24760&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Wed Nov 15 01:42:59 2006 @@ -529,9 +529,8 @@ BOOLEAN NTAPI -HalStartNextProcessor( - ULONG Unknown1, - ULONG Unknown2) +HalStartNextProcessor(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PKPROCESSOR_STATE ProcessorState) { UNIMPLEMENTED; Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Wed Nov 15 01:42:59 2006 @@ -24,6 +24,7 @@ // #include <umtypes.h> #include <haltypes.h> +#include <ketypes.h> #ifndef NTOS_MODE_USER @@ -101,7 +102,7 @@ BOOLEAN NTAPI HalStartNextProcessor( - struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, IN PKPROCESSOR_STATE ProcessorState );

1 0

[ion] 24759: - Delete HAL cruft files. - Implement (or cleanup + mark as implemented, these are 4 line functions) HalDisplayString, HalAcquireDisplayOwnership, HalSetDisplayParameters, HalQueryDisplayParameters, HalInitailizeProcessor, HalAllProcessorsStarted, HalStartNextProcessor, HalProcessorIdle, HalRequestIpi. - Fix some prototype definitions and cleanup some formatting.
by ion＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: ion Date: Tue Nov 14 23:59:48 2006 New Revision: 24759 URL: http://svn.reactos.org/svn/reactos?rev=24759&view=rev Log: - Delete HAL cruft files. - Implement (or cleanup + mark as implemented, these are 4 line functions) HalDisplayString, HalAcquireDisplayOwnership, HalSetDisplayParameters, HalQueryDisplayParameters, HalInitailizeProcessor, HalAllProcessorsStarted, HalStartNextProcessor, HalProcessorIdle, HalRequestIpi. - Fix some prototype definitions and cleanup some formatting. Removed: trunk/reactos/hal/halx86/generic/enum.c trunk/reactos/hal/halx86/generic/ipi.c trunk/reactos/hal/halx86/generic/pwroff.c Modified: trunk/reactos/hal/halx86/generic/display.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/drive.c trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/hal/halx86/generic/sysinfo.c trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/hal/halx86/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/display… ============================================================================== --- trunk/reactos/hal/halx86/generic/display.c (original) +++ trunk/reactos/hal/halx86/generic/display.c Tue Nov 14 23:59:48 2006 @@ -1,20 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001, 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * PROJECT: ReactOS HA: + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/hal/halx86/generic/display.c + * PURPOSE: Screen Display Routines, now useless since NT 5.1+ + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ #include <hal.h> @@ -24,45 +13,52 @@ /* PUBLIC FUNCTIONS *********************************************************/ -VOID STDCALL +/* + * @implemented + */ +VOID +NTAPI HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) -/* - * FUNCTION: - * ARGUMENTS: - * ResetDisplayParameters = Pointer to a driver specific - * reset routine. - */ { + /* Stub since Windows XP implemented Inbv */ + return; } -VOID STDCALL -HalDisplayString( - IN PCH String) /* - * FUNCTION: Switches the screen to HAL console mode (BSOD) if not there - * already and displays a string - * ARGUMENT: - * string = ASCII string to display - * NOTE: Use with care because there is no support for returning from BSOD - * mode + * @implemented */ +VOID +NTAPI +HalDisplayString(IN PCH String) { - InbvDisplayString(String); + /* Call the Inbv driver */ + InbvDisplayString(String); } -VOID STDCALL +/* + * @implemented + */ +VOID +NTAPI HalQueryDisplayParameters(OUT PULONG DispSizeX, - OUT PULONG DispSizeY, - OUT PULONG CursorPosX, - OUT PULONG CursorPosY) + OUT PULONG DispSizeY, + OUT PULONG CursorPosX, + OUT PULONG CursorPosY) { + /* Stub since Windows XP implemented Inbv */ + return; } - -VOID STDCALL +/* + * @implemented + */ +VOID +NTAPI HalSetDisplayParameters(IN ULONG CursorPosX, - IN ULONG CursorPosY) + IN ULONG CursorPosY) { + /* Stub since Windows XP implemented Inbv */ + return; } /* EOF */ Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c (original) +++ trunk/reactos/hal/halx86/generic/dma.c Tue Nov 14 23:59:48 2006 @@ -440,7 +440,7 @@ ZwClose(Handle); - AdapterObject->DmaHeader.Version = DeviceDescription->Version; + AdapterObject->DmaHeader.Version = (USHORT)DeviceDescription->Version; AdapterObject->DmaHeader.Size = sizeof(ADAPTER_OBJECT); AdapterObject->DmaHeader.DmaOperations = &HalpDmaOperations; AdapterObject->MapRegistersPerChannel = 1; @@ -476,7 +476,7 @@ AdapterBaseVa = (PVOID)FIELD_OFFSET(EISA_CONTROL, DmaController2); AdapterObject->AdapterNumber = Controller; - AdapterObject->ChannelNumber = DeviceDescription->DmaChannel & 3; + AdapterObject->ChannelNumber = (UCHAR)(DeviceDescription->DmaChannel & 3); AdapterObject->PagePort = (PUCHAR)HalpEisaPortPage[DeviceDescription->DmaChannel]; AdapterObject->Width16Bits = FALSE; AdapterObject->AdapterBaseVa = AdapterBaseVa; Modified: trunk/reactos/hal/halx86/generic/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/drive.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/drive.c (original) +++ trunk/reactos/hal/halx86/generic/drive.c Tue Nov 14 23:59:48 2006 @@ -22,10 +22,10 @@ OUT PSTRING NtSystemPathString) { /* Call the kernel */ - return IoAssignDriveLetters(LoaderBlock, - NtDeviceName, - NtSystemPath, - NtSystemPathString); + IoAssignDriveLetters(LoaderBlock, + NtDeviceName, + NtSystemPath, + NtSystemPathString); } NTSTATUS Removed: trunk/reactos/hal/halx86/generic/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/enum.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/enum.c (original) +++ trunk/reactos/hal/halx86/generic/enum.c (removed) @@ -1,23 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/enum.c - * PURPOSE: Motherboard device enumerator - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * Created 01/05/2001 - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -VOID -HalpStartEnumerator (VOID) -{ -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Tue Nov 14 23:59:48 2006 @@ -8,7 +8,6 @@ <file>bus.c</file> <file>dma.c</file> <file>drive.c</file> - <file>enum.c</file> <file>fmutex.c</file> <file>halinit.c</file> <file>isa.c</file> @@ -30,7 +29,6 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <define name="__USE_W32API" /> - <file>ipi.c</file> <file>irql.c</file> <file>processor.c</file> <file>resource.c</file> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Tue Nov 14 23:59:48 2006 @@ -45,12 +45,9 @@ /* Initialize the clock interrupt */ //HalpInitPhase1(); - /* Initialize display and make the screen black */ + /* Initialize BUS handlers and DMA */ HalpInitBusHandlers(); HalpInitDma(); - - /* Enumerate the devices on the motherboard */ - HalpStartEnumerator(); } else if (BootPhase == 2) { Removed: trunk/reactos/hal/halx86/generic/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/ipi.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/ipi.c (original) +++ trunk/reactos/hal/halx86/generic/ipi.c (removed) @@ -1,24 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/generic/ipi.c - * PURPOSE: Miscellaneous hardware functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -VOID STDCALL -HalRequestIpi(ULONG ProcessorNo) -{ - DPRINT("HalRequestIpi(ProcessorNo %lu)\n", ProcessorNo); -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c (original) +++ trunk/reactos/hal/halx86/generic/processor.c Tue Nov 14 23:59:48 2006 @@ -20,6 +20,9 @@ /* FUNCTIONS *****************************************************************/ +/* + * @implemented + */ VOID NTAPI HalInitializeProcessor(IN ULONG ProcessorNumber, @@ -30,29 +33,49 @@ KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; } -BOOLEAN STDCALL -HalAllProcessorsStarted (VOID) +/* + * @implemented + */ +BOOLEAN +NTAPI +HalAllProcessorsStarted(VOID) { - DPRINT("HalAllProcessorsStarted()\n"); - - return TRUE; + /* Do nothing */ + return TRUE; } -BOOLEAN STDCALL -HalStartNextProcessor(ULONG Unknown1, - ULONG ProcessorStack) +/* + * @implemented + */ +BOOLEAN +NTAPI +HalStartNextProcessor(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PKPROCESSOR_STATE ProcessorState) { - DPRINT("HalStartNextProcessor(0x%lx 0x%lx)\n", Unknown1, ProcessorStack); - - return TRUE; + /* Ready to start */ + return FALSE; } +/* + * @implemented + */ VOID NTAPI HalProcessorIdle(VOID) { - Ki386EnableInterrupts(); + _enable(); Ki386HaltProcessor(); } +/* + * @implemented + */ +VOID +NTAPI +HalRequestIpi(ULONG Reserved) +{ + /* Not implemented on NT */ + __debugbreak(); +} + /* EOF */ Removed: trunk/reactos/hal/halx86/generic/pwroff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pwroff.… ============================================================================== --- trunk/reactos/hal/halx86/generic/pwroff.c (original) +++ trunk/reactos/hal/halx86/generic/pwroff.c (removed) @@ -1,121 +1,0 @@ -/* $Id$ - * - * FILE : reactos/hal/x86/apm.c - * DESCRIPTION: Turn CPU off... - * PROJECT : ReactOS Operating System - * AUTHOR : D. Lindauer (July 11 1997) - * NOTE : This program is public domain - * REVISIONS : - * 1999-12-26 - */ - -#define APM_FUNCTION_AVAILABLE 0x5300 -#define APM_FUNCTION_CONNREAL 0x5301 -#define APM_FUNCTION_POWEROFF 0x5307 -#define APM_FUNCTION_ENABLECPU 0x530d -#define APM_FUNCTION_ENABLEAPM 0x530e - -#define APM_DEVICE_BIOS 0 -#define APM_DEVICE_ALL 1 - -#define APM_MODE_DISABLE 0 -#define APM_MODE_ENABLE 1 - - - -#if defined(__GNUC__) - -nopm db 'No power management functionality',10,13,'$' -errmsg db 'Power management error',10,13,'$' -wrongver db 'Need APM version 1.1 or better',10,13,'$' -; -; Entry point -; -go: - mov dx,offset nopm - jc error - cmp ax,101h ; See if version 1.1 or greater - mov dx,offset wrongver - jc error - - mov [ver],ax - mov ax,5301h ; Do a real mode connection - mov bx,0 ; device = BIOS - int 15h - jnc noconerr - - cmp ah,2 ; Pass if already connected - mov dx,offset errmsg ; else error - jnz error -noconerr: - mov ax,530eh ; Enable latest version of APM - mov bx,0 ; device = BIOS - mov cx,[ver] ; version - int 15h - mov dx,offset errmsg - jc error - - mov ax,530dh ; Now engage and enable CPU management - mov bx,1 ; device = all - mov cx,1 ; enable - int 15h - mov dx,offset errmsg - jc error - - mov ax,530fh - mov bx,1 ; device = ALL - mov cx,1 ; enable - int 15h - mov dx,offset errmsg - jc error - - mov dx,offset errmsg -error: - call print - mov ax,4c01h - int 21h - int 3 - end start - - -BOOLEAN -ApmCall ( - DWORD Function, - DWORD Device, - DWORD Mode - ) -{ - /* AX <== Function */ - /* BX <== Device */ - /* CX <== Mode */ - __asm__("int 21\n"); /* 0x15 */ -} - -#elif defined(_MSC_VER) -#else -#error Unknown compiler for inline assembler -#endif - - -BOOLEAN -HalPowerOff (VOID) -{ - ApmCall ( - APM_FUNCTION_AVAILABLE, - APM_DEVICE_BIOS, - 0 - ); - ApmCall ( - APM_FUNCTION_ENABLEAPM, - ); - /* Shutdown CPU */ - ApmCall ( - APM_FUNCTION_POWEROFF, - APM_DEVICE_ALL, - 3 - ); - return TRUE; -} - - -/* EOF */ Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysinfo.c (original) +++ trunk/reactos/hal/halx86/generic/sysinfo.c Tue Nov 14 23:59:48 2006 @@ -1,12 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/sysinfo.c - * PURPOSE: Getting system information - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * UPDATE HISTORY: - * Created 22/05/98 - */ +* PROJECT: ReactOS HA: +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/hal/halx86/generic/sysinfo.c +* PURPOSE: HAL Information Routines +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ /* INCLUDES *****************************************************************/ @@ -14,61 +12,27 @@ #define NDEBUG #include <debug.h> +/* FUNCTIONS *****************************************************************/ - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS STDCALL +NTSTATUS +NTAPI HalpQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, - IN ULONG BufferSize, - IN OUT PVOID Buffer, - OUT PULONG ReturnedLength) + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength) { - ULONG DataLength; - NTSTATUS Status; - - DPRINT1("HalpQuerySystemInformation() called\n"); - - *ReturnedLength = 0; - - DataLength = 0; - - switch(InformationClass) - { -#if 0 - case HalInstalledBusInformation: - Status = HalpQueryBusInformation(BufferSize, - Buffer, - ReturnedLength); - break; -#endif - - default: - DataLength = 0; - Status = STATUS_INVALID_LEVEL; - break; - } - - if (DataLength != 0) - { - if (DataLength > BufferSize) - DataLength = BufferSize; - -// RtlCopyMemory(); - - *ReturnedLength = DataLength; - } - - return(Status); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } - -#if 0 NTSTATUS -HalpSetSystemInformation(VOID) +NTAPI +HalpSetSystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer) { - UNIMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } -#endif /* EOF */ Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Tue Nov 14 23:59:48 2006 @@ -96,6 +96,15 @@ ULONG BootPhase, struct _LOADER_PARAMETER_BLOCK *LoaderBlock ); + +NTHALAPI +BOOLEAN +NTAPI +HalStartNextProcessor( + struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN PKPROCESSOR_STATE ProcessorState +); + #endif NTHALAPI @@ -103,14 +112,6 @@ NTAPI HalReturnToFirmware( FIRMWARE_REENTRY Action -); - -NTHALAPI -BOOLEAN -NTAPI -HalStartNextProcessor( - ULONG Unknown1, - ULONG Unknown2 ); //

1 0

[hpoussin] 24758: Don't force screensaver file names to have at least 4 chars Terminate the string just after the last read character.
by hpoussin＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: hpoussin Date: Tue Nov 14 21:35:29 2006 New Revision: 24758 URL: http://svn.reactos.org/svn/reactos?rev=24758&view=rev Log: Don't force screensaver file names to have at least 4 chars Terminate the string just after the last read character. Modified: trunk/reactos/base/system/winlogon/screensaver.c Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c (original) +++ trunk/reactos/base/system/winlogon/screensaver.c Tue Nov 14 21:35:29 2006 @@ -262,7 +262,6 @@ if (rc != ERROR_SUCCESS) goto cleanup; - szApplicationName[bufferSize] = 0; /* Terminate the string */ rc = RegQueryValueExW( hKey, L"SCRNSAVE.EXE", @@ -272,9 +271,10 @@ &bufferSize); if (rc != ERROR_SUCCESS || dwType != REG_SZ) goto cleanup; - - if (bufferSize <=4) - goto cleanup; + + if (bufferSize == 0) + goto cleanup; + szApplicationName[bufferSize] = 0; /* Terminate the string */ wsprintfW(szCommandLine, L"%s /s", szApplicationName); TRACE("WL: Executing %S\n", szCommandLine);

1 0

[ion] 24757: - Implement HalSystemVectorDispatchEntry, KeFlushWriteBuffer, HalFlushCommonBuffer, HalAllocateCrashDumpRegisters. - Add lots of missing PCI definitions to the DDK, and to the internal file pci.h - Make HAL compilable with the WDK thanks to a nice hack/trick I found.
by ion＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: ion Date: Tue Nov 14 21:17:33 2006 New Revision: 24757 URL: http://svn.reactos.org/svn/reactos?rev=24757&view=rev Log: - Implement HalSystemVectorDispatchEntry, KeFlushWriteBuffer, HalFlushCommonBuffer, HalAllocateCrashDumpRegisters. - Add lots of missing PCI definitions to the DDK, and to the internal file pci.h - Make HAL compilable with the WDK thanks to a nice hack/trick I found. Added: trunk/reactos/ntoskrnl/include/internal/pci.h Modified: trunk/reactos/hal/halx86/generic/beep.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/include/hal.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/hal/halx86/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/beep.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/beep.c (original) +++ trunk/reactos/hal/halx86/generic/beep.c Tue Nov 14 21:17:33 2006 @@ -1,11 +1,11 @@ /* -* PROJECT: ReactOS HAL -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/hal/x86/beep.c -* PURPOSE: Speak support (beeping) -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -* Eric Kohl (ekohl(a)abo.rhein-zeitung.de) -*/ + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/hal/x86/beep.c + * PURPOSE: Speak support (beeping) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c (original) +++ trunk/reactos/hal/halx86/generic/dma.c Tue Nov 14 21:17:33 2006 @@ -1948,16 +1948,77 @@ * * @implemented */ - -BOOLEAN STDCALL -HalFlushCommonBuffer( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5) -{ - return TRUE; +BOOLEAN +NTAPI +HalFlushCommonBuffer(IN PADAPTER_OBJECT AdapterObject, + IN ULONG Length, + IN PHYSICAL_ADDRESS LogicalAddress, + IN PVOID VirtualAddress) +{ + /* Function always returns true */ + return TRUE; +} + +/* + * @implemented + */ +PVOID +NTAPI +HalAllocateCrashDumpRegisters(IN PADAPTER_OBJECT AdapterObject, + IN OUT PULONG NumberOfMapRegisters) +{ + PADAPTER_OBJECT MasterAdapter = AdapterObject->MasterAdapter; + ULONG MapRegisterNumber; + + /* Check if it needs map registers */ + if (AdapterObject->NeedsMapRegisters) + { + /* Check if we have enough */ + if (*NumberOfMapRegisters > AdapterObject->MapRegistersPerChannel) + { + /* We don't, fail */ + AdapterObject->NumberOfMapRegisters = 0; + return NULL; + } + + /* Try to find free map registers */ + MapRegisterNumber = -1; + MapRegisterNumber = RtlFindClearBitsAndSet(MasterAdapter->MapRegisters, + *NumberOfMapRegisters, + 0); + + /* Check if nothing was found */ + if (MapRegisterNumber == -1) + { + /* No free registers found, so use the base registers */ + RtlSetBits(MasterAdapter->MapRegisters, + 0, + *NumberOfMapRegisters); + MapRegisterNumber = 0; + } + + /* Calculate the new base */ + AdapterObject->MapRegisterBase = + (PROS_MAP_REGISTER_ENTRY)(MasterAdapter->MapRegisterBase + + MapRegisterNumber); + + /* Check if scatter gather isn't supported */ + if (!AdapterObject->ScatterGather) + { + /* Set the flag */ + AdapterObject->MapRegisterBase = + (PROS_MAP_REGISTER_ENTRY) + ((ULONG_PTR)AdapterObject->MapRegisterBase | MAP_BASE_SW_SG); + } + } + else + { + AdapterObject->MapRegisterBase = NULL; + AdapterObject->NumberOfMapRegisters = 0; + } + + /* Return the base */ + return AdapterObject->MapRegisterBase; } /* EOF */ Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c (original) +++ trunk/reactos/hal/halx86/generic/misc.c Tue Nov 14 21:17:33 2006 @@ -1,10 +1,10 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/misc.c - * PURPOSE: Miscellaneous hardware functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/hal/halx86/misc.c + * PURPOSE: Miscellanous Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) */ /* INCLUDES *****************************************************************/ @@ -13,53 +13,63 @@ #define NDEBUG #include <debug.h> - /* FUNCTIONS ****************************************************************/ -PVOID STDCALL -HalAllocateCrashDumpRegisters(IN PADAPTER_OBJECT AdapterObject, - IN OUT PULONG NumberOfMapRegisters) +/* + * @implemented + */ +VOID +NTAPI +HalHandleNMI(IN PVOID NmiInfo) { - UNIMPLEMENTED; - return NULL; + UCHAR ucStatus; + + /* Get the NMI Flag */ + ucStatus = READ_PORT_UCHAR((PUCHAR)0x61); + + /* Display NMI failure string */ + HalDisplayString ("\n*** Hardware Malfunction\n\n"); + HalDisplayString ("Call your hardware vendor for support\n\n"); + + /* Check for parity error */ + if (ucStatus & 0x80) + { + /* Display message */ + HalDisplayString ("NMI: Parity Check / Memory Parity Error\n"); + } + + /* Check for I/O failure */ + if (ucStatus & 0x40) + { + /* Display message */ + HalDisplayString ("NMI: Channel Check / IOCHK\n"); + } + + /* Halt the system */ + HalDisplayString("\n*** The system has halted ***\n"); + KeEnterKernelDebugger(); } - -VOID STDCALL -HalHandleNMI(PVOID NmiInfo) +/* + * @implemented + */ +BOOLEAN +FASTCALL +HalSystemVectorDispatchEntry(IN ULONG Vector, + OUT PKINTERRUPT_ROUTINE **FlatDispatch, + OUT PKINTERRUPT_ROUTINE *NoConnection) { - UCHAR ucStatus; - - ucStatus = READ_PORT_UCHAR((PUCHAR) 0x61); - - HalDisplayString ("\n*** Hardware Malfunction\n\n"); - HalDisplayString ("Call your hardware vendor for support\n\n"); - - if (ucStatus & 0x80) - HalDisplayString ("NMI: Parity Check / Memory Parity Error\n"); - - if (ucStatus & 0x40) - HalDisplayString ("NMI: Channel Check / IOCHK\n"); - - HalDisplayString ("\n*** The system has halted ***\n"); - KeEnterKernelDebugger (); + /* Not implemented on x86 */ + return FALSE; } -ULONG FASTCALL -HalSystemVectorDispatchEntry ( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3 - ) -{ - return 0; -} - - -VOID STDCALL +/* + * @implemented + */ +VOID +NTAPI KeFlushWriteBuffer(VOID) { - return; + /* Not implemented on x86 */ + return; } - -/* EOF */ Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h (original) +++ trunk/reactos/hal/halx86/include/hal.h Tue Nov 14 21:17:33 2006 @@ -11,9 +11,17 @@ /* C Headers */ #include <stdio.h> +/* WDK HAL Complation hack */ +#ifdef _MSC_VER +#include <excpt.h> +#include <ntdef.h> +#undef _NTHAL_ +#undef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT +#endif + /* IFS/DDK/NDK Headers */ #include <ntifs.h> -#include <ntddk.h> #include <ntdddisk.h> #include <arc/arc.h> #include <iotypes.h> @@ -25,6 +33,7 @@ #define KPCR_BASE 0xFF000000 // HACK! /* Internal HAL Headers */ +#include "internal/pci.h" #include "apic.h" #include "bus.h" #include "halirq.h" Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Tue Nov 14 21:17:33 2006 @@ -5240,6 +5240,47 @@ ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; +typedef VOID +(NTAPI *PciPin2Line)( + IN struct _BUS_HANDLER *BusHandler, + IN struct _BUS_HANDLER *RootHandler, + IN PCI_SLOT_NUMBER SlotNumber, + IN PPCI_COMMON_CONFIG PciData +); + +typedef VOID +(NTAPI *PciLine2Pin)( + IN struct _BUS_HANDLER *BusHandler, + IN struct _BUS_HANDLER *RootHandler, + IN PCI_SLOT_NUMBER SlotNumber, + IN PPCI_COMMON_CONFIG PciNewData, + IN PPCI_COMMON_CONFIG PciOldData +); + +typedef VOID +(NTAPI *PciReadWriteConfig)( + IN struct _BUS_HANDLER *BusHandler, + IN PCI_SLOT_NUMBER Slot, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length +); + +#define PCI_DATA_TAG TAG('P', 'C', 'I', ' ') +#define PCI_DATA_VERSION 1 + +typedef struct _PCIBUSDATA +{ + ULONG Tag; + ULONG Version; + PciReadWriteConfig ReadConfig; + PciReadWriteConfig WriteConfig; + PciPin2Line Pin2Line; + PciLine2Pin Line2Pin; + PCI_SLOT_NUMBER ParentSlot; + PVOID Reserved[4]; +} PCIBUSDATA, *PPCIBUSDATA; + NTHALAPI KIRQL DDKAPI Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Tue Nov 14 21:17:33 2006 @@ -26,6 +26,29 @@ #include <haltypes.h> #ifndef NTOS_MODE_USER + +// +// Private HAL Callbacks +// +#define HalHandlerForBus HALPRIVATEDISPATCH->HalHandlerForBus +#define HalHandlerForConfigSpace HALPRIVATEDISPATCH->HalHandlerForConfigSpace +#define HalLocateHiberRanges HALPRIVATEDISPATCH->HalLocateHiberRanges +#define HalRegisterBusHandler HALPRIVATEDISPATCH->HalRegisterBusHandler +#define HalSetWakeEnable HALPRIVATEDISPATCH->HalSetWakeEnable +#define HalSetWakeAlarm HALPRIVATEDISPATCH->HalSetWakeAlarm +#define HalPciTranslateBusAddress HALPRIVATEDISPATCH->HalPciTranslateBusAddress +#define HalPciAssignSlotResources HALPRIVATEDISPATCH->HalPciAssignSlotResources +#define HalHaltSystem HALPRIVATEDISPATCH->HalHaltSystem +#define HalFindBusAddressTranslation HALPRIVATEDISPATCH->HalFindBusAddressTranslation +#define HalResetDisplay HALPRIVATEDISPATCH->HalResetDisplay +#define HalAllocateMapRegisters HALPRIVATEDISPATCH->HalAllocateMapRegisters +#define KdSetupPciDeviceForDebugging HALPRIVATEDISPATCH->KdSetupPciDeviceForDebugging +#define KdReleasePciDeviceforDebugging HALPRIVATEDISPATCH->KdReleasePciDeviceforDebugging +#define KdGetAcpiTablePhase0 HALPRIVATEDISPATCH->KdGetAcpiTablePhase0 +#define KdCheckPowerButton HALPRIVATEDISPATCH->KdCheckPowerButton +#define HalVectorToIDTEntry HALPRIVATEDISPATCH->HalVectorToIDTEntry +#define KdMapPhysicalMemory64 HALPRIVATEDISPATCH->KdMapPhysicalMemory64 +#define KdUnmapVirtualAddress HALPRIVATEDISPATCH->KdUnmapVirtualAddress // // The DDK steals these away from you. Added: trunk/reactos/ntoskrnl/include/internal/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/pci.h (added) +++ trunk/reactos/ntoskrnl/include/internal/pci.h Tue Nov 14 21:17:33 2006 @@ -1,0 +1,94 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/include/hal.h + * PURPOSE: Internal header for PCI Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ +#ifndef _PCI_ +#define _PCI_ + +// +// PCI Type 1 Configuration Register +// +typedef struct _PCI_TYPE1_CFG_BITS +{ + union + { + struct + { + ULONG Reserved1:2; + ULONG RegisterNumber:6; + ULONG FunctionNumber:3; + ULONG DeviceNumber:5; + ULONG BusNumber:8; + ULONG Reserved2:7; + ULONG Enable:1; + } bits; + + ULONG AsULONG; + } u; +} PCI_TYPE1_CFG_BITS, *PPCI_TYPE1_CFG_BITS; + +// +// PCI Type 2 CSE Register +// +typedef struct _PCI_TYPE2_CSE_BITS +{ + union + { + struct + { + UCHAR Enable:1; + UCHAR FunctionNumber:3; + UCHAR Key:4; + } bits; + + UCHAR AsUCHAR; + } u; +} PCI_TYPE2_CSE_BITS, PPCI_TYPE2_CSE_BITS; + +// +// PCI Type 2 Address Register +// +typedef struct _PCI_TYPE2_ADDRESS_BITS +{ + union + { + struct + { + USHORT RegisterNumber:8; + USHORT Agent:4; + USHORT AddressBase:4; + } bits; + + USHORT AsUSHORT; + } u; +} PCI_TYPE2_ADDRESS_BITS, *PPCI_TYPE2_ADDRESS_BITS; + +// +// PCI Registry Information +// +typedef struct _PCI_REGISTRY_INFO +{ + UCHAR MajorRevision; + UCHAR MinorRevision; + UCHAR NoBuses; + UCHAR HardwareMechanism; +} PCI_REGISTRY_INFO, *PPCI_REGISTRY_INFO; + +// +// PCI Card Descriptor in Registry +// +typedef struct _PCI_CARD_DESCRIPTOR +{ + ULONG Flags; + USHORT VendorID; + USHORT DeviceID; + USHORT RevisionID; + USHORT SubsystemVendorID; + USHORT SubsystemID; + USHORT Reserved; +} PCI_CARD_DESCRIPTOR, *PPCI_CARD_DESCRIPTOR; + +#endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs