Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[navaraf] 16009: Be W32API friendly.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

Be W32API friendly. Modified: trunk/reactos/ntoskrnl/include/internal/debug.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/debug.h --- trunk/reactos/ntoskrnl/include/internal/debug.h 2005-06-17 18:02:31 UTC (rev 16008) +++ trunk/reactos/ntoskrnl/include/internal/debug.h 2005-06-17 19:27:49 UTC (rev 16009) @@ -33,6 +33,7 @@ #ifdef DBG +#ifndef __USE_W32API /* Assert only on "checked" version */ #ifndef NASSERT #ifdef CONFIG_SMP @@ -65,6 +66,7 @@ #define ASSERTMSG(_c_, _m_) #endif +#endif /* !__USE_W32API */ /* Print if using a "checked" version */ #ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ @@ -83,10 +85,12 @@ #define CPRINT(args...) #define DPRINT1(args...) +#ifndef __USE_W32API #define assert(x) #define ASSERT(x) #define assertmsg(_c_, _m_) #define ASSERTMSG(_c_, _m_) +#endif /* !__USE_W32API */ #endif /* DBG */

1 0

[ion] 16008: Add missing HAL types to DDK
by ion＠svn.reactos.com 17 Jun '05

17 Jun '05

Add missing HAL types to DDK Modified: trunk/reactos/include/ntos/haltypes.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ntos/haltypes.h --- trunk/reactos/include/ntos/haltypes.h 2005-06-17 17:59:11 UTC (rev 16007) +++ trunk/reactos/include/ntos/haltypes.h 2005-06-17 18:02:31 UTC (rev 16008) @@ -390,7 +390,6 @@ PTRANSLATE_RESOURCE_REQUIREMENTS_HANDLER TranslateResourceRequirements; } TRANSLATOR_INTERFACE, *PTRANSLATOR_INTERFACE; -#endif /* __USE_W32API */ /* Hal dispatch table */ @@ -425,7 +424,7 @@ typedef BOOLEAN STDCALL_FUNC (*PHAL_RESET_DISPLAY_PARAMETERS)(ULONG Columns, ULONG Rows); - +#endif /* __USE_W32API */ /* Control codes of HalDeviceControl function */ #define BCTL_EJECT 0x0001 #define BCTL_QUERY_DEVICE_ID 0x0002 @@ -449,7 +448,7 @@ BOOLEAN Removable; } BCTL_DEVICE_CAPABILITIES, *PBCTL_DEVICE_CAPABILITIES; - +#ifndef __USE_W32API typedef struct _DEVICE_CONTROL_CONTEXT { NTSTATUS Status; @@ -605,8 +604,6 @@ } HAL_DISPATCH, *PHAL_DISPATCH; -#ifndef __USE_W32API - #ifdef __NTOSKRNL__ extern HAL_DISPATCH EXPORTED HalDispatchTable; #else @@ -615,6 +612,7 @@ #endif /* !__USE_W32API */ +#ifndef __USE_W32API #ifdef __NTOSKRNL__ #define HALDISPATCH (&HalDispatchTable) #else @@ -645,8 +643,6 @@ ULONG Version; } HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; -#ifndef __USE_W32API - #ifdef __NTOSKRNL__ extern HAL_PRIVATE_DISPATCH EXPORTED HalPrivateDispatchTable; #else _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 17:59:11 UTC (rev 16007) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-17 18:02:31 UTC (rev 16008) @@ -168,6 +168,8 @@ typedef struct _COMPRESSED_DATA_INFO *PCOMPRESSED_DATA_INFO; typedef struct _HAL_DISPATCH_TABLE *PHAL_DISPATCH_TABLE; typedef struct _HAL_PRIVATE_DISPATCH_TABLE *PHAL_PRIVATE_DISPATCH_TABLE; +typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; +typedef struct _BUS_HANDLER *PBUS_HANDLER; typedef struct _DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION; typedef struct _DRIVE_LAYOUT_INFORMATION_EX *PDRIVE_LAYOUT_INFORMATION_EX; typedef struct _NAMED_PIPE_CREATE_PARAMETERS *PNAMED_PIPE_CREATE_PARAMETERS; @@ -329,7 +331,6 @@ extern NTOSAPI POBJECT_TYPE SeTokenObjectType; extern NTOSAPI CCHAR KeNumberProcessors; -extern NTOSAPI PHAL_DISPATCH_TABLE HalDispatchTable; extern NTOSAPI PHAL_PRIVATE_DISPATCH_TABLE HalPrivateDispatchTable; @@ -2080,6 +2081,69 @@ ULONG Flags; } ARBITER_INTERFACE, *PARBITER_INTERFACE; +typedef enum _HAL_QUERY_INFORMATION_CLASS { + HalInstalledBusInformation, + HalProfileSourceInformation, + HalInformationClassUnused1, + HalPowerInformation, + HalProcessorSpeedInformation, + HalCallbackInformation, + HalMapRegisterInformation, + HalMcaLogInformation, + HalFrameBufferCachingInformation, + HalDisplayBiosInformation, + HalProcessorFeatureInformation, + HalNumaTopologyInterface, + HalErrorInformation, + HalCmcLogInformation, + HalCpeLogInformation, + HalQueryMcaInterface, + HalQueryAMLIIllegalIOPortAddresses, + HalQueryMaxHotPlugMemoryAddress, + HalPartitionIpiInterface, + HalPlatformInformation, + HalQueryProfileSourceList +} HAL_QUERY_INFORMATION_CLASS, *PHAL_QUERY_INFORMATION_CLASS; + +typedef enum _HAL_SET_INFORMATION_CLASS { + HalProfileSourceInterval, + HalProfileSourceInterruptHandler, + HalMcaRegisterDriver, + HalKernelErrorHandler, + HalCmcRegisterDriver, + HalCpeRegisterDriver, + HalMcaLog, + HalCmcLog, + HalCpeLog, + HalGenerateCmcInterrupt +} HAL_SET_INFORMATION_CLASS, *PHAL_SET_INFORMATION_CLASS; + +/* Function Type Defintions for Dispatch Functions */ + +typedef +VOID +(*PDEVICE_CONTROL_COMPLETION)( + IN struct _DEVICE_CONTROL_CONTEXT *ControlContext + ); + +typedef struct _DEVICE_CONTROL_CONTEXT +{ + NTSTATUS Status; + PDEVICE_HANDLER_OBJECT DeviceHandler; + PDEVICE_OBJECT DeviceObject; + ULONG ControlCode; + PVOID Buffer; + PULONG BufferLength; + PVOID Context; +} DEVICE_CONTROL_CONTEXT, *PDEVICE_CONTROL_CONTEXT; + +typedef struct _PM_DISPATCH_TABLE +{ + ULONG Signature; + ULONG Version; + PVOID Function[1]; +} PM_DISPATCH_TABLE, *PPM_DISPATCH_TABLE; + typedef enum _RESOURCE_TRANSLATION_DIRECTION { TranslateChildToParent, TranslateParentToChild @@ -2113,6 +2177,145 @@ PTRANSLATE_RESOURCE_REQUIREMENTS_HANDLER TranslateResourceRequirements; } TRANSLATOR_INTERFACE, *PTRANSLATOR_INTERFACE; +typedef NTSTATUS STDCALL +(*pHalDeviceControl)(IN PDEVICE_HANDLER_OBJECT DeviceHandler, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN OUT PVOID Buffer OPTIONAL, + IN OUT PULONG BufferLength OPTIONAL, + IN PVOID Context, + IN PDEVICE_CONTROL_COMPLETION CompletionRoutine); + +typedef VOID FASTCALL +(*pHalExamineMBR)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MBRTypeIdentifier, + OUT PVOID *Buffer); + +typedef VOID FASTCALL +(*pHalIoAssignDriveLetters)(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + OUT PSTRING NtSystemPathString); + +typedef NTSTATUS FASTCALL +(*pHalIoReadPartitionTable)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); + +typedef NTSTATUS FASTCALL +(*pHalIoSetPartitionInformation)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType); + +typedef NTSTATUS FASTCALL +(*pHalIoWritePartitionTable)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); + +typedef PBUS_HANDLER FASTCALL +(*pHalHandlerForBus)(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber); + +typedef VOID FASTCALL +(*pHalReferenceBusHandler)(IN PBUS_HANDLER BusHandler); + +typedef NTSTATUS STDCALL +(*pHalQuerySystemInformation)(IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength); + + +typedef NTSTATUS STDCALL +(*pHalSetSystemInformation)(IN HAL_SET_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN PVOID Buffer); + + +typedef NTSTATUS STDCALL +(*pHalQueryBusSlots)(IN PBUS_HANDLER BusHandler, + IN ULONG BufferSize, + OUT PULONG SlotNumbers, + OUT PULONG ReturnedLength); + +typedef NTSTATUS STDCALL +(*pHalInitPnpDriver)(VOID); + +typedef NTSTATUS STDCALL +(*pHalInitPowerManagement)(IN PPM_DISPATCH_TABLE PmDriverDispatchTable, + OUT PPM_DISPATCH_TABLE *PmHalDispatchTable); + +typedef struct _DMA_ADAPTER * STDCALL +(*pHalGetDmaAdapter)(IN PVOID Context, + IN struct _DEVICE_DESCRIPTION *DeviceDescriptor, + OUT PULONG NumberOfMapRegisters); + +typedef NTSTATUS STDCALL +(*pHalGetInterruptTranslator)(IN INTERFACE_TYPE ParentInterfaceType, + IN ULONG ParentBusNumber, + IN INTERFACE_TYPE BridgeInterfaceType, + IN USHORT Size, + IN USHORT Version, + OUT PTRANSLATOR_INTERFACE Translator, + OUT PULONG BridgeBusNumber); + +typedef NTSTATUS STDCALL (*pHalStartMirroring)(VOID); + +typedef NTSTATUS STDCALL (*pHalEndMirroring)(IN ULONG PassNumber); + +typedef NTSTATUS STDCALL +(*pHalMirrorPhysicalMemory)(IN PHYSICAL_ADDRESS PhysicalAddress, + IN LARGE_INTEGER NumberOfBytes); + +typedef NTSTATUS STDCALL +(*pHalMirrorVerify)(IN PHYSICAL_ADDRESS PhysicalAddress, + IN LARGE_INTEGER NumberOfBytes); + +typedef VOID STDCALL +(*pHalEndOfBoot)(VOID); + +typedef BOOLEAN STDCALL +(*PHAL_RESET_DISPLAY_PARAMETERS)(ULONG Columns, ULONG Rows); + +typedef struct { + ULONG Version; + pHalQuerySystemInformation HalQuerySystemInformation; + pHalSetSystemInformation HalSetSystemInformation; + pHalQueryBusSlots HalQueryBusSlots; + ULONG Spare1; + pHalExamineMBR HalExamineMBR; + pHalIoAssignDriveLetters HalIoAssignDriveLetters; + pHalIoReadPartitionTable HalIoReadPartitionTable; + pHalIoSetPartitionInformation HalIoSetPartitionInformation; + pHalIoWritePartitionTable HalIoWritePartitionTable; + + pHalHandlerForBus HalReferenceHandlerForBus; + pHalReferenceBusHandler HalReferenceBusHandler; + pHalReferenceBusHandler HalDereferenceBusHandler; + + pHalInitPnpDriver HalInitPnpDriver; + pHalInitPowerManagement HalInitPowerManagement; + + pHalGetDmaAdapter HalGetDmaAdapter; + pHalGetInterruptTranslator HalGetInterruptTranslator; + + pHalStartMirroring HalStartMirroring; + pHalEndMirroring HalEndMirroring; + pHalMirrorPhysicalMemory HalMirrorPhysicalMemory; + pHalEndOfBoot HalEndOfBoot; + pHalMirrorVerify HalMirrorVerify; + +} HAL_DISPATCH, *PHAL_DISPATCH; + + +extern HAL_DISPATCH HalDispatchTable; +#define HALDISPATCH HalDispatchTable + typedef enum _FILE_INFORMATION_CLASS { FileDirectoryInformation = 1, FileFullDirectoryInformation,

