Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[aandrejevic] 59892: [SOFT386] Implement CMC instruction.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Aug 29 22:18:28 2013 New Revision: 59892 URL: http://svn.reactos.org/svn/reactos?rev=59892&view=rev Log: [SOFT386] Implement CMC instruction. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Aug 29 22:18:28 2013 @@ -269,7 +269,7 @@ Soft386OpcodePrefix, Soft386OpcodePrefix, Soft386OpcodeHalt, - NULL, // TODO: OPCODE 0xF5 NOT SUPPORTED + Soft386OpcodeComplCarry, NULL, // TODO: OPCODE 0xF6 NOT SUPPORTED NULL, // TODO: OPCODE 0xF7 NOT SUPPORTED Soft386OpcodeClearCarry, @@ -782,6 +782,25 @@ BOOLEAN FASTCALL +Soft386OpcodeComplCarry(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xF5); + + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Toggle CF and return success */ + State->Flags.Cf = !State->Flags.Cf; + return TRUE; +} + +BOOLEAN +FASTCALL Soft386OpcodeClearInt(PSOFT386_STATE State, UCHAR Opcode) { /* Make sure this is the right instruction */ Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Thu Aug 29 22:18:28 2013 @@ -105,6 +105,14 @@ BOOLEAN FASTCALL +Soft386OpcodeComplCarry +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL Soft386OpcodeClearInt ( PSOFT386_STATE State,

11 years

[aandrejevic] 59891: [SOFT386] Add Soft386OpcodeHalt to the opcode table.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Aug 29 22:11:33 2013 New Revision: 59891 URL: http://svn.reactos.org/svn/reactos?rev=59891&view=rev Log: [SOFT386] Add Soft386OpcodeHalt to the opcode table. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Aug 29 22:11:33 2013 @@ -268,7 +268,7 @@ NULL, // Invalid Soft386OpcodePrefix, Soft386OpcodePrefix, - NULL, // TODO: OPCODE 0xF4 NOT SUPPORTED + Soft386OpcodeHalt, NULL, // TODO: OPCODE 0xF5 NOT SUPPORTED NULL, // TODO: OPCODE 0xF6 NOT SUPPORTED NULL, // TODO: OPCODE 0xF7 NOT SUPPORTED Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Thu Aug 29 22:11:33 2013 @@ -135,4 +135,12 @@ UCHAR Opcode ); +BOOLEAN +FASTCALL +Soft386OpcodeHalt +( + PSOFT386_STATE State, + UCHAR Opcode +); + #endif // _OPCODES_H_

11 years

