Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 29 Aug '13

29 Aug '13

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(); } /*++

1 0

[hbelusca] 59888: [BASESRV] Fix the "fix" of r59887, i.e. add a stub for the unknown api.
by hbelusca＠svn.reactos.org 29 Aug '13

29 Aug '13

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;

1 0

[hbelusca] 59887: Here too ;)
by hbelusca＠svn.reactos.org 29 Aug '13

29 Aug '13

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 };

1 0

[ion] 59886: [BASESRV]: forgot to update the name table.
by ion＠svn.reactos.org 29 Aug '13

29 Aug '13

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", };

1 0

[hbelusca] 59885: Partially revert r59884 because of an enum name collision (which broke build).
by hbelusca＠svn.reactos.org 29 Aug '13

29 Aug '13

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,

1 0

[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 29 Aug '13

29 Aug '13

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 *******************************************************************/

1 0

[akhaldi] 59883: [NTDLL] * Fix several print specifiers. * Add missing Status variable to a DPRINT1.
by akhaldi＠svn.reactos.org 29 Aug '13

29 Aug '13

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;

1 0

[ion] 59882: [BASESRV]: Fix definition of NLS_USER_INFO so that it matches exactly that of Server 2003 (this now makes BASE_SERVER_STATIC_DATA correct too). [BASESRV]: Implement BaseSrvNlsGetUserInfo.
by ion＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: ion Date: Thu Aug 29 21:00:54 2013 New Revision: 59882 URL: http://svn.reactos.org/svn/reactos?rev=59882&view=rev Log: [BASESRV]: Fix definition of NLS_USER_INFO so that it matches exactly that of Server 2003 (this now makes BASE_SERVER_STATIC_DATA correct too). [BASESRV]: Implement BaseSrvNlsGetUserInfo. Modified: trunk/reactos/include/reactos/subsys/win/base.h trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/nls.c Modified: trunk/reactos/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] Thu Aug 29 21:00:54 2013 @@ -17,6 +17,7 @@ typedef struct _NLS_USER_INFO { + WCHAR sLanguage[80]; WCHAR iCountry[80]; WCHAR sCountry[80]; WCHAR sList[80]; @@ -29,7 +30,7 @@ WCHAR iLZero[80]; WCHAR iNegNumber[80]; WCHAR sNativeDigits[80]; - WCHAR iDigitSubstitution[80]; + WCHAR NumShape[80]; WCHAR sCurrency[80]; WCHAR sMonDecSep[80]; WCHAR sMonThouSep[80]; @@ -37,25 +38,29 @@ WCHAR iCurrDigits[80]; WCHAR iCurrency[80]; WCHAR iNegCurr[80]; - WCHAR sPosSign[80]; - WCHAR sNegSign[80]; + WCHAR sPositiveSign[80]; + WCHAR sNegativeSign[80]; WCHAR sTimeFormat[80]; + WCHAR sTime[80]; + WCHAR iTime[80]; + WCHAR iTLZero[80]; + WCHAR iTimePrefix[80]; WCHAR s1159[80]; WCHAR s2359[80]; WCHAR sShortDate[80]; + WCHAR sDate[80]; + WCHAR iDate[80]; WCHAR sYearMonth[80]; WCHAR sLongDate[80]; WCHAR iCalType[80]; - WCHAR iFirstDay[80]; - WCHAR iFirstWeek[80]; - WCHAR sLocale[80]; - WCHAR sLocaleName[85]; + WCHAR iFirstDayOfWeek[80]; + WCHAR iFirstWeekOfYear[80]; + WCHAR Locale[80]; LCID UserLocaleId; LUID InteractiveUserLuid; - CHAR InteractiveUserSid[68]; // SECURITY_MAX_SID_SIZE to make ROS happy ULONG ulCacheUpdateCount; } NLS_USER_INFO, *PNLS_USER_INFO; - +C_ASSERT(sizeof(NLS_USER_INFO) == 0x1870); typedef struct _BASE_STATIC_SERVER_DATA { @@ -82,6 +87,9 @@ BOOLEAN LUIDDeviceMapsEnabled; ULONG TermsrvClientTimeZoneChangeNum; } BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; +C_ASSERT(sizeof(BASE_STATIC_SERVER_DATA) == 0x1AC8); + +VOID WINAPI BaseSrvNLSInit(IN PBASE_STATIC_SERVER_DATA StaticData); #endif // _BASE_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:00:54 2013 @@ -268,6 +268,12 @@ ULONG LocaleId; } BASE_NLS_CREATE_SECTION, *PBASE_NLS_CREATE_SECTION; +typedef struct +{ + PVOID /*PNLS_USER_INFO*/ NlsUserInfo; + ULONG Size; +} BASE_NLS_GET_USER_INFO, *PBASE_NLS_GET_USER_INFO; + typedef struct _BASE_API_MESSAGE { PORT_MESSAGE Header; @@ -297,6 +303,7 @@ BASE_REFRESH_INIFILE_MAPPING RefreshIniFileMappingRequest; BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest; BASE_NLS_CREATE_SECTION NlsCreateSection; + BASE_NLS_GET_USER_INFO NlsGetUserInfo; } Data; } BASE_API_MESSAGE, *PBASE_API_MESSAGE; 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:00:54 2013 @@ -525,6 +525,9 @@ ASSERT(NT_SUCCESS(Status)); } + /* Initialize NLS */ + BaseSrvNLSInit(BaseStaticServerData); + /* Finally, set the pointer */ LoadedServerDll->SharedSection = BaseStaticServerData; } 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:00:54 2013 @@ -14,6 +14,9 @@ #include <debug.h> /* GLOBALS ********************************************************************/ + +RTL_CRITICAL_SECTION NlsCacheCriticalSection; +PNLS_USER_INFO pNlsRegUserInfo; BOOLEAN BaseSrvKernel32DelayLoadComplete; HANDLE BaseSrvKernel32DllHandle; @@ -102,6 +105,29 @@ return Status; } +VOID +WINAPI +BaseSrvNLSInit(IN PBASE_STATIC_SERVER_DATA StaticData) +{ + /* Initialize the lock */ + RtlInitializeCriticalSection(&NlsCacheCriticalSection); + + /* Initialize the data with all F's */ + pNlsRegUserInfo = &StaticData->NlsUserInfo; + RtlFillMemory(&StaticData->NlsUserInfo, 0xFF, sizeof(StaticData->NlsUserInfo)); + + /* Set empty LCID */ + pNlsRegUserInfo->UserLocaleId = 0; + + /* Reset the cache update counter */ + RtlEnterCriticalSection(&NlsCacheCriticalSection); + pNlsRegUserInfo->ulCacheUpdateCount = 0; + RtlLeaveCriticalSection(&NlsCacheCriticalSection); + + /* Get the LCID */ + NtQueryDefaultLocale(0, &pNlsRegUserInfo->UserLocaleId); +} + /* PUBLIC SERVER APIS *********************************************************/ CSR_API(BaseSrvNlsSetUserInfo) @@ -268,8 +294,32 @@ CSR_API(BaseSrvNlsGetUserInfo) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PBASE_NLS_GET_USER_INFO NlsMsg = &((PBASE_API_MESSAGE)ApiMessage)->Data.NlsGetUserInfo; + + /* Make sure the buffer is valid and of the right size */ + if ((CsrValidateMessageBuffer(ApiMessage, &NlsMsg->NlsUserInfo, NlsMsg->Size, TRUE)) && + (NlsMsg->Size == sizeof(NLS_USER_INFO))) + { + /* Acquire the lock to prevent updates while we copy */ + Status = RtlEnterCriticalSection(&NlsCacheCriticalSection); + if (NT_SUCCESS(Status)) + { + /* Do the copy now, then drop the lock */ + RtlCopyMemory(&NlsMsg->NlsUserInfo, pNlsRegUserInfo, NlsMsg->Size); + DPRINT1("NLS Data copy complete\n"); + RtlLeaveCriticalSection(&NlsCacheCriticalSection); + } + } + else + { + /* The data was invalid, bail out */ + DPRINT1("NLS: Size of info is invalid: %lx vs %lx\n", NlsMsg->Size, sizeof(NLS_USER_INFO)); + Status = STATUS_INVALID_PARAMETER; + } + + /* All done */ + return Status; } /* EOF */