1 0

[ion] 16007: Oops. Thanks w3seek
by ion＠svn.reactos.com 17 Jun '05

17 Jun '05

Oops. Thanks w3seek Modified: trunk/reactos/include/ntdll/ntdll.h _____ Modified: trunk/reactos/include/ntdll/ntdll.h --- trunk/reactos/include/ntdll/ntdll.h 2005-06-17 17:44:39 UTC (rev 16006) +++ trunk/reactos/include/ntdll/ntdll.h 2005-06-17 17:59:11 UTC (rev 16007) @@ -41,6 +41,17 @@ #define CHECKPOINT1(args...) #endif +/* Macros expanding to the appropriate inline assembly to raise a breakpoint */ +#if defined(_M_IX86) +#define ASM_BREAKPOINT "\nint $3\n" +#elif defined(_M_ALPHA) +#define ASM_BREAKPOINT "\ncall_pal bpt\n" +#elif defined(_M_MIPS) +#define ASM_BREAKPOINT "\nbreak\n" +#else +#error Unsupported architecture. +#endif + #define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) #define ROUNDDOWN(a,b) (((a)/(b))*(b))

1 0

[navaraf] 16006: - Comment out the call to SHObjectProperties. The one who added it must have been complete freak since the parameters were completely wrong. Don't let me do "svn log" ...
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