[aandrejevic] 59890: [SOFT386] Add checks for illegal prefixes. Implement HLT and PAUSE.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Aug 29 22:07:53 2013 New Revision: 59890 URL: http://svn.reactos.org/svn/reactos?rev=59890&view=rev Log: [SOFT386] Add checks for illegal prefixes. Implement HLT and PAUSE. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/soft386.c Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Thu Aug 29 22:07:53 2013 @@ -148,6 +148,13 @@ ULONG Port, PVOID Buffer, ULONG Size +); + +typedef +VOID +(NTAPI *SOFT386_IDLE_PROC) +( + PSOFT386_STATE State ); typedef union _SOFT386_REG @@ -280,6 +287,7 @@ SOFT386_MEM_WRITE_PROC MemWriteCallback; SOFT386_IO_READ_PROC IoReadCallback; SOFT386_IO_WRITE_PROC IoWriteCallback; + SOFT386_IDLE_PROC IdleCallback; SOFT386_REG GeneralRegs[SOFT386_NUM_GEN_REGS]; SOFT386_SEG_REG SegmentRegs[SOFT386_NUM_SEG_REGS]; SOFT386_REG InstPtr; @@ -291,6 +299,7 @@ ULONG ExceptionCount; ULONG PrefixFlags; INT SegmentOverride; + BOOLEAN HardwareInt; }; /* FUNCTIONS ******************************************************************/ Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Aug 29 22:07:53 2013 @@ -600,7 +600,8 @@ if (State->PrefixFlags & SOFT386_PREFIX_REP) { - // TODO: Handle PAUSE instruction. + /* Idle cycle */ + State->IdleCallback(State); } return TRUE; @@ -748,6 +749,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF8); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Clear CF and return success */ State->Flags.Cf = FALSE; return TRUE; @@ -760,6 +768,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF9); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Set CF and return success*/ State->Flags.Cf = TRUE; return TRUE; @@ -771,6 +786,13 @@ { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFA); + + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } /* Check for protected mode */ if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) @@ -805,6 +827,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFB); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Check for protected mode */ if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) { @@ -838,6 +867,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFC); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Clear DF and return success */ State->Flags.Df = FALSE; return TRUE; @@ -850,7 +886,42 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFD); + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + /* Set DF and return success*/ State->Flags.Df = TRUE; return TRUE; } + +BOOLEAN +FASTCALL +Soft386OpcodeHalt(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xF4); + + /* No prefixes allowed */ + if (State->PrefixFlags) + { + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Privileged instructions can only be executed under CPL = 0 */ + if (State->SegmentRegs[SOFT386_REG_CS].Dpl != 0) + { + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + + /* Halt */ + while (!State->HardwareInt) State->IdleCallback(State); + + /* Return success */ + return TRUE; +} Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Thu Aug 29 22:07:53 2013 @@ -201,6 +201,7 @@ SOFT386_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; SOFT386_IO_READ_PROC IoReadCallback = State->IoReadCallback; SOFT386_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; + SOFT386_IDLE_PROC IdleCallback = State->IdleCallback; /* Clear the entire structure */ RtlZeroMemory(State, sizeof(*State)); @@ -234,6 +235,7 @@ State->MemWriteCallback = MemWriteCallback; State->IoReadCallback = IoReadCallback; State->IoWriteCallback = IoWriteCallback; + State->IdleCallback = IdleCallback; } VOID

11 years