1 0

[akhaldi] 59881: [KERNEL32] * Fix several print specifiers.
by akhaldi＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: akhaldi Date: Thu Aug 29 20:37:02 2013 New Revision: 59881 URL: http://svn.reactos.org/svn/reactos?rev=59881&view=rev Log: [KERNEL32] * Fix several print specifiers. Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/dll/win32/kernel32/client/console/readwrite.c trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/client/file/copy.c trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/dll/win32/kernel32/client/file/disk.c trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c trunk/reactos/dll/win32/kernel32/client/file/find.c trunk/reactos/dll/win32/kernel32/client/file/move.c trunk/reactos/dll/win32/kernel32/client/file/rw.c trunk/reactos/dll/win32/kernel32/client/file/volume.c trunk/reactos/dll/win32/kernel32/client/loader.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/thread.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/include/baseheap.h trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -351,7 +351,7 @@ DWORD nFontCount, PCONSOLE_FONT_INFO lpConsoleFontInfo) { - DPRINT1("GetConsoleFontInfo(0x%x, %d, %d, 0x%x) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, nFontCount, lpConsoleFontInfo); + DPRINT1("GetConsoleFontInfo(0x%p, %d, %lu, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, nFontCount, lpConsoleFontInfo); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -366,7 +366,7 @@ DWORD nFont) { COORD Empty = {0, 0}; - DPRINT1("GetConsoleFontSize(0x%x, 0x%x) UNIMPLEMENTED!\n", hConsoleOutput, nFont); + DPRINT1("GetConsoleFontSize(0x%p, 0x%x) UNIMPLEMENTED!\n", hConsoleOutput, nFont); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return Empty; } @@ -385,7 +385,7 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETSETHWSTATE HardwareStateRequest = &ApiMessage.Data.HardwareStateRequest; - DPRINT1("GetConsoleHardwareState(%d, 0x%p) UNIMPLEMENTED!\n", Flags, State); + DPRINT1("GetConsoleHardwareState(%lu, 0x%p) UNIMPLEMENTED!\n", Flags, State); if (State == NULL) { @@ -430,7 +430,7 @@ BOOL bMaximumWindow, PCONSOLE_FONT_INFO lpConsoleCurrentFont) { - DPRINT1("GetCurrentConsoleFont(0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFont); + DPRINT1("GetCurrentConsoleFont(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFont); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -613,7 +613,7 @@ SetConsoleFont(HANDLE hConsoleOutput, DWORD nFont) { - DPRINT1("SetConsoleFont(0x%x, %d) UNIMPLEMENTED!\n", hConsoleOutput, nFont); + DPRINT1("SetConsoleFont(0x%p, %lu) UNIMPLEMENTED!\n", hConsoleOutput, nFont); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -632,7 +632,7 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETSETHWSTATE HardwareStateRequest = &ApiMessage.Data.HardwareStateRequest; - DPRINT1("SetConsoleHardwareState(%d, %d) UNIMPLEMENTED!\n", Flags, State); + DPRINT1("SetConsoleHardwareState(%lu, %lu) UNIMPLEMENTED!\n", Flags, State); HardwareStateRequest->OutputHandle = hConsoleOutput; HardwareStateRequest->State = State; @@ -677,7 +677,7 @@ SetConsoleMaximumWindowSize(HANDLE hConsoleOutput, COORD dwMaximumSize) { - DPRINT1("SetConsoleMaximumWindowSize(0x%x, {%d, %d}) does nothing\n", + DPRINT1("SetConsoleMaximumWindowSize(0x%p, {%d, %d}) does nothing\n", hConsoleOutput, dwMaximumSize.X, dwMaximumSize.Y); return TRUE; } @@ -1268,7 +1268,7 @@ WINAPI GetNumberOfConsoleMouseButtons(LPDWORD lpNumberOfMouseButtons) { - DPRINT1("GetNumberOfConsoleMouseButtons(0x%x) UNIMPLEMENTED!\n", lpNumberOfMouseButtons); + DPRINT1("GetNumberOfConsoleMouseButtons(0x%p) UNIMPLEMENTED!\n", lpNumberOfMouseButtons); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -179,7 +179,7 @@ ULONG ConnectInfoSize = sizeof(ConnectInfo); DPRINT("BasepInitConsole for : %wZ\n", &Parameters->ImagePathName); - DPRINT("Our current console handles are: %lx, %lx, %lx %lx\n", + DPRINT("Our current console handles are: %p, %p, %p %p\n", Parameters->ConsoleHandle, Parameters->StandardInput, Parameters->StandardOutput, Parameters->StandardError); @@ -240,7 +240,7 @@ { Parameters->ConsoleHandle = NULL; } - DPRINT("Using existing console: %x\n", Parameters->ConsoleHandle); + DPRINT("Using existing console: %p\n", Parameters->ConsoleHandle); } } @@ -309,7 +309,7 @@ InputWaitHandle = ConnectInfo.InputWaitHandle; - DPRINT("Console setup: %lx, %lx, %lx, %lx\n", + DPRINT("Console setup: %p, %p, %p, %p\n", Parameters->ConsoleHandle, Parameters->StandardInput, Parameters->StandardOutput, Modified: trunk/reactos/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -275,7 +275,7 @@ } /* Return the read region */ - DPRINT("read region: %lx\n", ReadOutputRequest->ReadRegion); + DPRINT("read region: %p\n", ReadOutputRequest->ReadRegion); *lpReadRegion = ReadOutputRequest->ReadRegion; /* Release the capture buffer */ @@ -592,7 +592,7 @@ } /* Return the read region */ - DPRINT("read region: %lx\n", WriteOutputRequest->WriteRegion); + DPRINT("read region: %p\n", WriteOutputRequest->WriteRegion); *lpWriteRegion = WriteOutputRequest->WriteRegion; /* Release the capture buffer */ Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -92,7 +92,7 @@ ULONG DummySize = sizeof(Dummy); WCHAR SessionDir[256]; - DPRINT("DllMain(hInst %lx, dwReason %lu)\n", + DPRINT("DllMain(hInst %p, dwReason %lu)\n", hDll, dwReason); Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -149,7 +149,7 @@ } else { - TRACE("Error 0x%08x allocating buffer of %d bytes\n", errCode, RegionSize); + TRACE("Error 0x%08x allocating buffer of %lu bytes\n", errCode, RegionSize); } return errCode; @@ -293,7 +293,7 @@ } else { - WARN("Error %d during opening of dest file\n", GetLastError()); + WARN("Error %lu during opening of dest file\n", GetLastError()); } } } @@ -301,7 +301,7 @@ } else { - WARN("Error %d during opening of source file\n", GetLastError()); + WARN("Error %lu during opening of source file\n", GetLastError()); } return RC; Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -394,7 +394,7 @@ PWCHAR FilePart; ULONG Len; - TRACE("OpenFile('%s', lpReOpenBuff %x, uStyle %x)\n", lpFileName, lpReOpenBuff, uStyle); + TRACE("OpenFile('%s', lpReOpenBuff %p, uStyle %x)\n", lpFileName, lpReOpenBuff, uStyle); if (lpReOpenBuff == NULL) { Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -416,7 +416,7 @@ return DRIVE_FIXED; } - ERR("Returning DRIVE_UNKNOWN for device type %d\n", FileFsDevice.DeviceType); + ERR("Returning DRIVE_UNKNOWN for device type %lu\n", FileFsDevice.DeviceType); return DRIVE_UNKNOWN; } Modified: trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -210,7 +210,7 @@ IO_STATUS_BLOCK IoStatusBlock; LARGE_INTEGER Distance; - TRACE("SetFilePointer(hFile %x, lDistanceToMove %d, dwMoveMethod %d)\n", + TRACE("SetFilePointer(hFile %p, lDistanceToMove %d, dwMoveMethod %lu)\n", hFile,lDistanceToMove,dwMoveMethod); if(IsConsoleHandle(hFile)) Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -383,7 +383,7 @@ NTSTATUS Status = STATUS_SUCCESS; DIR_INFORMATION FoundFile = {NULL}; - TRACE("FindNextFileW(%lx, 0x%p)\n", hFindFile, lpFindFileData); + TRACE("FindNextFileW(%p, 0x%p)\n", hFindFile, lpFindFileData); if (hFindFile != FIND_DEVICE_HANDLE) { @@ -499,7 +499,7 @@ WINAPI FindClose(HANDLE hFindFile) { - TRACE("FindClose(hFindFile %x)\n", hFindFile); + TRACE("FindClose(hFindFile %p)\n", hFindFile); if (hFindFile == FIND_DEVICE_HANDLE) return TRUE; Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -91,7 +91,7 @@ WCHAR *p; NTSTATUS Status; - TRACE("add_boot_rename_entry( %S, %S, %d ) \n", source, dest, flags); + TRACE("add_boot_rename_entry( %S, %S, %lu ) \n", source, dest, flags); if(dest) DestLen = wcslen(dest); @@ -990,7 +990,7 @@ /* If there was an error, set the error code */ if(!Ret) { - TRACE("ReplaceFileW failed (error=%d)\n", Error); + TRACE("ReplaceFileW failed (error=%lu)\n", Error); SetLastError(Error); } return Ret; Modified: trunk/reactos/dll/win32/kernel32/client/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -29,7 +29,7 @@ { NTSTATUS Status; - TRACE("WriteFile(hFile %x)\n", hFile); + TRACE("WriteFile(hFile %p)\n", hFile); if (lpNumberOfBytesWritten != NULL) *lpNumberOfBytesWritten = 0; @@ -128,7 +128,7 @@ { NTSTATUS Status; - TRACE("ReadFile(hFile %x)\n", hFile); + TRACE("ReadFile(hFile %p)\n", hFile); if (lpNumberOfBytesRead != NULL) *lpNumberOfBytesRead = 0; if (!nNumberOfBytesToRead) return TRUE; Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -253,7 +253,7 @@ return FALSE; } - TRACE("hFile: %x\n", hFile); + TRACE("hFile: %p\n", hFile); errCode = NtQueryVolumeInformationFile(hFile, &IoStatusBlock, FileFsVolume, Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -1123,7 +1123,7 @@ IN PVOID Unknown3, IN PVOID Unknown4) { - DPRINT1("BaseQueryModuleData called: %s %s %x %x %x\n", + DPRINT1("BaseQueryModuleData called: %s %s %p %p %p\n", ModuleName, Unknown, Unknown2, Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -503,7 +503,7 @@ BASE_API_MESSAGE ApiMessage; PBASE_CREATE_THREAD CreateThreadRequest = &ApiMessage.Data.CreateThreadRequest; - DPRINT("BasepNotifyCsrOfThread: Thread: %lx, Handle %lx\n", + DPRINT("BasepNotifyCsrOfThread: Thread: %p, Handle %p\n", ClientId->UniqueThread, ThreadHandle); /* Fill out the request */ @@ -2891,7 +2891,7 @@ } /* Now use the path name, and the root path, to try opening the app */ - DPRINT1("Path: %wZ. Dir: %lx\n", &PathName, SxsWin32RelativePath.ContainingDirectory); + DPRINT1("Path: %wZ. Dir: %p\n", &PathName, SxsWin32RelativePath.ContainingDirectory); InitializeObjectAttributes(&LocalObjectAttributes, &PathName, OBJ_CASE_INSENSITIVE, @@ -3722,7 +3722,7 @@ if (!Result) { /* It was not, bail out */ - DPRINT1("Invalid subsystem version: %d.%d\n", + DPRINT1("Invalid subsystem version: %hu.%hu\n", ImageInformation.SubSystemMajorVersion, ImageInformation.SubSystemMinorVersion); SetLastError(ERROR_BAD_EXE_FORMAT); @@ -4657,8 +4657,8 @@ BOOL bRetVal; STARTUPINFOW StartupInfo; - DPRINT("dwCreationFlags %x, lpEnvironment %x, lpCurrentDirectory %x, " - "lpStartupInfo %x, lpProcessInformation %x\n", + DPRINT("dwCreationFlags %x, lpEnvironment %p, lpCurrentDirectory %p, " + "lpStartupInfo %p, lpProcessInformation %p\n", dwCreationFlags, lpEnvironment, lpCurrentDirectory, lpStartupInfo, lpProcessInformation); Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -175,8 +175,8 @@ ACTIVATION_CONTEXT_BASIC_INFORMATION ActCtxInfo; ULONG_PTR Cookie; ULONG ReturnLength; - DPRINT("CreateRemoteThread: hProcess: %ld dwStackSize: %ld lpStartAddress" - ": %p lpParameter: %lx, dwCreationFlags: %lx\n", hProcess, + DPRINT("CreateRemoteThread: hProcess: %p dwStackSize: %lu lpStartAddress" + ": %p lpParameter: %p, dwCreationFlags: %lx\n", hProcess, dwStackSize, lpStartAddress, lpParameter, dwCreationFlags); /* Clear the Context */ Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -340,7 +340,7 @@ Attributes, RootDirectory, SecurityDescriptor); - DPRINT("Attributes: %lx, RootDirectory: %lx, SecurityDescriptor: %p\n", + DPRINT("Attributes: %lx, RootDirectory: %p, SecurityDescriptor: %p\n", Attributes, RootDirectory, SecurityDescriptor); return ObjectAttributes; } @@ -361,7 +361,7 @@ BOOLEAN UseGuard; ULONG PageSize, Dummy, AllocationGranularity; SIZE_T StackReserveHeader, StackCommitHeader, GuardPageSize, GuaranteedStackCommit; - DPRINT("BaseCreateStack (hProcess: %lx, Max: %lx, Current: %lx)\n", + DPRINT("BaseCreateStack (hProcess: %p, Max: %lx, Current: %lx)\n", hProcess, StackReserve, StackCommit); /* Read page size */ @@ -709,7 +709,7 @@ NtClose(hFile); /* Return status */ - DPRINT("Section: %lx for file: %lx\n", *hSection, hFile); + DPRINT("Section: %p for file: %p\n", *hSection, hFile); return Status; } Modified: trunk/reactos/dll/win32/kernel32/include/baseheap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/baseheap.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/baseheap.h [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -48,7 +48,7 @@ BH_PRINT("[BASE_HEAP] %s : Allocated %p\n", \ __FUNCTION__, x) #define BASE_TRACE_PTR(x, y) \ - BH_PRINT("[BASE_HEAP] %s : Using handle: %lx for pointer: %p\n", \ + BH_PRINT("[BASE_HEAP] %s : Using handle: %p for pointer: %p\n", \ __FUNCTION__, x, y) #define BASE_TRACE_HANDLE(x, y) \ BH_PRINT("[BASE_HEAP] %s : Using handle: %lx for block: %p\n", \ Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -2702,7 +2702,7 @@ NTSTATUS Status; int Ret; - swprintf(szPath, L"\\REGISTRY\\Machine\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Telephony\\Country List\\%d", Location); + swprintf(szPath, L"\\REGISTRY\\Machine\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Telephony\\Country List\\%lu", Location); hKey = NLS_RegOpenKey(0, szPath); if (!hKey) Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -1713,7 +1713,7 @@ } } - DPRINT1("Could not get codepage name. dwResId = %ld\n", dwResId); + DPRINT1("Could not get codepage name. dwResId = %lu\n", dwResId); return FALSE; }

1 0

[ion] 59880: [KERNEL32]: Passing flag 0 to QueryActCtx is valid, don't fail.
by ion＠svn.reactos.org 29 Aug '13

29 Aug '13

Author: ion Date: Thu Aug 29 20:14:43 2013 New Revision: 59880 URL: http://svn.reactos.org/svn/reactos?rev=59880&view=rev Log: [KERNEL32]: Passing flag 0 to QueryActCtx is valid, don't fail. Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Thu Aug 29 20:14:43 2013 @@ -385,6 +385,8 @@ break; case QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS: NativeFlags = RTL_QUERY_ACTIVATION_CONTEXT_FLAG_IS_ADDRESS; + break; + case 0: break; /* More than one flag is set... */

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