- Comment out the call to SHObjectProperties. The one who added it must have been complete freak since the parameters were completely wrong. Don't let me do "svn log" ... - Remove duplicate definition from version.h. Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c Modified: trunk/reactos/lib/shell32/version.h _____ Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c --- trunk/reactos/lib/shell32/shv_item_cmenu.c 2005-06-17 17:37:54 UTC (rev 16005) +++ trunk/reactos/lib/shell32/shv_item_cmenu.c 2005-06-17 17:44:39 UTC (rev 16006) @@ -441,7 +441,11 @@ case FCIDM_SHVIEW_PROPERTIES: TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n"); /* Open the property sheet page */ - SHObjectProperties(NULL, TEXT("SHOP_FILEPATH"), lpcmi->hwnd, NULL); + /* + * FIXME: This just can't work ... the one who added it must + * have been mad. - FiN, 17/06/2005 + * SHObjectProperties(lpcmi->hwnd, SHOP_FILEPATH, NULL, NULL); + */ break; default: FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); _____ Modified: trunk/reactos/lib/shell32/version.h --- trunk/reactos/lib/shell32/version.h 2005-06-17 17:37:54 UTC (rev 16005) +++ trunk/reactos/lib/shell32/version.h 2005-06-17 17:44:39 UTC (rev 16006) @@ -22,7 +22,3 @@ #define WINE_FILEVERSION_MINOR 0 #define WINE_FILEVERSION_BUILD 3900 #define WINE_FILEVERSION_PLATFORMID 6975 - -/* FIXME: when libs/wpp gets fixed to support concatenation we can remove - * this and define it in version.rc */ -#define WINE_FILEVERSION "5.0.3900.6975"