[fireball] 59889: [NTOS] - Implement two types of FsRtl locking functions: exclusive lock and Cc flushing lock, along with their releasing counterparts, without the filter callbacks support. These ...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 29 22:07:24 2013 New Revision: 59889 URL: http://svn.reactos.org/svn/reactos?rev=59889&view=rev Log: [NTOS] - Implement two types of FsRtl locking functions: exclusive lock and Cc flushing lock, along with their releasing counterparts, without the filter callbacks support. These functions are unused in trunk now but would be needed by proper Cc/Mm/IFS in future. Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Thu Aug 29 22:07:24 2013 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/fsrtl/fastio.c * PURPOSE: Provides Fast I/O entrypoints to the Cache Manager * PROGRAMMERS: buzdelabuz2@gmail.com,alex.ionescu@reactos.org + * Aleksey Bragin <aleksey(a)reactos.org> */ /* INCLUDES ******************************************************************/ @@ -1558,6 +1559,40 @@ return Result; } +NTSTATUS +NTAPI +FsRtlAcquireFileExclusiveCommon(IN PFILE_OBJECT FileObject, + IN FS_FILTER_SECTION_SYNC_TYPE SyncType, + IN ULONG Reserved) +{ + PFSRTL_COMMON_FCB_HEADER FcbHeader; + PDEVICE_OBJECT DeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext; + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Get master FsRtl lock */ + FsRtlEnterFileSystem(); + + /* Check if Fast Calls are supported, and check AcquireFileForNtCreateSection */ + if (FastDispatch && + FastDispatch->AcquireFileForNtCreateSection) + { + /* Call the AcquireFileForNtCreateSection FastIo handler */ + FastDispatch->AcquireFileForNtCreateSection(FileObject); + } + else + { + /* No FastIo handler, acquire file's resource exclusively */ + if (FcbHeader && FcbHeader->Resource) ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); + } + + return STATUS_SUCCESS; +} + /* * @implemented */ @@ -1565,9 +1600,10 @@ NTAPI FsRtlAcquireFileExclusive(IN PFILE_OBJECT FileObject) { - /* PAGED_CODE(); */ - /* FsRtlAcquireFileExclusiveCommon(FileObject, 0, 0); */ - KeBugCheck(FILE_SYSTEM); + PAGED_CODE(); + + /* Call the common routine. Don't care about the result */ + (VOID)FsRtlAcquireFileExclusiveCommon(FileObject, SyncTypeOther, 0); } /* @@ -1577,7 +1613,127 @@ NTAPI FsRtlReleaseFile(IN PFILE_OBJECT FileObject) { - KeBugCheck(FILE_SYSTEM); + PFSRTL_COMMON_FCB_HEADER FcbHeader; + PDEVICE_OBJECT DeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext; + DeviceObject = IoGetRelatedDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if Fast Calls are supported and check ReleaseFileForNtCreateSection */ + if (FastDispatch && + FastDispatch->ReleaseFileForNtCreateSection) + { + /* Call the ReleaseFileForNtCreateSection FastIo handler */ + FastDispatch->ReleaseFileForNtCreateSection(FileObject); + } + else + { + /* No FastIo handler, release file's resource */ + if (FcbHeader && FcbHeader->Resource) ExReleaseResourceLite(FcbHeader->Resource); + } + + /* Release master FsRtl lock */ + FsRtlExitFileSystem(); +} + +/* +* @implemented +*/ +NTSTATUS +NTAPI +FsRtlAcquireFileForCcFlushEx(IN PFILE_OBJECT FileObject) +{ + PFSRTL_COMMON_FCB_HEADER FcbHeader; + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get the Base File System (Volume) and Fast Calls */ + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext; + DeviceObject = IoGetRelatedDeviceObject(FileObject); + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Get master FsRtl lock */ + FsRtlEnterFileSystem(); + + /* Check if Fast Calls are supported, and check AcquireForCcFlush */ + if (FastDispatch && + FastDispatch->AcquireForCcFlush) + { + /* Call the AcquireForCcFlush FastIo handler */ + FastDispatch->AcquireForCcFlush(FileObject, BaseDeviceObject); + } + else + { + /* No FastIo handler, acquire file's resource */ + if (FcbHeader->Resource) + { + /* Acquire it - either shared if it's already acquired + or exclusively if we are the first */ + if (ExIsResourceAcquiredSharedLite(FcbHeader->Resource)) + ExAcquireResourceSharedLite(FcbHeader->Resource, TRUE); + else + ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); + } + + /* Also acquire its Paging I/O resource */ + if (FcbHeader->PagingIoResource) + ExAcquireResourceSharedLite(FcbHeader->PagingIoResource, TRUE); + } + + return STATUS_SUCCESS; +} + +/* +* @implemented +*/ +VOID +NTAPI +FsRtlAcquireFileForCcFlush(IN PFILE_OBJECT FileObject) +{ + PAGED_CODE(); + + /* Call the common routine. Don't care about the result */ + (VOID)FsRtlAcquireFileForCcFlushEx(FileObject); +} + + +/* +* @implemented +*/ +VOID +NTAPI +FsRtlReleaseFileForCcFlush(IN PFILE_OBJECT FileObject) +{ + PFSRTL_COMMON_FCB_HEADER FcbHeader; + PDEVICE_OBJECT DeviceObject, BaseDeviceObject; + PFAST_IO_DISPATCH FastDispatch; + + /* Get Device Object and Fast Calls */ + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext; + DeviceObject = IoGetRelatedDeviceObject(FileObject); + BaseDeviceObject = IoGetBaseFileSystemDeviceObject(FileObject); + FastDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check if Fast Calls are supported, and check ReleaseForCcFlush */ + if (FastDispatch && + FastDispatch->ReleaseForCcFlush) + { + /* Call the ReleaseForCcFlush FastIo handler */ + FastDispatch->ReleaseForCcFlush(FileObject, BaseDeviceObject); + } + else + { + /* No FastIo handler, release PagingIO and then file's resource */ + if (FcbHeader->PagingIoResource) ExReleaseResourceLite(FcbHeader->PagingIoResource); + if (FcbHeader->Resource) ExReleaseResourceLite(FcbHeader->Resource); + } + + /* Release master FsRtl lock */ + FsRtlExitFileSystem(); } /*++