1 0

[navaraf] 16005: - Define SHOP_PRINTERNAME, SHOP_FILEPATH and SHOP_VOLUMEGUID.
by navaraf＠svn.reactos.com 17 Jun '05

17 Jun '05

- Define SHOP_PRINTERNAME, SHOP_FILEPATH and SHOP_VOLUMEGUID. - Declare SHObjectProperties. Modified: trunk/reactos/w32api/include/shlobj.h _____ Modified: trunk/reactos/w32api/include/shlobj.h --- trunk/reactos/w32api/include/shlobj.h 2005-06-17 17:33:47 UTC (rev 16004) +++ trunk/reactos/w32api/include/shlobj.h 2005-06-17 17:37:54 UTC (rev 16005) @@ -402,6 +402,9 @@ #define EXP_DARWIN_ID_SIG 0xa0000006 #define EXP_LOGO3_ID_SIG 0xa0000007 #define EXP_SZ_ICON_SIG 0xa0000007 +#define SHOP_PRINTERNAME 0x01 +#define SHOP_FILEPATH 0x02 +#define SHOP_VOLUMEGUID 0x04 typedef ULONG SFGAOF; typedef DWORD SHGDNF; @@ -1753,6 +1756,7 @@ void WINAPI ILFree(LPITEMIDLIST); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,REFCLSID,IUnknown*,REFIID,void**); +BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR); #endif int WINAPI RestartDialog(HWND,LPCWSTR,DWORD);

1 0

[blight] 16004: longjmp() should return 1 if 0 is passed as return value (0 should only be returned by setjmp)
by blight＠svn.reactos.com 17 Jun '05

17 Jun '05

longjmp() should return 1 if 0 is passed as return value (0 should only be returned by setjmp) Modified: trunk/reactos/lib/freetype/i386/setjmplongjmp.s _____ Modified: trunk/reactos/lib/freetype/i386/setjmplongjmp.s --- trunk/reactos/lib/freetype/i386/setjmplongjmp.s 2005-06-17 17:27:03 UTC (rev 16003) +++ trunk/reactos/lib/freetype/i386/setjmplongjmp.s 2005-06-17 17:33:47 UTC (rev 16004) @@ -75,6 +75,10 @@ movl JMPBUF(%esp), %ecx /* User's jmp_buf in %ecx. */ movl VAL(%esp), %eax /* Second argument is return value. */ + testl %eax, %eax + jnz 0f + incl %eax +0: /* Save the return address now. */ movl (JB_PC*4)(%ecx), %edx /* Restore registers. */

1 0

[blight] 16003: Fix another broken setjmp.
by blight＠svn.reactos.com 17 Jun '05

17 Jun '05

Fix another broken setjmp. Modified: trunk/reactos/lib/kjs/ksrc/setjmp.S _____ Modified: trunk/reactos/lib/kjs/ksrc/setjmp.S --- trunk/reactos/lib/kjs/ksrc/setjmp.S 2005-06-17 17:25:02 UTC (rev 16002) +++ trunk/reactos/lib/kjs/ksrc/setjmp.S 2005-06-17 17:27:03 UTC (rev 16003) @@ -55,5 +55,5 @@ xorl %eax,%eax /* return 0 the first time */ leave - ret $4 + ret

1 0