11 years

[hbelusca] 59888: [BASESRV] Fix the "fix" of r59887, i.e. add a stub for the unknown api.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 29 21:37:22 2013 New Revision: 59888 URL: http://svn.reactos.org/svn/reactos?rev=59888&view=rev Log: [BASESRV] Fix the "fix" of r59887, i.e. add a stub for the unknown api. Modified: trunk/reactos/subsystems/win/basesrv/api.h trunk/reactos/subsystems/win/basesrv/proc.c Modified: trunk/reactos/subsystems/win/basesrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/api… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/api.h [iso-8859-1] Thu Aug 29 21:37:22 2013 @@ -26,6 +26,7 @@ CSR_API(BaseSrvSxsCreateActivationContext); CSR_API(BaseSrvSetTermsrvAppInstallMode); CSR_API(BaseSrvSetTermsrvClientTimeZone); +CSR_API(BaseSrvUnknown); /* sndsntry.c */ CSR_API(BaseSrvSoundSentryNotification); Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Thu Aug 29 21:37:22 2013 @@ -39,6 +39,12 @@ } CSR_API(BaseSrvSetTermsrvClientTimeZone) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(BaseSrvUnknown) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED;

11 years

[hbelusca] 59887: Here too ;)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 29 21:29:33 2013 New Revision: 59887 URL: http://svn.reactos.org/svn/reactos?rev=59887&view=rev Log: Here too ;) Modified: trunk/reactos/subsystems/win/basesrv/init.c Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Thu Aug 29 21:29:33 2013 @@ -55,7 +55,7 @@ BaseSrvNlsUpdateCacheCount, BaseSrvSetTermsrvClientTimeZone, BaseSrvSxsCreateActivationContext, - BaseSrvDebugProcess, + BaseSrvUnknown, BaseSrvRegisterThread, BaseSrvNlsGetUserInfo, }; @@ -90,7 +90,7 @@ TRUE, // BaseSrvNlsUpdateCacheCount TRUE, // BaseSrvSetTermsrvClientTimeZone TRUE, // BaseSrvSxsCreateActivationContext - TRUE, // BasepDebugProcess + TRUE, // BaseSrvUnknown TRUE, // BaseSrvRegisterThread TRUE, // BaseSrvNlsGetUserInfo };

11 years

[ion] 59886: [BASESRV]: forgot to update the name table.

by ion＠svn.reactos.org

Author: ion Date: Thu Aug 29 21:27:18 2013 New Revision: 59886 URL: http://svn.reactos.org/svn/reactos?rev=59886&view=rev Log: [BASESRV]: forgot to update the name table. Modified: trunk/reactos/subsystems/win/basesrv/init.c Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Thu Aug 29 21:27:18 2013 @@ -125,6 +125,7 @@ "BaseNlsUpdateCacheCount", "BaseSetTermsrvClientTimeZone", "BaseSxsCreateActivationContext", + "BaseUnknown", "BaseRegisterThread", "BaseNlsGetUserInfo", };

11 years

[hbelusca] 59885: Partially revert r59884 because of an enum name collision (which broke build).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 29 21:23:46 2013 New Revision: 59885 URL: http://svn.reactos.org/svn/reactos?rev=59885&view=rev Log: Partially revert r59884 because of an enum name collision (which broke build). Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Aug 29 21:23:46 2013 @@ -46,7 +46,7 @@ BasepNlsUpdateCacheCount, BasepSetTermsrvClientTimeZone, BasepSxsCreateActivationContext, - BasepDebugProcess, + BasepUnknown, BasepRegisterThread, BasepNlsGetUserInfo,

11 years