[blight] 16002: Fix setjmp (didn't save correct ESP, so it crashed after longjmp).
by blight＠svn.reactos.com 17 Jun '05

17 Jun '05

Fix setjmp (didn't save correct ESP, so it crashed after longjmp). Fix the kernel debugger. Modified: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S Modified: trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S --- trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S 2005-06-17 17:22:57 UTC (rev 16001) +++ trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S 2005-06-17 17:25:02 UTC (rev 16002) @@ -8,15 +8,17 @@ /* * Set up a trap frame */ - /* Ss - space already reserved by return EIP */ - pushl %esp /* Esp */ pushfl /* Eflags */ pushl %cs /* Cs */ - pushl 12(%esp) /* Eip */ - movl %ss, 16(%esp) /* Save Ss */ pushl $0 /* ErrorCode */ pushl %ebp /* Ebp */ pushl %ebx /* Ebx */ + movl 20(%esp), %ebp /* Eip */ + movl 16(%esp), %ebx /* Eflags */ + movl %ebx, 20(%esp) + movl 12(%esp), %ebx /* Cs */ + movl %ebx, 16(%esp) + movl %ebp, 12(%esp) pushl %esi /* Esi */ pushl %edi /* Edi */ pushl %fs /* Fs */ @@ -43,8 +45,9 @@ pushl %eax /* Dr1 */ movl %dr0, %eax pushl %eax /* Dr0 */ - pushl $0 /* TempEip */ - pushl $0 /* TempCs */ + leal 0x58(%esp), %eax + pushl %eax /* TempEsp */ + pushl %ss /* TempSegSs */ pushl $0 /* DebugPointer */ pushl $3 /* DebugArgMark (Exception number) */ pushl 0x60(%esp) /* DebugEip */ @@ -67,8 +70,8 @@ * DebugEip * DebugArgMark * DebugPointer - * TempCs - * TempEip + * TempSegSs + * TempEsp */ addl $(11*4), %esp @@ -98,23 +101,13 @@ popl %edx /* Edx */ popl %ecx /* Ecx */ popl %eax /* Eax */ - addl $4, %esp /* PreviousMode */ - addl $4, %esp /* ExceptionList */ + addl $8, %esp /* PreviousMode, ExceptionList */ popl %fs /* Fs */ popl %edi /* Edi */ popl %esi /* Esi */ popl %ebx /* Ebx */ - - /* Remove SS:ESP from the stack */ - movl 16(%esp), %ebp - movl %ebp, 24(%esp) - movl 12(%esp), %ebp - movl %ebp, 20(%esp) - movl 8(%esp), %ebp - movl %ebp, 16(%esp) - popl %ebp /* Ebp */ - addl $12, %esp /* ErrorCode and SS:ESP */ + addl $4, %esp /* ErrorCode */ /* * Return to the caller. _____ Modified: trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S --- trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S 2005-06-17 17:22:57 UTC (rev 16001) +++ trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S 2005-06-17 17:25:02 UTC (rev 16002) @@ -38,7 +38,9 @@ * return PC */ .globl _setjmp +.globl __setjmp _setjmp: +__setjmp: pushl %ebp movl %esp,%ebp @@ -55,5 +57,5 @@ xorl %eax,%eax /* return 0 the first time */ leave - ret $4 + ret _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c --- trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-06-17 17:22:57 UTC (rev 16001) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-06-17 17:25:02 UTC (rev 16002) @@ -6,7 +6,7 @@ * * PROGRAMMERS: Gregor Anich */ - + /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> @@ -106,6 +106,65 @@ /* FUNCTIONS *****************************************************************/ +STATIC VOID +KdbpTrapFrameToKdbTrapFrame(PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFrame) +{ + /* Copy the TrapFrame only up to Eflags and zero the rest*/ + RtlCopyMemory(&KdbTrapFrame->Tf, TrapFrame, FIELD_OFFSET(KTRAP_FRAME, Esp)); + RtlZeroMemory((PVOID)((ULONG_PTR)&KdbTrapFrame->Tf + FIELD_OFFSET(KTRAP_FRAME, Esp)), + sizeof (KTRAP_FRAME) - FIELD_OFFSET(KTRAP_FRAME, Esp)); + asm volatile( + "movl %%cr0, %0" "\n\t" + "movl %%cr2, %1" "\n\t" + "movl %%cr3, %2" "\n\t" + "movl %%cr4, %3" "\n\t" + : "=r"(KdbTrapFrame->Cr0), "=r"(KdbTrapFrame->Cr2), + "=r"(KdbTrapFrame->Cr3), "=r"(KdbTrapFrame->Cr4)); + + if (TrapFrame->PreviousMode == KernelMode) + { + /* If the trapframe is a kmode one use the temp ss:esp */ + KdbTrapFrame->Tf.Esp = (ULONG)TrapFrame->TempEsp; + KdbTrapFrame->Tf.Ss = (USHORT)((ULONG)TrapFrame->TempSegSs & 0xFFFF); + } + else + { + /* Otherwise use ss:esp pushed by the CPU */ + /* FIXME: maybe change all trapframes to always put ss:esp into tempss:tempesp so we + * can handle umode and kmode the same way */ + KdbTrapFrame->Tf.Esp = TrapFrame->Esp; + KdbTrapFrame->Tf.Ss = TrapFrame->Ss; + } + + /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ +} + +STATIC VOID +KdbpKdbTrapFrameToTrapFrame(PKDB_KTRAP_FRAME KdbTrapFrame, PKTRAP_FRAME TrapFrame) +{ + /* Copy the TrapFrame only up to Eflags and zero the rest*/ + RtlCopyMemory(TrapFrame, &KdbTrapFrame->Tf, FIELD_OFFSET(KTRAP_FRAME, Esp)); + + /* FIXME: write cr0, cr2, cr3 and cr4 (not needed atm) */ + + if (TrapFrame->PreviousMode == KernelMode) + { + /* If the trapframe is a kmode one write to the temp ss:esp */ + TrapFrame->TempEsp = (PVOID)KdbTrapFrame->Tf.Esp; + TrapFrame->TempSegSs = (PVOID)(((ULONG)TrapFrame->TempSegSs & ~0xffff) | KdbTrapFrame->Tf.Ss); + } + else + { + /* Otherwise write to ss:esp pushed by the CPU */ + /* FIXME: maybe change all trap-epilogs to always put temp ss:esp into ss:esp so we + * can handle umode and kmode the same way */ + TrapFrame->Esp = KdbTrapFrame->Tf.Esp; + TrapFrame->Ss = KdbTrapFrame->Tf.Ss; + } + + /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ +} + /*!\brief Overwrites the instruction at \a Address with \a NewInst and stores * the old instruction in *OldInst. * @@ -981,7 +1040,7 @@ if (KdbCurrentThread != KdbOriginalThread) { ASSERT(KdbCurrentTrapFrame == &KdbThreadTrapFrame); - RtlCopyMemory(KdbCurrentThread->Tcb.TrapFrame, &KdbCurrentTrapFrame->Tf, sizeof (KTRAP_FRAME)); + KdbpKdbTrapFrameToTrapFrame(KdbCurrentTrapFrame, KdbCurrentThread->Tcb.TrapFrame); } else { @@ -991,15 +1050,12 @@ /* Switch to the thread's context */ if (Thread != KdbOriginalThread) { - ASSERT(Thread->Tcb.TrapFrame != NULL); - RtlCopyMemory(&KdbThreadTrapFrame.Tf, Thread->Tcb.TrapFrame, sizeof (KTRAP_FRAME)); - asm volatile( - "movl %%cr0, %0" "\n\t" - "movl %%cr2, %1" "\n\t" - "movl %%cr3, %2" "\n\t" - "movl %%cr4, %3" "\n\t" - : "=r"(KdbTrapFrame.Cr0), "=r"(KdbTrapFrame.Cr2), - "=r"(KdbTrapFrame.Cr3), "=r"(KdbTrapFrame.Cr4)); + if (Thread->Tcb.TrapFrame == NULL) + { + KdbpPrint("Threads TrapFrame is NULL! Cannot attach.\n"); + return FALSE; + } + KdbpTrapFrameToKdbTrapFrame(Thread->Tcb.TrapFrame, &KdbThreadTrapFrame); KdbCurrentTrapFrame = &KdbThreadTrapFrame; } else /* Switching back to original thread */ @@ -1243,14 +1299,7 @@ if (BreakPoint->Condition != NULL) { /* Setup the KDB trap frame */ - RtlCopyMemory(&KdbTrapFrame.Tf, TrapFrame, sizeof (KTRAP_FRAME)); - asm volatile( - "movl %%cr0, %0" "\n\t" - "movl %%cr2, %1" "\n\t" - "movl %%cr3, %2" "\n\t" - "movl %%cr4, %3" "\n\t" - : "=r"(KdbTrapFrame.Cr0), "=r"(KdbTrapFrame.Cr2), - "=r"(KdbTrapFrame.Cr3), "=r"(KdbTrapFrame.Cr4)); + KdbpTrapFrameToKdbTrapFrame(TrapFrame, &KdbTrapFrame); ull = 0; if (!KdbpRpnEvaluateParsedExpression(BreakPoint->Condition, &KdbTrapFrame, &ull, NULL, NULL)) @@ -1395,14 +1444,7 @@ KdbCurrentTrapFrame = &KdbTrapFrame; /* Setup the KDB trap frame */ - RtlCopyMemory(&KdbTrapFrame.Tf, TrapFrame, sizeof(KTRAP_FRAME)); - asm volatile( - "movl %%cr0, %0" "\n\t" - "movl %%cr2, %1" "\n\t" - "movl %%cr3, %2" "\n\t" - "movl %%cr4, %3" "\n\t" - : "=r"(KdbTrapFrame.Cr0), "=r"(KdbTrapFrame.Cr2), - "=r"(KdbTrapFrame.Cr3), "=r"(KdbTrapFrame.Cr4)); + KdbpTrapFrameToKdbTrapFrame(TrapFrame, &KdbTrapFrame); /* Enter critical section */ Ke386SaveFlags(OldEflags); @@ -1436,7 +1478,7 @@ /* Save the current thread's trapframe */ if (KdbCurrentTrapFrame == &KdbThreadTrapFrame) { - RtlCopyMemory(KdbCurrentThread->Tcb.TrapFrame, KdbCurrentTrapFrame, sizeof (KTRAP_FRAME)); + KdbpKdbTrapFrameToTrapFrame(KdbCurrentTrapFrame, KdbCurrentThread->Tcb.TrapFrame); } /* Detach from attached process */ @@ -1446,16 +1488,7 @@ } /* Update the exception TrapFrame */ - RtlCopyMemory(TrapFrame, &KdbTrapFrame.Tf, sizeof(KTRAP_FRAME)); -#if 0 - asm volatile( - "movl %0, %%cr0" "\n\t" - "movl %1, %%cr2" "\n\t" - "movl %2, %%cr3" "\n\t" - "movl %3, %%cr4" "\n\t" - : : "r"(KdbTrapFrame.Cr0), "r"(KdbTrapFrame.Cr2), - "r"(KdbTrapFrame.Cr3), "r"(KdbTrapFrame.Cr4)); -#endif + KdbpKdbTrapFrameToTrapFrame(&KdbTrapFrame, TrapFrame); /* Decrement the entry count */ InterlockedDecrement(&KdbEntryCount); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-06-17 17:22:57 UTC (rev 16001) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-06-17 17:25:02 UTC (rev 16002) @@ -116,7 +116,7 @@ .globl @KiSwapContextInternal@0 @KiSwapContextInternal@0: #ifdef KDBG - //jmp SaveTrapFrameForKDB + jmp SaveTrapFrameForKDB SaveTrapFrameForKDB_Return: #endif @@ -298,32 +298,55 @@ SaveTrapFrameForKDB: /* Set up a trap frame */ - - /* Fake Interrupt Stack */ - push esp // 0x74 pushf // 0x70 push cs // 0x6C - push [esp+12] /* EIP */ // 0x68 - mov [esp+16], ss // 0x78 - - /* Trap Frame */ - push 0 /* Error Code */ // 0x64 + push 0 /* Error Code */ // 0x64 push ebp // 0x60 push ebx + + /* Fake Interrupt Stack */ + mov ebp, [esp+20] /* Eip */ + mov ebx, [esp+16] /* Eflags */ + mov [esp+20], ebx + mov ebx, [esp+12] /* Cs */ + mov [esp+16], ebx + mov [esp+12], ebp + push esi push edi push fs - push -1 /* Exception List */ // 0x4C - push 0 /* Previous Mode */ // 0x48 + push -1 /* Exception List */ // 0x4C + push 0 /* Previous Mode */ // 0x48 push eax push ecx push edx push ds push es push gs // 0x30 - sub esp, 0x28 /* Debug Registers */ // 0x8 - push [esp+60] /* Debug EIP */ // 0x4 - push ebp /* Debug EBP */ // 0x0 + + mov eax, dr7 + push eax /* Dr7 */ + /* Clear breakpoint enables in dr7. */ + and eax, 0xffff0000 + mov dr7, eax + mov eax, dr6 + push eax /* Dr6 */ + mov eax, dr3 + push eax /* Dr3 */ + mov eax, dr2 + push eax /* Dr2 */ + mov eax, dr1 + push eax /* Dr1 */ + mov eax, dr0 + push eax /* Dr0 */ + + lea eax, [esp+0x58] + push eax /* TempEsp */ + push ss /* TempSegSs */ + push 0 /* DebugPointer */ + push -1 /* DebugArgMark */ + push [esp+60] /* Debug EIP */ // 0x4 + push ebp /* Debug EBP */ // 0x0 /* Set Stack */ mov ebp, esp @@ -334,19 +357,21 @@ /* Save new one */ mov [edi+KTHREAD_TRAP_FRAME], ebp + /* Restore EBP, EBX and EAX */ + mov ebp, [ebp+KTRAP_FRAME_EBP] + mov ebx, [ebp+KTRAP_FRAME_EBX] + mov eax, [ebp+KTRAP_FRAME_EAX] + /* Return EIP */ push offset RestoreTrapFrameForKDB - /* Restore EBP */ - mov ebp, [ebp+KTRAP_FRAME_EBP] - /* Jump to normal code */ jmp SaveTrapFrameForKDB_Return RestoreTrapFrameForKDB: /* Restore the old trapframe */ - pop [edi+KTHREAD_TRAP_FRAME] + pop [esi+KTHREAD_TRAP_FRAME] /* Pop unused portions of the trap frame */ add esp, 0x30 @@ -358,23 +383,13 @@ pop edx pop ecx pop eax - add esp, 8 + add esp, 8 /* ExceptionList and PreviousMode */ pop fs pop edi pop esi pop ebx - - /* Remove SS:ESP from the stack */ - mov ebp, [esp+16] - mov [esp+24], ebp - mov ebp, [esp+12] - mov [esp+20], ebp - mov ebp, [esp+8] - mov [esp+16], ebp - - /* Restore Fake INT Stack */ pop ebp - add esp, 12 + add esp, 4 /* ErrorCode */ /* Return to the caller. */ iret

1 0

[hpoussin] 16001: Implement IRP_MN_QUERY_CAPABILITIES, IRP_MN_QUERY_RESOURCES, IRP_MN_QUERY_RESOURCE_REQUIREMENTS
by hpoussin＠svn.reactos.com 17 Jun '05

17 Jun '05

Implement IRP_MN_QUERY_CAPABILITIES, IRP_MN_QUERY_RESOURCES, IRP_MN_QUERY_RESOURCE_REQUIREMENTS Modified: trunk/reactos/drivers/usb/cromwell/uhci/pdo.c _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/pdo.c --- trunk/reactos/drivers/usb/cromwell/uhci/pdo.c 2005-06-17 17:22:44 UTC (rev 16000) +++ trunk/reactos/drivers/usb/cromwell/uhci/pdo.c 2005-06-17 17:22:57 UTC (rev 16001) @@ -168,10 +168,114 @@ { case IRP_MN_START_DEVICE: /* 0x00 */ { - DPRINT("UHCI: IRP_MJ_PNP/IRP_MN_START_DEVICE\n"); + DPRINT("UHCI: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); Status = UhciPnpStartDevice(DeviceObject); break; } + case IRP_MN_QUERY_CAPABILITIES: /* 0x09 */ + { + PDEVICE_CAPABILITIES DeviceCapabilities; + ULONG i; + DPRINT("UHCI: IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + + DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; + /* FIXME: capabilities can change with connected device */ + DeviceCapabilities->LockSupported = FALSE; + DeviceCapabilities->EjectSupported = FALSE; + DeviceCapabilities->Removable = TRUE; + DeviceCapabilities->DockDevice = FALSE; + DeviceCapabilities->UniqueID = FALSE; + DeviceCapabilities->SilentInstall = FALSE; + DeviceCapabilities->RawDeviceOK = TRUE; + DeviceCapabilities->SurpriseRemovalOK = TRUE; + DeviceCapabilities->HardwareDisabled = FALSE; /* FIXME */ + //DeviceCapabilities->NoDisplayInUI = FALSE; /* FIXME */ + DeviceCapabilities->DeviceState[0] = PowerDeviceD0; /* FIXME */ + for (i = 0; i < PowerSystemMaximum; i++) + DeviceCapabilities->DeviceState[i] = PowerDeviceD3; /* FIXME */ + //DeviceCapabilities->DeviceWake = PowerDeviceUndefined; /* FIXME */ + DeviceCapabilities->D1Latency = 0; /* FIXME */ + DeviceCapabilities->D2Latency = 0; /* FIXME */ + DeviceCapabilities->D3Latency = 0; /* FIXME */ + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_RESOURCES: /* 0x0a */ + { + DPRINT("UHCI: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); + /* Root buses don't need resources, except the ones of + * the usb controller. This PDO is the root bus PDO, so + * report no resource by not changing Information and + * Status + */ + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + break; + } + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: /* 0x0b */ + { + DPRINT("UHCI: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + /* Root buses don't need resources, except the ones of + * the usb controller. This PDO is the root bus PDO, so + * report no resource by not changing Information and + * Status + */ + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + break; + } +#if 0 /* FIXME */ + case IRP_MN_QUERY_DEVICE_TEXT: /* 0x0c */ + { + switch (Stack->Parameters.QueryDeviceText.DeviceTextType) + { + case DeviceTextDescription: + { + ULONG DescriptionSize; + PWSTR Description; + DPRINT("UHCI: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + + Status = IoGetDeviceProperty( + DeviceObject, + DevicePropertyDeviceDescription, + 0, NULL, + &DescriptionSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + Description = ExAllocatePool(PagedPool, DescriptionSize); + if (!Description) + Status = STATUS_INSUFFICIENT_RESOURCES; + else + { + Status = IoGetDeviceProperty( + DeviceObject, + DevicePropertyDeviceDescription, + DescriptionSize, Description, + &DescriptionSize); + Information = DescriptionSize; + } + } + break; + } + case DeviceTextLocationInformation: + { + /* We don't have any text location to report, + * and this query is optional, so ignore it. + */ + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + break; + } + default: + { + DPRINT1("UHCI: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown type 0x%lx\n", + Stack->Parameters.QueryDeviceText.DeviceTextType); + Status = STATUS_NOT_SUPPORTED; + } + } + break; + } +#endif case IRP_MN_QUERY_ID: /* 0x13 */ { Status = UhciPdoQueryId(DeviceObject, Irp, &Information);

1 0

[ion] 16000: Enable PCH for NTDLL. This is commit 16000. Alex pwns you all.
by ion＠svn.reactos.com 17 Jun '05

17 Jun '05

Enable PCH for NTDLL. This is commit 16000. Alex pwns you all. Modified: trunk/reactos/lib/ntdll/ntdll.xml _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-06-17 17:22:27 UTC (rev 15999) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-06-17 17:22:44 UTC (rev 16000) @@ -94,5 +94,8 @@ <directory name="def"> <file>ntdll.rc</file> </directory> + <directory name="inc"> + <pch>ntdll.h</pch> + </directory> <file>napi.S</file> </module>

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005