[hbelusca] 59884: [BASESRV] - Fix nls.c header information. - Rename BasepUnknown to BasepDebugProcess according to j00ru's http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 and what ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 29 21:14:49 2013 New Revision: 59884 URL: http://svn.reactos.org/svn/reactos?rev=59884&view=rev Log: [BASESRV] - Fix nls.c header information. - Rename BasepUnknown to BasepDebugProcess according to j00ru's http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 and what Alex_Ionescu committed in r59879 (deprecated api). Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/subsystems/win/basesrv/nls.c Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Aug 29 21:14:49 2013 @@ -46,9 +46,10 @@ BasepNlsUpdateCacheCount, BasepSetTermsrvClientTimeZone, BasepSxsCreateActivationContext, - BasepUnknown, + BasepDebugProcess, BasepRegisterThread, BasepNlsGetUserInfo, + BasepMaxApiNumber } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER; Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Thu Aug 29 21:14:49 2013 @@ -1,9 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Base API Server DLL - * FILE: subsystems/win/basesrv/vdm.c - * PURPOSE: Virtual DOS Machines (VDM) Support - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * FILE: subsystems/win/basesrv/nls.c + * PURPOSE: National Language Support (NLS) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *******************************************************************/

11 years

[akhaldi] 59883: [NTDLL] * Fix several print specifiers. * Add missing Status variable to a DPRINT1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 29 21:12:40 2013 New Revision: 59883 URL: http://svn.reactos.org/svn/reactos?rev=59883&view=rev Log: [NTDLL] * Fix several print specifiers. * Add missing Status variable to a DPRINT1. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrpe.c trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Thu Aug 29 21:12:40 2013 @@ -310,14 +310,14 @@ if ((ShowSnaps) || (LdrpShowRecursiveLoads) || (LdrpBreakOnRecursiveDllLoads)) { /* Print out debug messages */ - DPRINT1("[%lx, %lx] LDR: Recursive DLL Load\n", + DPRINT1("[%p, %p] LDR: Recursive DLL Load\n", Teb->RealClientId.UniqueProcess, Teb->RealClientId.UniqueThread); - DPRINT1("[%lx, %lx] Previous DLL being loaded \"%wZ\"\n", + DPRINT1("[%p, %p] Previous DLL being loaded \"%wZ\"\n", Teb->RealClientId.UniqueProcess, Teb->RealClientId.UniqueThread, OldTldDll); - DPRINT1("[%lx, %lx] DLL being requested \"%wZ\"\n", + DPRINT1("[%p, %p] DLL being requested \"%wZ\"\n", Teb->RealClientId.UniqueProcess, Teb->RealClientId.UniqueThread, DllName); @@ -325,13 +325,13 @@ /* Was it initializing too? */ if (!LdrpCurrentDllInitializer) { - DPRINT1("[%lx, %lx] LDR: No DLL Initializer was running\n", + DPRINT1("[%p, %p] LDR: No DLL Initializer was running\n", Teb->RealClientId.UniqueProcess, Teb->RealClientId.UniqueThread); } else { - DPRINT1("[%lx, %lx] DLL whose initializer was currently running \"%wZ\"\n", + DPRINT1("[%p, %p] DLL whose initializer was currently running \"%wZ\"\n", Teb->ClientId.UniqueProcess, Teb->ClientId.UniqueThread, &LdrpCurrentDllInitializer->BaseDllName); @@ -1247,7 +1247,7 @@ (Status != STATUS_DLL_NOT_FOUND) && (Status != STATUS_OBJECT_NAME_NOT_FOUND))) { - DPRINT1("LDR: LdrAddRefDll(%p) 0x%08lx\n", BaseAddress); + DPRINT1("LDR: LdrAddRefDll(%p) 0x%08lx\n", BaseAddress, Status); } } @@ -1345,7 +1345,7 @@ /* Show message */ if (ShowSnaps) { - DPRINT1("(%d) [%ws] %ws (%lx) deinit %lx\n", + DPRINT1("(%lu) [%ws] %ws (%lx) deinit %p\n", LdrpActiveUnloadCount, LdrEntry->BaseDllName.Buffer, LdrEntry->FullDllName.Buffer, @@ -1407,7 +1407,7 @@ /* Show message */ if (ShowSnaps) { - DPRINT1("LDR: Calling deinit %lx\n", EntryPoint); + DPRINT1("LDR: Calling deinit %p\n", EntryPoint); } /* Set up the Act Ctx */ Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Thu Aug 29 21:12:40 2013 @@ -501,7 +501,7 @@ NTSTATUS Status; PVOID EntryPoint; - DPRINT("LdrpInitializeThread() called for %wZ (%lx/%lx)\n", + DPRINT("LdrpInitializeThread() called for %wZ (%p/%p)\n", &LdrpImageEntry->BaseDllName, NtCurrentTeb()->RealClientId.UniqueProcess, NtCurrentTeb()->RealClientId.UniqueThread); @@ -566,7 +566,7 @@ if (!LdrpShutdownInProgress) { /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %p for thread attaching, %lx/%lx\n", + DPRINT("%wZ - Calling entry point at %p for thread attaching, %p/%p\n", &LdrEntry->BaseDllName, LdrEntry->EntryPoint, NtCurrentTeb()->RealClientId.UniqueProcess, NtCurrentTeb()->RealClientId.UniqueThread); @@ -626,7 +626,7 @@ PTEB OldTldTeb; BOOLEAN DllStatus; - DPRINT("LdrpRunInitializeRoutines() called for %wZ (%lx/%lx)\n", + DPRINT("LdrpRunInitializeRoutines() called for %wZ (%p/%p)\n", &LdrpImageEntry->BaseDllName, NtCurrentTeb()->RealClientId.UniqueProcess, NtCurrentTeb()->RealClientId.UniqueThread); @@ -661,7 +661,7 @@ /* Show debug message */ if (ShowSnaps) { - DPRINT1("[%x,%x] LDR: Real INIT LIST for Process %wZ\n", + DPRINT1("[%p,%p] LDR: Real INIT LIST for Process %wZ\n", NtCurrentTeb()->RealClientId.UniqueThread, NtCurrentTeb()->RealClientId.UniqueProcess, &Peb->ProcessParameters->ImagePathName); @@ -695,7 +695,7 @@ /* Display debug message */ if (ShowSnaps) { - DPRINT1("[%x,%x] LDR: %wZ init routine %p\n", + DPRINT1("[%p,%p] LDR: %wZ init routine %p\n", NtCurrentTeb()->RealClientId.UniqueThread, NtCurrentTeb()->RealClientId.UniqueProcess, &LdrEntry->FullDllName, @@ -963,7 +963,7 @@ } /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %x for thread detaching\n", + DPRINT("%wZ - Calling entry point at %p for thread detaching\n", &LdrEntry->BaseDllName, LdrEntry->EntryPoint); LdrpCallInitRoutine(EntryPoint, LdrEntry->DllBase, @@ -1078,7 +1078,7 @@ if (!LdrpShutdownInProgress) { /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %x for thread detaching\n", + DPRINT("%wZ - Calling entry point at %p for thread detaching\n", &LdrEntry->BaseDllName, LdrEntry->EntryPoint); LdrpCallInitRoutine(EntryPoint, LdrEntry->DllBase, @@ -1253,7 +1253,7 @@ /* Show debug message */ if (ShowSnaps) { - DPRINT1("LDR: TlsVector %x Index %d = %x copied from %x to %x\n", + DPRINT1("LDR: TlsVector %p Index %lu = %p copied from %x to %p\n", TlsVector, TlsData->TlsDirectory.Characteristics, &TlsVector[TlsData->TlsDirectory.Characteristics], @@ -1605,7 +1605,7 @@ /* Start verbose debugging messages right now if they were requested */ if (ShowSnaps) { - DPRINT1("LDR: PID: 0x%x started - '%wZ'\n", + DPRINT1("LDR: PID: 0x%p started - '%wZ'\n", Teb->ClientId.UniqueProcess, &CommandLine); } @@ -2146,7 +2146,7 @@ MEMORY_BASIC_INFORMATION MemoryBasicInfo; PPEB Peb = NtCurrentPeb(); - DPRINT("LdrpInit() %lx/%lx\n", + DPRINT("LdrpInit() %p/%p\n", NtCurrentTeb()->RealClientId.UniqueProcess, NtCurrentTeb()->RealClientId.UniqueThread); Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Thu Aug 29 21:12:40 2013 @@ -47,7 +47,7 @@ LPSTR ImportName; ULONG ForwarderChain, i, Rva, OldProtect, IatSize, ExportSize; SIZE_T ImportSize; - DPRINT("LdrpSnapIAT(%wZ %wZ %p %d)\n", &ExportLdrEntry->BaseDllName, &ImportLdrEntry->BaseDllName, IatEntry, EntriesValid); + DPRINT("LdrpSnapIAT(%wZ %wZ %p %u)\n", &ExportLdrEntry->BaseDllName, &ImportLdrEntry->BaseDllName, IatEntry, EntriesValid); /* Get export directory */ ExportDirectory = RtlImageDirectoryEntryToData(ExportLdrEntry->DllBase, @@ -689,7 +689,7 @@ PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry = NULL; PIMAGE_IMPORT_DESCRIPTOR ImportEntry; ULONG BoundSize, IatSize; - DPRINT("LdrpWalkImportDescriptor('%S' %x)\n", DllPath, LdrEntry); + DPRINT("LdrpWalkImportDescriptor('%S' %p)\n", DllPath, LdrEntry); /* Set up the Act Ctx */ RtlZeroMemory(&ActCtx, sizeof(ActCtx)); Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Thu Aug 29 21:12:40 2013 @@ -303,7 +303,7 @@ /* Show snaps */ if (ShowSnaps) { - DPRINT1("LDR: Flags %d %wZ (%lx)\n", Flags, ImportNameUnic, Entry->LoadCount); + DPRINT1("LDR: Flags %lu %wZ (%lx)\n", Flags, ImportNameUnic, Entry->LoadCount); } } @@ -347,7 +347,7 @@ /* Show snaps */ if (ShowSnaps) { - DPRINT1("LDR: Flags %d %wZ (%lx)\n", Flags, ImportNameUnic, Entry->LoadCount); + DPRINT1("LDR: Flags %lu %wZ (%lx)\n", Flags, ImportNameUnic, Entry->LoadCount); } } @@ -416,7 +416,7 @@ /* Show snaps */ if (ShowSnaps) { - DPRINT1("LDR: Flags %d %wZ (%lx)\n", Flags, ImportNameUnic, Entry->LoadCount); + DPRINT1("LDR: Flags %lu %wZ (%lx)\n", Flags, ImportNameUnic, Entry->LoadCount); } } @@ -1319,7 +1319,7 @@ ImageBase = (ULONG_PTR)NtHeaders->OptionalHeader.ImageBase; ImageEnd = ImageBase + ViewSize; - DPRINT1("LDR: LdrpMapDll Relocating Image Name %ws (%p -> %p)\n", DllName, ImageBase, ViewBase); + DPRINT1("LDR: LdrpMapDll Relocating Image Name %ws (%lu -> %p)\n", DllName, ImageBase, ViewBase); /* Scan all the modules */ ListHead = &Peb->Ldr->InLoadOrderModuleList; @@ -1978,7 +1978,7 @@ PVOID ViewBase = NULL; SIZE_T ViewSize = 0; PIMAGE_NT_HEADERS NtHeader, NtHeader2; - DPRINT("LdrpCheckForLoadedDll('%S' '%wZ' %d %d %p)\n", DllPath ? ((ULONG_PTR)DllPath == 1 ? L"" : DllPath) : L"", DllName, Flag, RedirectedDll, LdrEntry); + DPRINT("LdrpCheckForLoadedDll('%S' '%wZ' %u %u %p)\n", DllPath ? ((ULONG_PTR)DllPath == 1 ? L"" : DllPath) : L"", DllName, Flag, RedirectedDll, LdrEntry); /* Check if a dll name was provided */ if (!(DllName->Buffer) || !(DllName->Buffer[0])) return FALSE;

11 years

← Newer
1
2
3
4
5
6
7
8
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2013