Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 59859: [NDK]: Fix Vista vs Server 2003 definition of SECTION_IMAGE_INFORMATION. [NTOSKRNL]: Gut out almost all the fields in the ReactOS-specific MM_IMAGE_SECTION, and replace them with the N...
by ion＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: ion Date: Wed Aug 28 21:09:16 2013 New Revision: 59859 URL: http://svn.reactos.org/svn/reactos?rev=59859&view=rev Log: [NDK]: Fix Vista vs Server 2003 definition of SECTION_IMAGE_INFORMATION. [NTOSKRNL]: Gut out almost all the fields in the ReactOS-specific MM_IMAGE_SECTION, and replace them with the NT SECTION_IMAGE_INFORMATION structure instead. Make NtQuerySection simply return a copy of these fields (as on Windows). [NTOSKRNL]: Update the PE loader code to now store information in SECTION_IMAGE_INFORMATION. Also store LoaderFlags and DllCharacteristics, which were not stored/returned to users before (in NtQuerySection). [NTOSKRNL]: An entrypoint of NULL should also set ImageContainsCode to FALSE. [NTOSKRNL]: Implement MmGetImageInformation, which is used by NtQueryInformationProcess(ProcessImageInformation). Also implement this latter info class. [NTOSKRNL]: Delete ps_i.h, nobody uses this anymore. Modified: trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ps_i.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -343,11 +343,30 @@ USHORT ImageCharacteristics; USHORT DllCharacteristics; USHORT Machine; - UCHAR ImageContainsCode; - UCHAR Spare1; + BOOLEAN ImageContainsCode; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { + struct + { + UCHAR ComPlusNativeReady:1; + UCHAR ComPlusILOnly:1; + UCHAR ImageDynamicallyRelocated:1; + UCHAR ImageMappedFlat:1; + UCHAR Reserved:4; + }; + UCHAR ImageFlags; + }; +#else + BOOLEAN Spare1; +#endif ULONG LoaderFlags; ULONG ImageFileSize; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG CheckSum; +#else ULONG Reserved[1]; +#endif } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; #ifndef NTOS_MODE_USER Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -216,18 +216,9 @@ typedef struct _MM_IMAGE_SECTION_OBJECT { - ULONG_PTR ImageBase; - ULONG_PTR StackReserve; - ULONG_PTR StackCommit; - ULONG_PTR EntryPoint; - USHORT Subsystem; - USHORT ImageCharacteristics; - USHORT MinorSubsystemVersion; - USHORT MajorSubsystemVersion; - USHORT Machine; - BOOLEAN Executable; + SECTION_IMAGE_INFORMATION ImageInformation; + PVOID BasedAddress; ULONG NrSegments; - ULONG ImageSize; PMM_SECTION_SEGMENT Segments; } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT; @@ -1548,6 +1539,12 @@ /* section.c *****************************************************************/ +VOID +NTAPI +MmGetImageInformation( + OUT PSECTION_IMAGE_INFORMATION ImageInformation +); + PFILE_OBJECT NTAPI MmGetFileObjectForSection( Modified: trunk/reactos/ntoskrnl/include/internal/ps_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_i.h [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -6,602 +6,3 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller (w3seek(a)reactos.org) */ - -// -// Process Information Classes -// -static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = -{ - /* ProcessBasicInformation */ - IQS_SAME - ( - PROCESS_BASIC_INFORMATION, - ULONG, - ICIF_QUERY - ), - - /* ProcessQuotaLimits */ - IQS_SAME - ( - QUOTA_LIMITS, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessIoCounters */ - IQS_SAME - ( - IO_COUNTERS, - ULONG, - ICIF_QUERY - ), - - /* ProcessVmCounters */ - IQS_SAME - ( - VM_COUNTERS, - ULONG, - ICIF_QUERY - ), - - /* ProcessTimes */ - IQS_SAME - ( - KERNEL_USER_TIMES, - ULONG, - ICIF_QUERY - ), - - /* ProcessBasePriority */ - IQS_SAME - ( - KPRIORITY, - ULONG, - ICIF_SET - ), - - /* ProcessRaisePriority */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_SET - ), - - /* ProcessDebugPort */ - IQS_SAME - ( - HANDLE, - ULONG, - ICIF_QUERY - ), - - /* ProcessExceptionPort */ - IQS_SAME - ( - HANDLE, - ULONG, - ICIF_SET - ), - - /* ProcessAccessToken */ - IQS_SAME - ( - PROCESS_ACCESS_TOKEN, - ULONG, - ICIF_SET - ), - - /* ProcessLdtInformation */ - IQS_SAME - ( - UCHAR, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessLdtSize */ - IQS_SAME - ( - UCHAR, - ULONG, - ICIF_SET - ), - - /* ProcessDefaultHardErrorMode */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessIoPortHandlers */ - IQS_SAME - ( - UCHAR, - ULONG, - ICIF_SET - ), - - /* ProcessPooledUsageAndLimits */ - IQS_SAME - ( - POOLED_USAGE_AND_LIMITS, - ULONG, - ICIF_QUERY - ), - - /* ProcessWorkingSetWatch */ - IQS_SAME - ( - PROCESS_WS_WATCH_INFORMATION, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessUserModeIOPL */ - IQS_SAME - ( - UCHAR, - ULONG, - ICIF_SET - ), - - /* ProcessEnableAlignmentFaultFixup */ - IQS_SAME - ( - BOOLEAN, - ULONG, - ICIF_SET - ), - - /* ProcessPriorityClass */ - IQS_SAME - ( - PROCESS_PRIORITY_CLASS, - USHORT, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessWx86Information */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ProcessHandleCount */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ProcessAffinityMask */ - IQS_SAME - ( - KAFFINITY, - ULONG, - ICIF_SET - ), - - /* ProcessPriorityBoost */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessDeviceMap */ - IQS - ( - ((PROCESS_DEVICEMAP_INFORMATION*)0)->Query, - ((PROCESS_DEVICEMAP_INFORMATION*)0)->Set, - ULONG, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessSessionInformation */ - IQS_SAME - ( - PROCESS_SESSION_INFORMATION, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessForegroundInformation */ - IQS_SAME - ( - BOOLEAN, - ULONG, - ICIF_SET - ), - - /* ProcessWow64Information */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ProcessImageFileName */ - IQS_SAME - ( - UNICODE_STRING, - ULONG, - ICIF_QUERY | ICIF_SIZE_VARIABLE - ), - - /* ProcessLUIDDeviceMapsEnabled */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessBreakOnTermination */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessDebugObjectHandle */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessDebugFlags */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessHandleTracing */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessIoPriority */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessExecuteFlags */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessTlsInformation */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessCookie */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessImageInformation */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessCycleTime */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessPagePriority */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessInstrumentationCallback */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), -}; - -// -// Thread Information Classes -// -static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = -{ - /* ThreadBasicInformation */ - IQS_SAME - ( - THREAD_BASIC_INFORMATION, - ULONG, - ICIF_QUERY - ), - - /* ThreadTimes */ - IQS_SAME - ( - KERNEL_USER_TIMES, - ULONG, - ICIF_QUERY - ), - - /* ThreadPriority */ - IQS_SAME - ( - KPRIORITY, - ULONG, - ICIF_QUERY - ), - - /* ThreadBasePriority */ - IQS_SAME - ( - LONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadAffinityMask */ - IQS_SAME - ( - KAFFINITY, - ULONG, - ICIF_QUERY - ), - - /* ThreadImpersonationToken */ - IQS_SAME - ( - HANDLE, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ThreadDescriptorTableEntry */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadEnableAlignmentFaultFixup */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadEventPair_Reusable */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadQuerySetWin32StartAddress */ - IQS_SAME - ( - PVOID, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ThreadZeroTlsCell */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadPerformanceCount */ - IQS_SAME - ( - LARGE_INTEGER, - ULONG, - ICIF_QUERY - ), - - /* ThreadAmILastThread */ - IQS_SAME - ( - BOOLEAN, - BOOLEAN, - ICIF_QUERY - ), - - /* ThreadIdealProcessor */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadPriorityBoost */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadSetTlsArrayAddress */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadIsIoPending */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadHideFromDebugger */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - - /* ThreadPriorityBoost */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadSetTlsArrayAddress */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadIsIoPending */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadHideFromDebugger */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadBreakOnTermination */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadSwitchLegacyState */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadIsTerminated */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadLastSystemCall */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadIoPriority */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadCycleTime */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadPagePriority */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadActualBasePriority */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadTebInformation */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadCSwitchMon */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), -}; Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -1495,6 +1495,22 @@ return ((PROS_SECTION_OBJECT)SectionObject)->FileObject; } +VOID +NTAPI +MmGetImageInformation (OUT PSECTION_IMAGE_INFORMATION ImageInformation) +{ + PSECTION_OBJECT SectionObject; + + /* Get the section object of this process*/ + SectionObject = PsGetCurrentProcess()->SectionObject; + ASSERT(SectionObject != NULL); + ASSERT(MiIsRosSectionObject(SectionObject) == TRUE); + + /* Return the image information */ + DPRINT1("HERE!\n"); + *ImageInformation = ((PROS_SECTION_OBJECT)SectionObject)->ImageSection->ImageInformation; +} + NTSTATUS NTAPI MmGetFileNameForFileObject(IN PFILE_OBJECT FileObject, Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -156,7 +156,7 @@ } /* Reserve system PTEs needed */ - PteCount = ROUND_TO_PAGES(Section->ImageSection->ImageSize) >> PAGE_SHIFT; + PteCount = ROUND_TO_PAGES(Section->ImageSection->ImageInformation.ImageFileSize) >> PAGE_SHIFT; PointerPte = MiReserveSystemPtes(PteCount, SystemPteSpace); if (!PointerPte) { @@ -3040,7 +3040,7 @@ ASSERT(Status != STATUS_ALREADY_COMMITTED); /* Get the size of the driver */ - DriverSize = ((PROS_SECTION_OBJECT)Section)->ImageSection->ImageSize; + DriverSize = ((PROS_SECTION_OBJECT)Section)->ImageSection->ImageInformation.ImageFileSize; /* Make sure we're not being loaded into session space */ if (!Flags) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -199,6 +199,7 @@ ULONG cbHeadersSize = 0; ULONG nSectionAlignment; ULONG nFileAlignment; + ULONG ImageBase; const IMAGE_DOS_HEADER * pidhDosHeader; const IMAGE_NT_HEADERS32 * pinhNtHeader; const IMAGE_OPTIONAL_HEADER32 * piohOptHeader; @@ -389,17 +390,54 @@ /* PE32 */ case IMAGE_NT_OPTIONAL_HDR32_MAGIC: { - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, ImageBase)) - ImageSectionObject->ImageBase = piohOptHeader->ImageBase; + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, ImageBase)) + ImageBase = piohOptHeader->ImageBase; if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfImage)) - ImageSectionObject->ImageSize = piohOptHeader->SizeOfImage; + ImageSectionObject->ImageInformation.ImageFileSize = piohOptHeader->SizeOfImage; if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfStackReserve)) - ImageSectionObject->StackReserve = piohOptHeader->SizeOfStackReserve; + ImageSectionObject->ImageInformation.MaximumStackSize = piohOptHeader->SizeOfStackReserve; if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfStackCommit)) - ImageSectionObject->StackCommit = piohOptHeader->SizeOfStackCommit; + ImageSectionObject->ImageInformation.CommittedStackSize = piohOptHeader->SizeOfStackCommit; + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) + { + ImageSectionObject->ImageInformation.SubSystemType = piohOptHeader->Subsystem; + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MinorSubsystemVersion) && + RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MajorSubsystemVersion)) + { + ImageSectionObject->ImageInformation.SubSystemMinorVersion = piohOptHeader->MinorSubsystemVersion; + ImageSectionObject->ImageInformation.SubSystemMajorVersion = piohOptHeader->MajorSubsystemVersion; + } + } + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) + { + ImageSectionObject->ImageInformation.TransferAddress = (PVOID) (ImageBase + + piohOptHeader->AddressOfEntryPoint); + } + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) + ImageSectionObject->ImageInformation.ImageContainsCode = piohOptHeader->SizeOfCode != 0; + else + ImageSectionObject->ImageInformation.ImageContainsCode = TRUE; + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) + { + if (piohOptHeader->AddressOfEntryPoint == 0) + { + ImageSectionObject->ImageInformation.ImageContainsCode = FALSE; + } + } + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, LoaderFlags)) + ImageSectionObject->ImageInformation.LoaderFlags = piohOptHeader->LoaderFlags; + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, DllCharacteristics)) + ImageSectionObject->ImageInformation.DllCharacteristics = piohOptHeader->DllCharacteristics; break; } @@ -413,10 +451,9 @@ if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, ImageBase)) { + ImageBase = pioh64OptHeader->ImageBase; if(pioh64OptHeader->ImageBase > MAXULONG_PTR) DIE(("ImageBase exceeds the address space\n")); - - ImageSectionObject->ImageBase = (ULONG_PTR)pioh64OptHeader->ImageBase; } if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfImage)) @@ -424,7 +461,7 @@ if(pioh64OptHeader->SizeOfImage > MAXULONG_PTR) DIE(("SizeOfImage exceeds the address space\n")); - ImageSectionObject->ImageSize = pioh64OptHeader->SizeOfImage; + ImageSectionObject->ImageInformation.ImageFileSize = pioh64OptHeader->SizeOfImage; } if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfStackReserve)) @@ -432,7 +469,7 @@ if(pioh64OptHeader->SizeOfStackReserve > MAXULONG_PTR) DIE(("SizeOfStackReserve exceeds the address space\n")); - ImageSectionObject->StackReserve = (ULONG_PTR)pioh64OptHeader->SizeOfStackReserve; + ImageSectionObject->ImageInformation.MaximumStackSize = (ULONG_PTR) pioh64OptHeader->SizeOfStackReserve; } if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfStackCommit)) @@ -440,42 +477,59 @@ if(pioh64OptHeader->SizeOfStackCommit > MAXULONG_PTR) DIE(("SizeOfStackCommit exceeds the address space\n")); - ImageSectionObject->StackCommit = (ULONG_PTR)pioh64OptHeader->SizeOfStackCommit; + ImageSectionObject->ImageInformation.CommittedStackSize = (ULONG_PTR) pioh64OptHeader->SizeOfStackCommit; } + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, Subsystem)) + { + ImageSectionObject->ImageInformation.SubSystemType = pioh64OptHeader->Subsystem; + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, MinorSubsystemVersion) && + RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, MajorSubsystemVersion)) + { + ImageSectionObject->ImageInformation.SubSystemMinorVersion = pioh64OptHeader->MinorSubsystemVersion; + ImageSectionObject->ImageInformation.SubSystemMajorVersion = pioh64OptHeader->MajorSubsystemVersion; + } + } + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, AddressOfEntryPoint)) + { + ImageSectionObject->ImageInformation.TransferAddress = (PVOID) (ImageBase + + pioh64OptHeader->AddressOfEntryPoint); + } + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfCode)) + ImageSectionObject->ImageInformation.ImageContainsCode = pioh64OptHeader->SizeOfCode != 0; + else + ImageSectionObject->ImageInformation.ImageContainsCode = TRUE; + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, AddressOfEntryPoint)) + { + if (pioh64OptHeader->AddressOfEntryPoint == 0) + { + ImageSectionObject->ImageInformation.ImageContainsCode = FALSE; + } + } + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, LoaderFlags)) + ImageSectionObject->ImageInformation.LoaderFlags = pioh64OptHeader->LoaderFlags; + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, DllCharacteristics)) + ImageSectionObject->ImageInformation.DllCharacteristics = pioh64OptHeader->DllCharacteristics; break; } } /* [1], section 3.4.2 */ - if((ULONG_PTR)ImageSectionObject->ImageBase % 0x10000) + if((ULONG_PTR)ImageBase % 0x10000) DIE(("ImageBase is not aligned on a 64KB boundary")); - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) - { - ImageSectionObject->Subsystem = piohOptHeader->Subsystem; - - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MinorSubsystemVersion) && - RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MajorSubsystemVersion)) - { - ImageSectionObject->MinorSubsystemVersion = piohOptHeader->MinorSubsystemVersion; - ImageSectionObject->MajorSubsystemVersion = piohOptHeader->MajorSubsystemVersion; - } - } - - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) - { - ImageSectionObject->EntryPoint = ImageSectionObject->ImageBase + - piohOptHeader->AddressOfEntryPoint; - } - - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) - ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0; - else - ImageSectionObject->Executable = TRUE; - - ImageSectionObject->ImageCharacteristics = pinhNtHeader->FileHeader.Characteristics; - ImageSectionObject->Machine = pinhNtHeader->FileHeader.Machine; + ImageSectionObject->ImageInformation.ImageCharacteristics = pinhNtHeader->FileHeader.Characteristics; + ImageSectionObject->ImageInformation.Machine = pinhNtHeader->FileHeader.Machine; + ImageSectionObject->ImageInformation.GpValue = 0; + ImageSectionObject->ImageInformation.ZeroBits = 0; + ImageSectionObject->BasedAddress = (PVOID)ImageBase; /* SECTION HEADERS */ nStatus = STATUS_INVALID_IMAGE_FORMAT; @@ -3597,18 +3651,18 @@ * Some defaults */ /* FIXME? are these values platform-dependent? */ - if(ImageSectionObject->StackReserve == 0) - ImageSectionObject->StackReserve = 0x40000; - - if(ImageSectionObject->StackCommit == 0) - ImageSectionObject->StackCommit = 0x1000; - - if(ImageSectionObject->ImageBase == 0) - { - if(ImageSectionObject->ImageCharacteristics & IMAGE_FILE_DLL) - ImageSectionObject->ImageBase = 0x10000000; + if (ImageSectionObject->ImageInformation.MaximumStackSize == 0) + ImageSectionObject->ImageInformation.MaximumStackSize = 0x40000; + + if(ImageSectionObject->ImageInformation.CommittedStackSize == 0) + ImageSectionObject->ImageInformation.CommittedStackSize = 0x1000; + + if(ImageSectionObject->BasedAddress == NULL) + { + if(ImageSectionObject->ImageInformation.ImageCharacteristics & IMAGE_FILE_DLL) + ImageSectionObject->BasedAddress = (PVOID)0x10000000; else - ImageSectionObject->ImageBase = 0x00400000; + ImageSectionObject->BasedAddress = (PVOID)0x00400000; } /* @@ -4237,21 +4291,12 @@ _SEH2_TRY { - memset(Sii, 0, sizeof(SECTION_IMAGE_INFORMATION)); if (Section->AllocationAttributes & SEC_IMAGE) { PMM_IMAGE_SECTION_OBJECT ImageSectionObject; ImageSectionObject = Section->ImageSection; - Sii->TransferAddress = (PVOID)ImageSectionObject->EntryPoint; - Sii->MaximumStackSize = ImageSectionObject->StackReserve; - Sii->CommittedStackSize = ImageSectionObject->StackCommit; - Sii->SubSystemType = ImageSectionObject->Subsystem; - Sii->SubSystemMinorVersion = ImageSectionObject->MinorSubsystemVersion; - Sii->SubSystemMajorVersion = ImageSectionObject->MajorSubsystemVersion; - Sii->ImageCharacteristics = ImageSectionObject->ImageCharacteristics; - Sii->Machine = ImageSectionObject->Machine; - Sii->ImageContainsCode = ImageSectionObject->Executable; + *Sii = ImageSectionObject->ImageInformation; } if (ResultLength != NULL) @@ -4386,11 +4431,10 @@ SectionSegments = ImageSectionObject->Segments; NrSegments = ImageSectionObject->NrSegments; - ImageBase = (ULONG_PTR)*BaseAddress; if (ImageBase == 0) { - ImageBase = ImageSectionObject->ImageBase; + ImageBase = (ULONG_PTR)ImageSectionObject->BasedAddress; } ImageSize = 0; @@ -4405,7 +4449,7 @@ } } - ImageSectionObject->ImageSize = (ULONG)ImageSize; + ImageSectionObject->ImageInformation.ImageFileSize = (ULONG)ImageSize; /* Check for an illegal base address */ if ((ImageBase + ImageSize) > (ULONG_PTR)MmHighestUserAddress) Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=59… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -16,9 +16,6 @@ /* FIXME: From winbase.h... what to do? */ #define SEM_NOALIGNMENTFAULTEXCEPT 0x04 - -/* Include Information Class Tables */ -#include "internal/ps_i.h" /* Debugging Level */ ULONG PspTraceLevel = 0; @@ -108,7 +105,8 @@ _SEH2_END; } - if((ProcessInformationClass == ProcessCookie) && + if (((ProcessInformationClass == ProcessCookie) || + (ProcessInformationClass == ProcessImageInformation)) && (ProcessHandle != NtCurrentProcess())) { /* @@ -823,8 +821,30 @@ break; case ProcessImageInformation: - DPRINT1("Image Information Query Not implemented: %lx\n", ProcessInformationClass); - Status = STATUS_NOT_IMPLEMENTED; + + /* Set the length required and validate it */ + Length = sizeof(SECTION_IMAGE_INFORMATION); + if (ProcessInformationLength != Length) + { + /* Break out */ + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH to protect write */ + _SEH2_TRY + { + MmGetImageInformation((PSECTION_IMAGE_INFORMATION)ProcessInformation); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Indicate success */ + Status = STATUS_SUCCESS; break; case ProcessDebugObjectHandle:

1 0

[hbelusca] 59858: Just fix a typo.
by hbelusca＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: hbelusca Date: Wed Aug 28 20:12:35 2013 New Revision: 59858 URL: http://svn.reactos.org/svn/reactos?rev=59858&view=rev Log: Just fix a typo. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Aug 28 20:12:35 2013 @@ -360,7 +360,7 @@ SIZE_T MmTotalCommitLimitMaximum; /* - * These value tune certain user parameters. They have default values set here, + * These values tune certain user parameters. They have default values set here, * as well as in the code, and can be overwritten by registry settings. */ SIZE_T MmHeapSegmentReserve = 1 * _1MB;

1 0

[ion] 59857: [RTL]: Correctly read PEB or Kernel Variables for Heap Tuning. [NTOSKRNL]: MmCreatePeb should correctly fill out the Heap PEB parameters. [NTOSKRNL]: MmInitSystem and mminit.c should c...
by ion＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: ion Date: Wed Aug 28 18:57:29 2013 New Revision: 59857 URL: http://svn.reactos.org/svn/reactos?rev=59857&view=rev Log: [RTL]: Correctly read PEB or Kernel Variables for Heap Tuning. [NTOSKRNL]: MmCreatePeb should correctly fill out the Heap PEB parameters. [NTOSKRNL]: MmInitSystem and mminit.c should correctly initialize and hold the Heap Tuning Parameters. [NTOSKRNL]: CmControlVector should read the registry Heap Tuning Parameters into the real Mm variables, instaed of "Dummy". This removes heap hacks and makes Windows NTDLL happy. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -173,6 +173,22 @@ /* meaningless in user mode */ } #endif + +VOID +NTAPI +RtlpSetHeapParameters(IN PRTL_HEAP_PARAMETERS Parameters) +{ + PPEB Peb; + + /* Get PEB */ + Peb = RtlGetCurrentPeb(); + + /* Apply defaults for non-set parameters */ + if (!Parameters->SegmentCommit) Parameters->SegmentCommit = Peb->HeapSegmentCommit; + if (!Parameters->SegmentReserve) Parameters->SegmentReserve = Peb->HeapSegmentReserve; + if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = Peb->HeapDeCommitFreeBlockThreshold; + if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = Peb->HeapDeCommitTotalFreeThreshold; +} BOOLEAN NTAPI Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=59857&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -1223,7 +1223,6 @@ PVOID CommittedAddress = NULL, UncommittedAddress = NULL; PHEAP Heap = NULL; RTL_HEAP_PARAMETERS SafeParams = {0}; - PPEB Peb; ULONG_PTR MaximumUserModeAddress; SYSTEM_BASIC_INFORMATION SystemInformation; MEMORY_BASIC_INFORMATION MemoryInfo; @@ -1276,32 +1275,10 @@ if (NtGlobalFlags & FLG_USER_STACK_TRACE_DB) Flags |= HEAP_CAPTURE_STACK_BACKTRACES; - - /* Get PEB */ - Peb = RtlGetCurrentPeb(); - - /* Apply defaults for non-set parameters */ - if (!Parameters->SegmentCommit) Parameters->SegmentCommit = Peb->HeapSegmentCommit; - if (!Parameters->SegmentReserve) Parameters->SegmentReserve = Peb->HeapSegmentReserve; - if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = Peb->HeapDeCommitFreeBlockThreshold; - if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = Peb->HeapDeCommitTotalFreeThreshold; - } - else - { - /* Apply defaults for non-set parameters */ -#if 0 - if (!Parameters->SegmentCommit) Parameters->SegmentCommit = MmHeapSegmentCommit; - if (!Parameters->SegmentReserve) Parameters->SegmentReserve = MmHeapSegmentReserve; - if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold; - if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; -#endif - } - - // FIXME: Move to memory manager - if (!Parameters->SegmentCommit) Parameters->SegmentCommit = PAGE_SIZE * 2; - if (!Parameters->SegmentReserve) Parameters->SegmentReserve = 1048576; - if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = PAGE_SIZE; - if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = 65536; + } + + /* Set tunable parameters */ + RtlpSetHeapParameters(Parameters); /* Get the max um address */ Status = ZwQuerySystemInformation(SystemBasicInformation, Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=59857&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -52,6 +52,10 @@ VOID NTAPI +RtlpSetHeapParameters(IN PRTL_HEAP_PARAMETERS Parameters); + +VOID +NTAPI RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); BOOLEAN Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -523,6 +523,14 @@ }, { + L"Session Manager\\Memory Management", + L"MinimumStackCommitInBytes", + &MmMinimumStackCommitInBytes, + NULL, + NULL + }, + + { L"Session Manager\\Executive", L"AdditionalCriticalWorkerThreads", &DummyData, @@ -613,7 +621,7 @@ { L"Session Manager", L"CriticalSectionTimeout", - &DummyData, + &MmCritsectTimeoutSeconds, NULL, NULL }, @@ -621,15 +629,14 @@ { L"Session Manager", L"HeapSegmentReserve", - &DummyData, - NULL, - NULL - }, - + &MmHeapSegmentReserve, + NULL, + NULL + }, { L"Session Manager", L"HeapSegmentCommit", - &DummyData, + &MmHeapSegmentCommit, NULL, NULL }, @@ -637,7 +644,7 @@ { L"Session Manager", L"HeapDeCommitTotalFreeThreshold", - &DummyData, + &MmHeapDeCommitTotalFreeThreshold, NULL, NULL }, @@ -645,7 +652,7 @@ { L"Session Manager", L"HeapDeCommitFreeBlockThreshold", - &DummyData, + &MmHeapDeCommitFreeBlockThreshold, NULL, NULL }, Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -680,11 +680,13 @@ extern PFN_NUMBER MiHighNonPagedPoolThreshold; extern PFN_NUMBER MmMinimumFreePages; extern PFN_NUMBER MmPlentyFreePages; +extern SIZE_T MmMinimumStackCommitInBytes; extern PFN_COUNT MiExpansionPoolPagesInitialCharge; extern PFN_NUMBER MmResidentAvailablePages; extern PFN_NUMBER MmResidentAvailableAtInit; extern ULONG MmTotalFreeSystemPtes[MaximumPtePoolTypes]; extern PFN_NUMBER MmTotalSystemDriverPages; +extern ULONG MmCritsectTimeoutSeconds; extern PVOID MiSessionImageStart; extern PVOID MiSessionImageEnd; extern PMMPTE MiHighestUserPte; Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -358,6 +358,16 @@ // FIXME: They should be moved elsewhere since it's not an "init" setting? SIZE_T MmTotalCommitLimit; SIZE_T MmTotalCommitLimitMaximum; + +/* + * These value tune certain user parameters. They have default values set here, + * as well as in the code, and can be overwritten by registry settings. + */ +SIZE_T MmHeapSegmentReserve = 1 * _1MB; +SIZE_T MmHeapSegmentCommit = 2 * PAGE_SIZE; +SIZE_T MmHeapDeCommitTotalFreeThreshold = 64 * _1KB; +SIZE_T MmHeapDeCommitFreeBlockThreshold = PAGE_SIZE; +SIZE_T MmMinimumStackCommitInBytes = 0; /* Internal setting used for debugging memory descriptors */ BOOLEAN MiDbgEnableMdDump = @@ -2176,6 +2186,27 @@ DPRINT("System PTE count has been tuned to %d (%d bytes)\n", MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); + /* Check if no values are set for the heap limits */ + if (MmHeapSegmentReserve == 0) + { + MmHeapSegmentReserve = 2 * _1MB; + } + + if (MmHeapSegmentCommit == 0) + { + MmHeapSegmentCommit = 2 * PAGE_SIZE; + } + + if (MmHeapDeCommitTotalFreeThreshold == 0) + { + MmHeapDeCommitTotalFreeThreshold = 64 * _1KB; + } + + if (MmHeapDeCommitFreeBlockThreshold == 0) + { + MmHeapDeCommitFreeBlockThreshold = PAGE_SIZE; + } + /* Initialize the working set lock */ ExInitializePushLock(&MmSystemCacheWs.WorkingSetMutex); Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -687,13 +687,12 @@ Peb->NumberOfProcessors = KeNumberProcessors; Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL); Peb->NtGlobalFlag = NtGlobalFlag; - /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; - Peb->HeapSegmentCommit = MmHeapSegmentCommit; - Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; - Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold;*/ + Peb->HeapSegmentReserve = MmHeapSegmentReserve; + Peb->HeapSegmentCommit = MmHeapSegmentCommit; + Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; + Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold; Peb->CriticalSectionTimeout = MmCriticalSectionTimeout; - /*Peb->MinimumStackCommit = MmMinimumStackCommitInBytes; - */ + Peb->MinimumStackCommit = MmMinimumStackCommitInBytes; Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); Peb->ProcessHeaps = (PVOID*)(Peb + 1); Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -234,6 +234,17 @@ } } #endif + +VOID +NTAPI +RtlpSetHeapParameters(IN PRTL_HEAP_PARAMETERS Parameters) +{ + /* Apply defaults for non-set parameters */ + if (!Parameters->SegmentCommit) Parameters->SegmentCommit = MmHeapSegmentCommit; + if (!Parameters->SegmentReserve) Parameters->SegmentReserve = MmHeapSegmentReserve; + if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold; + if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; +} VOID NTAPI

1 0

[aandrejevic] 59856: [SOFT386] Implement short conditional jump opcodes.
by aandrejevic＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: aandrejevic Date: Wed Aug 28 17:52:21 2013 New Revision: 59856 URL: http://svn.reactos.org/svn/reactos?rev=59856&view=rev Log: [SOFT386] Implement short conditional jump opcodes. 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] Wed Aug 28 17:52:21 2013 @@ -136,22 +136,22 @@ NULL, // TODO: OPCODE 0x6D NOT SUPPORTED NULL, // TODO: OPCODE 0x6E NOT SUPPORTED NULL, // TODO: OPCODE 0x6F NOT SUPPORTED - NULL, // TODO: OPCODE 0x70 NOT SUPPORTED - NULL, // TODO: OPCODE 0x71 NOT SUPPORTED - NULL, // TODO: OPCODE 0x72 NOT SUPPORTED - NULL, // TODO: OPCODE 0x73 NOT SUPPORTED - NULL, // TODO: OPCODE 0x74 NOT SUPPORTED - NULL, // TODO: OPCODE 0x75 NOT SUPPORTED - NULL, // TODO: OPCODE 0x76 NOT SUPPORTED - NULL, // TODO: OPCODE 0x77 NOT SUPPORTED - NULL, // TODO: OPCODE 0x78 NOT SUPPORTED - NULL, // TODO: OPCODE 0x79 NOT SUPPORTED - NULL, // TODO: OPCODE 0x7A NOT SUPPORTED - NULL, // TODO: OPCODE 0x7B NOT SUPPORTED - NULL, // TODO: OPCODE 0x7C NOT SUPPORTED - NULL, // TODO: OPCODE 0x7D NOT SUPPORTED - NULL, // TODO: OPCODE 0x7E NOT SUPPORTED - NULL, // TODO: OPCODE 0x7F NOT SUPPORTED + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, NULL, // TODO: OPCODE 0x80 NOT SUPPORTED NULL, // TODO: OPCODE 0x81 NOT SUPPORTED NULL, // TODO: OPCODE 0x82 NOT SUPPORTED @@ -648,3 +648,95 @@ return TRUE; } + +BOOLEAN +FASTCALL +Soft386OpcodeShortConditionalJmp(PSOFT386_STATE State, UCHAR Opcode) +{ + BOOLEAN Jump = FALSE; + CHAR Offset = 0; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xF0) == 0x70); + + /* Fetch the offset */ + if (!Soft386FetchByte(State, (PUCHAR)&Offset)) + { + /* An exception occurred */ + return FALSE; + } + + switch ((Opcode & 0x0F) >> 1) + { + /* JO / JNO */ + case 0: + { + Jump = State->Flags.Of; + break; + } + + /* JC / JNC */ + case 1: + { + Jump = State->Flags.Cf; + break; + } + + /* JZ / JNZ */ + case 2: + { + Jump = State->Flags.Zf; + break; + } + + /* JBE / JNBE */ + case 3: + { + Jump = State->Flags.Cf || State->Flags.Zf; + break; + } + + /* JS / JNS */ + case 4: + { + Jump = State->Flags.Sf; + break; + } + + /* JP / JNP */ + case 5: + { + Jump = State->Flags.Pf; + break; + } + + /* JL / JNL */ + case 6: + { + Jump = State->Flags.Sf != State->Flags.Of; + break; + } + + /* JLE / JNLE */ + case 7: + { + Jump = (State->Flags.Sf != State->Flags.Of) || State->Flags.Zf; + break; + } + } + + if ((Opcode & 0xF0) & 1) + { + /* Invert the result */ + Jump = !Jump; + } + + if (Jump) + { + /* Move the instruction pointer */ + State->InstPtr.Long += Offset; + } + + /* Return success */ + return TRUE; +} 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] Wed Aug 28 17:52:21 2013 @@ -79,4 +79,12 @@ UCHAR Opcode ); +BOOLEAN +FASTCALL +Soft386OpcodeShortConditionalJmp +( + PSOFT386_STATE State, + UCHAR Opcode +); + #endif // _OPCODES_H_

1 0

[hbelusca] 59855: [KERNEL32] - Add brackets around "case XXX:" so that I'm able to (un)fold regions of code when debugging and reading. - Temporarily skip AppCompat functionality added by Alex, in ...
by hbelusca＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: hbelusca Date: Wed Aug 28 13:23:09 2013 New Revision: 59855 URL: http://svn.reactos.org/svn/reactos?rev=59855&view=rev Log: [KERNEL32] - Add brackets around "case XXX:" so that I'm able to (un)fold regions of code when debugging and reading. - Temporarily skip AppCompat functionality added by Alex, in order to "fix" (read: hack-fix) launch of .bat/.cmd files. Indeed, when .bat/.cmd files get started with the CreateProcess function, a call to NtCreateSection fails with status STATUS_INVALID_IMAGE_NOT_MZ, as expected (line 2952). But the new AppCompat code (lines 3028 and 3031-3033 and following, and 3114), executed whenever the status code from NtCreateSection is STATUS_SUCCESS or STATUS_INVALID_IMAGE_NOT_MZ or something else, overwrites the status code by other values, so that, after we return to the main code path (lines 3174 and following), the status code isn't STATUS_INVALID_IMAGE_NOT_MZ anymore but STATUS_SUCCESS or whatever, and then, we fail to run the .bat/.cmd file (that should be done at lines 3314-3316 and following). To Alex_Ionescu: Have a look at this and fix it properly!! Modified: trunk/reactos/dll/win32/kernel32/client/proc.c 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] Wed Aug 28 13:23:09 2013 @@ -2382,7 +2382,7 @@ /* Zero out the initial core variables and handles */ QuerySection = FALSE; InJob = FALSE; - SkipSaferAndAppCompat = FALSE; + SkipSaferAndAppCompat = TRUE; // HACK for making .bat/.cmd launch working again. ParameterFlags = 0; Flags = 0; DebugHandle = NULL; @@ -3174,6 +3174,7 @@ switch (Status) { case STATUS_INVALID_IMAGE_WIN_16: + { /* 16-bit binary. Should we use WOW or does the caller force VDM? */ if (!(dwCreationFlags & CREATE_FORCEDOS)) { @@ -3308,9 +3309,12 @@ } // There is no break here on purpose, so FORCEDOS drops down! + } + case STATUS_INVALID_IMAGE_PROTECT: case STATUS_INVALID_IMAGE_NOT_MZ: case STATUS_INVALID_IMAGE_NE_FORMAT: + { /* We're launching an executable application */ BinarySubType = BINARY_TYPE_EXE; @@ -3493,21 +3497,27 @@ /* We've already done all these checks, don't do them again */ SkipSaferAndAppCompat = TRUE; goto AppNameRetry; + } case STATUS_INVALID_IMAGE_WIN_64: + { /* 64-bit binaries are not allowed to run on 32-bit ReactOS */ DPRINT1("64-bit binary, failing\n"); SetLastError(ERROR_EXE_MACHINE_TYPE_MISMATCH); Result = FALSE; goto Quickie; + } case STATUS_FILE_IS_OFFLINE: + { /* Set the correct last error for this */ DPRINT1("File is offline, failing\n"); SetLastError(ERROR_FILE_OFFLINE); break; + } default: + { /* Any other error, convert it to a generic Win32 error */ if (!NT_SUCCESS(Status)) { @@ -3520,6 +3530,7 @@ /* Otherwise, this must be success */ ASSERT(Status == STATUS_SUCCESS); break; + } } /* Is this not a WOW application, but a WOW32 VDM was requested for it? */

1 0

[akhaldi] 59854: [CMAKE] * Add the proper subsystem version when using a recent MSVC toolchain.
by akhaldi＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: akhaldi Date: Wed Aug 28 12:32:09 2013 New Revision: 59854 URL: http://svn.reactos.org/svn/reactos?rev=59854&view=rev Log: [CMAKE] * Add the proper subsystem version when using a recent MSVC toolchain. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59854… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Aug 28 12:32:09 2013 @@ -100,7 +100,11 @@ endfunction() function(set_subsystem MODULE SUBSYSTEM) - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM}") + if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 17) + add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.0") + else() + add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM}") + endif() endfunction() function(set_image_base MODULE IMAGE_BASE)

1 0

[akhaldi] 59853: [CRT] * Annotate timeb_s.h.
by akhaldi＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: akhaldi Date: Wed Aug 28 11:52:25 2013 New Revision: 59853 URL: http://svn.reactos.org/svn/reactos?rev=59853&view=rev Log: [CRT] * Annotate timeb_s.h. Modified: trunk/reactos/include/crt/sec_api/sys/timeb_s.h Modified: trunk/reactos/include/crt/sec_api/sys/timeb_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/sys/ti… ============================================================================== --- trunk/reactos/include/crt/sec_api/sys/timeb_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/sys/timeb_s.h [iso-8859-1] Wed Aug 28 11:52:25 2013 @@ -15,8 +15,8 @@ #if defined(MINGW_HAS_SECURE_API) - _CRTIMP errno_t __cdecl _ftime32_s(struct __timeb32 *_Time); - _CRTIMP errno_t __cdecl _ftime64_s(struct __timeb64 *_Time); + _CRTIMP errno_t __cdecl _ftime32_s(_Out_ struct __timeb32 *_Time); + _CRTIMP errno_t __cdecl _ftime64_s(_Out_ struct __timeb64 *_Time); #ifndef _USE_32BIT_TIME_T #define _ftime_s _ftime64_s

1 0

[akhaldi] 59852: [PSDK] * Annotate imm.h.
by akhaldi＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: akhaldi Date: Wed Aug 28 11:25:44 2013 New Revision: 59852 URL: http://svn.reactos.org/svn/reactos?rev=59852&view=rev Log: [PSDK] * Annotate imm.h. Modified: trunk/reactos/include/psdk/imm.h Modified: trunk/reactos/include/psdk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imm.h?rev=598… ============================================================================== --- trunk/reactos/include/psdk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imm.h [iso-8859-1] Wed Aug 28 11:25:44 2013 @@ -38,8 +38,19 @@ LPWSTR lpWord; } REGISTERWORDW, *PREGISTERWORDW, *NPREGISTERWORDW, *LPREGISTERWORDW; -typedef int (CALLBACK *REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID); -typedef int (CALLBACK *REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID); +typedef int +(CALLBACK *REGISTERWORDENUMPROCA)( + _In_ LPCSTR, + _In_ DWORD, + _In_ LPCSTR, + _In_ LPVOID); + +typedef int +(CALLBACK *REGISTERWORDENUMPROCW)( + _In_ LPCWSTR, + _In_ DWORD, + _In_ LPCWSTR, + _In_ LPVOID); typedef struct tagCANDIDATEFORM { @@ -602,90 +613,311 @@ #define SOFTKEYBOARD_TYPE_C1 0x0002 -HIMC WINAPI ImmAssociateContext(HWND, HIMC); -BOOL WINAPI ImmAssociateContextEx(HWND, HIMC, DWORD); -BOOL WINAPI ImmConfigureIMEA(HKL, HWND, DWORD, LPVOID); -BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID); -#define ImmConfigureIME WINELIB_NAME_AW(ImmConfigureIME) -HIMC WINAPI ImmCreateContext(void); -BOOL WINAPI ImmDestroyContext(HIMC hIMC); -BOOL WINAPI ImmDisableIME(DWORD idThread); -BOOL WINAPI ImmEnumInputContext(DWORD, IMCENUMPROC, LPARAM); -UINT WINAPI ImmEnumRegisterWordA(HKL, REGISTERWORDENUMPROCA, LPCSTR, DWORD, LPCSTR, LPVOID); -UINT WINAPI ImmEnumRegisterWordW(HKL, REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); -#define ImmEnumRegisterWord WINELIB_NAME_AW(ImmEnumRegisterWord) -LRESULT WINAPI ImmEscapeA(HKL, HIMC, UINT, LPVOID); -LRESULT WINAPI ImmEscapeW(HKL, HIMC, UINT, LPVOID); -#define ImmEscape WINELIB_NAME_AW(ImmEscape) -DWORD WINAPI ImmGetCandidateListA(HIMC, DWORD, LPCANDIDATELIST, DWORD); -DWORD WINAPI ImmGetCandidateListW(HIMC, DWORD, LPCANDIDATELIST, DWORD); -#define ImmGetCandidateList WINELIB_NAME_AW(ImmGetCandidateList) -DWORD WINAPI ImmGetCandidateListCountA(HIMC, LPDWORD); -DWORD WINAPI ImmGetCandidateListCountW(HIMC, LPDWORD); -#define ImmGetCandidateListCount WINELIB_NAME_AW(ImmGetCandidateListCount) -BOOL WINAPI ImmGetCandidateWindow(HIMC, DWORD, LPCANDIDATEFORM); +HIMC WINAPI ImmAssociateContext(_In_ HWND, _In_ HIMC); +BOOL WINAPI ImmAssociateContextEx(_In_ HWND, _In_ HIMC, _In_ DWORD); + +BOOL WINAPI ImmConfigureIMEA(_In_ HKL, _In_ HWND, _In_ DWORD, _In_ LPVOID); +BOOL WINAPI ImmConfigureIMEW(_In_ HKL, _In_ HWND, _In_ DWORD, _In_ LPVOID); +#define ImmConfigureIME WINELIB_NAME_AW(ImmConfigureIME) + +HIMC WINAPI ImmCreateContext(void); +BOOL WINAPI ImmDestroyContext(_In_ HIMC hIMC); +BOOL WINAPI ImmDisableIME(_In_ DWORD idThread); +BOOL WINAPI ImmEnumInputContext(_In_ DWORD, _In_ IMCENUMPROC, _In_ LPARAM); + +UINT +WINAPI +ImmEnumRegisterWordA( + _In_ HKL, + _In_ REGISTERWORDENUMPROCA, + _In_opt_ LPCSTR lpszReading, + _In_ DWORD, + _In_opt_ LPCSTR lpszRegister, + _In_ LPVOID); + +UINT +WINAPI +ImmEnumRegisterWordW( + _In_ HKL, + _In_ REGISTERWORDENUMPROCW, + _In_opt_ LPCWSTR lpszReading, + _In_ DWORD, + _In_opt_ LPCWSTR lpszRegister, + _In_ LPVOID); + +#define ImmEnumRegisterWord WINELIB_NAME_AW(ImmEnumRegisterWord) + +LRESULT WINAPI ImmEscapeA(_In_ HKL, _In_ HIMC, _In_ UINT, _In_ LPVOID); +LRESULT WINAPI ImmEscapeW(_In_ HKL, _In_ HIMC, _In_ UINT, _In_ LPVOID); +#define ImmEscape WINELIB_NAME_AW(ImmEscape) + +DWORD +WINAPI +ImmGetCandidateListA( + _In_ HIMC, + _In_ DWORD deIndex, + _Out_writes_bytes_opt_(dwBufLen) LPCANDIDATELIST lpCandList, + _In_ DWORD dwBufLen); + +DWORD +WINAPI +ImmGetCandidateListW( + _In_ HIMC, + _In_ DWORD deIndex, + _Out_writes_bytes_opt_(dwBufLen) LPCANDIDATELIST lpCandList, + _In_ DWORD dwBufLen); + +#define ImmGetCandidateList WINELIB_NAME_AW(ImmGetCandidateList) + +DWORD WINAPI ImmGetCandidateListCountA(_In_ HIMC, _Out_ LPDWORD); +DWORD WINAPI ImmGetCandidateListCountW(_In_ HIMC, _Out_ LPDWORD); +#define ImmGetCandidateListCount WINELIB_NAME_AW(ImmGetCandidateListCount) + +BOOL +WINAPI +ImmGetCandidateWindow( + _In_ HIMC, + _In_ DWORD, + _Out_ LPCANDIDATEFORM lpCandidate); + #if defined(_WINGDI_) && !defined(NOGDI) -BOOL WINAPI ImmGetCompositionFontA(HIMC, LPLOGFONTA); -BOOL WINAPI ImmGetCompositionFontW(HIMC, LPLOGFONTW); -#define ImmGetCompositionFont WINELIB_NAME_AW(ImmGetCompositionFont) -BOOL WINAPI ImmSetCompositionFontA(HIMC, LPLOGFONTA); -BOOL WINAPI ImmSetCompositionFontW(HIMC, LPLOGFONTW); -#define ImmSetCompositionFont WINELIB_NAME_AW(ImmSetCompositionFont) + +BOOL WINAPI ImmGetCompositionFontA(_In_ HIMC, _Out_ LPLOGFONTA); +BOOL WINAPI ImmGetCompositionFontW(_In_ HIMC, _Out_ LPLOGFONTW); +#define ImmGetCompositionFont WINELIB_NAME_AW(ImmGetCompositionFont) + +BOOL WINAPI ImmSetCompositionFontA(_In_ HIMC, _In_ LPLOGFONTA); +BOOL WINAPI ImmSetCompositionFontW(_In_ HIMC, _In_ LPLOGFONTW); +#define ImmSetCompositionFont WINELIB_NAME_AW(ImmSetCompositionFont) + #endif -LONG WINAPI ImmGetCompositionStringA(HIMC, DWORD, LPVOID, DWORD); -LONG WINAPI ImmGetCompositionStringW(HIMC, DWORD, LPVOID, DWORD); -#define ImmGetCompositionString WINELIB_NAME_AW(ImmGetCompositionString) -BOOL WINAPI ImmGetCompositionWindow(HIMC, LPCOMPOSITIONFORM); -HIMC WINAPI ImmGetContext(HWND); -DWORD WINAPI ImmGetConversionListA(HKL, HIMC, LPCSTR, LPCANDIDATELIST, DWORD, UINT); -DWORD WINAPI ImmGetConversionListW(HKL, HIMC, LPCWSTR, LPCANDIDATELIST, DWORD, UINT); -#define ImmGetConversionList WINELIB_NAME_AW(ImmGetConversionList) -BOOL WINAPI ImmGetConversionStatus(HIMC, LPDWORD, LPDWORD); -HWND WINAPI ImmGetDefaultIMEWnd(HWND); -UINT WINAPI ImmGetDescriptionA(HKL, LPSTR, UINT); -UINT WINAPI ImmGetDescriptionW(HKL, LPWSTR, UINT); -#define ImmGetDescription WINELIB_NAME_AW(ImmGetDescription) -DWORD WINAPI ImmGetGuideLineA(HIMC, DWORD, LPSTR, DWORD); -DWORD WINAPI ImmGetGuideLineW(HIMC, DWORD, LPWSTR, DWORD); -#define ImmGetGuideLine WINELIB_NAME_AW(ImmGetGuideLine) -UINT WINAPI ImmGetIMEFileNameA(HKL, LPSTR, UINT); -UINT WINAPI ImmGetIMEFileNameW(HKL, LPWSTR, UINT); -#define ImmGetIMEFileName WINELIB_NAME_AW(ImmGetIMEFileName) -DWORD WINAPI ImmGetImeMenuItemsA(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOA, LPIMEMENUITEMINFOA, DWORD); -DWORD WINAPI ImmGetImeMenuItemsW(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMENUITEMINFOW, DWORD); -#define ImmGetImeMenuItems WINELIB_NAME_AW(ImmGetImeMenuItems) -BOOL WINAPI ImmGetOpenStatus(HIMC); -DWORD WINAPI ImmGetProperty(HKL, DWORD); -UINT WINAPI ImmGetRegisterWordStyleA(HKL, UINT, LPSTYLEBUFA); -UINT WINAPI ImmGetRegisterWordStyleW(HKL, UINT, LPSTYLEBUFW); -#define ImmGetRegisterWordStyle WINELIB_NAME_AW(ImmGetRegisterWordStyle) -BOOL WINAPI ImmGetStatusWindowPos(HIMC, LPPOINT); -UINT WINAPI ImmGetVirtualKey(HWND); -HKL WINAPI ImmInstallIMEA(LPCSTR, LPCSTR); -HKL WINAPI ImmInstallIMEW(LPCWSTR, LPCWSTR); -#define ImmInstallIME WINELIB_NAME_AW(ImmInstallIME) -BOOL WINAPI ImmIsIME(HKL); -BOOL WINAPI ImmIsUIMessageA(HWND, UINT, WPARAM, LPARAM); -BOOL WINAPI ImmIsUIMessageW(HWND, UINT, WPARAM, LPARAM); -#define ImmIsUIMessage WINELIB_NAME_AW(ImmIsUIMessage) -BOOL WINAPI ImmNotifyIME(HIMC, DWORD, DWORD, DWORD); + +LONG +WINAPI +ImmGetCompositionStringA( + _In_ HIMC, + _In_ DWORD, + _Out_writes_bytes_opt_(dwBufLen) LPVOID lpBuf, + _In_ DWORD dwBufLen); + +LONG +WINAPI +ImmGetCompositionStringW( + _In_ HIMC, + _In_ DWORD, + _Out_writes_bytes_opt_(dwBufLen) LPVOID lpBuf, + _In_ DWORD dwBufLen); + +#define ImmGetCompositionString WINELIB_NAME_AW(ImmGetCompositionString) + +BOOL WINAPI ImmGetCompositionWindow(_In_ HIMC, _Out_ LPCOMPOSITIONFORM); +HIMC WINAPI ImmGetContext(_In_ HWND); + +DWORD +WINAPI +ImmGetConversionListA( + _In_ HKL, + _In_ HIMC, + _In_ LPCSTR lpSrc, + _Out_writes_bytes_(dwBufLen) LPCANDIDATELIST lpDst, + _In_ DWORD dwBufLen, + _In_ UINT uFlag); + +DWORD +WINAPI +ImmGetConversionListW( + _In_ HKL, + _In_ HIMC, + _In_ LPCWSTR lpSrc, + _Out_writes_bytes_(dwBufLen) LPCANDIDATELIST lpDst, + _In_ DWORD dwBufLen, + _In_ UINT uFlag); + +#define ImmGetConversionList WINELIB_NAME_AW(ImmGetConversionList) + +BOOL +WINAPI +ImmGetConversionStatus( + _In_ HIMC, + _Out_opt_ LPDWORD lpfdwConversion, + _Out_opt_ LPDWORD lpfdwSentence); + +HWND WINAPI ImmGetDefaultIMEWnd(_In_ HWND); + +UINT +WINAPI +ImmGetDescriptionA( + _In_ HKL, + _Out_writes_opt_(uBufLen) LPSTR lpszDescription, + _In_ UINT uBufLen); + +UINT +WINAPI +ImmGetDescriptionW( + _In_ HKL, + _Out_writes_opt_(uBufLen) LPWSTR lpszDescription, + _In_ UINT uBufLen); + +#define ImmGetDescription WINELIB_NAME_AW(ImmGetDescription) + +DWORD +WINAPI +ImmGetGuideLineA( + _In_ HIMC, + _In_ DWORD dwIndex, + _Out_writes_bytes_opt_(dwBufLen) LPSTR lpBuf, + _In_ DWORD dwBufLen); + +DWORD +WINAPI +ImmGetGuideLineW( + _In_ HIMC, + _In_ DWORD dwIndex, + _Out_writes_bytes_opt_(dwBufLen) LPWSTR lpBuf, + _In_ DWORD dwBufLen); + +#define ImmGetGuideLine WINELIB_NAME_AW(ImmGetGuideLine) + +UINT +WINAPI +ImmGetIMEFileNameA( + _In_ HKL, + _Out_writes_opt_(uBufLen) LPSTR lpszFileName, + _In_ UINT uBufLen); + +UINT +WINAPI +ImmGetIMEFileNameW( + _In_ HKL, + _Out_writes_opt_(uBufLen) LPWSTR lpszFileName, + _In_ UINT uBufLen); + +#define ImmGetIMEFileName WINELIB_NAME_AW(ImmGetIMEFileName) + +DWORD +WINAPI +ImmGetImeMenuItemsA( + _In_ HIMC, + _In_ DWORD, + _In_ DWORD, + _Out_opt_ LPIMEMENUITEMINFOA lpImeParentMenu, + _Out_writes_bytes_opt_(dwSize) LPIMEMENUITEMINFOA lpImeMenu, + _In_ DWORD dwSize); + +DWORD +WINAPI +ImmGetImeMenuItemsW( + _In_ HIMC, + _In_ DWORD, + _In_ DWORD, + _Out_opt_ LPIMEMENUITEMINFOW lpImeParentMenu, + _Out_writes_bytes_opt_(dwSize) LPIMEMENUITEMINFOW lpImeMenu, + _In_ DWORD dwSize); + +#define ImmGetImeMenuItems WINELIB_NAME_AW(ImmGetImeMenuItems) + +BOOL WINAPI ImmGetOpenStatus(_In_ HIMC); +DWORD WINAPI ImmGetProperty(_In_ HKL, _In_ DWORD); + +UINT +WINAPI +ImmGetRegisterWordStyleA( + _In_ HKL, + _In_ UINT nItem, + _Out_writes_(nItem) LPSTYLEBUFA lpStyleBuf); + +UINT +WINAPI +ImmGetRegisterWordStyleW( + _In_ HKL, + _In_ UINT nItem, + _Out_writes_(nItem) LPSTYLEBUFW lpStyleBuf); + +#define ImmGetRegisterWordStyle WINELIB_NAME_AW(ImmGetRegisterWordStyle) + +BOOL WINAPI ImmGetStatusWindowPos(_In_ HIMC, _Out_ LPPOINT); +UINT WINAPI ImmGetVirtualKey(_In_ HWND); + +HKL WINAPI ImmInstallIMEA(_In_ LPCSTR, _In_ LPCSTR); +HKL WINAPI ImmInstallIMEW(_In_ LPCWSTR, _In_ LPCWSTR); +#define ImmInstallIME WINELIB_NAME_AW(ImmInstallIME) + +BOOL WINAPI ImmIsIME(_In_ HKL); + +BOOL WINAPI ImmIsUIMessageA(_In_ HWND, _In_ UINT, _In_ WPARAM, _In_ LPARAM); +BOOL WINAPI ImmIsUIMessageW(_In_ HWND, _In_ UINT, _In_ WPARAM, _In_ LPARAM); +#define ImmIsUIMessage WINELIB_NAME_AW(ImmIsUIMessage) + +BOOL WINAPI ImmNotifyIME(_In_ HIMC, _In_ DWORD, _In_ DWORD, _In_ DWORD); + BOOL WINAPI ImmProcessKey(HWND, HKL, UINT, LPARAM, DWORD); -BOOL WINAPI ImmRegisterWordA(HKL, LPCSTR, DWORD, LPCSTR); -BOOL WINAPI ImmRegisterWordW(HKL, LPCWSTR, DWORD, LPCWSTR); -#define ImmRegisterWord WINELIB_NAME_AW(ImmRegisterWord) -BOOL WINAPI ImmReleaseContext(HWND, HIMC); -BOOL WINAPI ImmSetCandidateWindow(HIMC, LPCANDIDATEFORM); -BOOL WINAPI ImmSetCompositionStringA(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD); -BOOL WINAPI ImmSetCompositionStringW(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD); -#define ImmSetCompositionString WINELIB_NAME_AW(ImmSetCompositionString) -BOOL WINAPI ImmSetCompositionWindow(HIMC, LPCOMPOSITIONFORM); -BOOL WINAPI ImmSetConversionStatus(HIMC, DWORD, DWORD); -BOOL WINAPI ImmSetOpenStatus(HIMC, BOOL); -BOOL WINAPI ImmSetStatusWindowPos(HIMC, LPPOINT); -BOOL WINAPI ImmSimulateHotKey(HWND, DWORD); -BOOL WINAPI ImmUnregisterWordA(HKL, LPCSTR, DWORD, LPCSTR); -BOOL WINAPI ImmUnregisterWordW(HKL, LPCWSTR, DWORD, LPCWSTR); -#define ImmUnregisterWord WINELIB_NAME_AW(ImmUnregisterWord) + +BOOL +WINAPI +ImmRegisterWordA( + _In_ HKL, + _In_ LPCSTR lpszReading, + _In_ DWORD, + _In_ LPCSTR lpszRegister); + +BOOL +WINAPI +ImmRegisterWordW( + _In_ HKL, + _In_ LPCWSTR lpszReading, + _In_ DWORD, + _In_ LPCWSTR lpszRegister); + +#define ImmRegisterWord WINELIB_NAME_AW(ImmRegisterWord) + +BOOL WINAPI ImmReleaseContext(_In_ HWND, _In_ HIMC); +BOOL WINAPI ImmSetCandidateWindow(_In_ HIMC, _In_ LPCANDIDATEFORM); + +BOOL +WINAPI +ImmSetCompositionStringA( + _In_ HIMC, + _In_ DWORD dwIndex, + _In_reads_bytes_opt_(dwCompLen) LPCVOID lpComp, + _In_ DWORD dwCompLen, + _In_reads_bytes_opt_(dwReadLen) LPCVOID lpRead, + _In_ DWORD dwReadLen); + +BOOL +WINAPI +ImmSetCompositionStringW( + _In_ HIMC, + _In_ DWORD dwIndex, + _In_reads_bytes_opt_(dwCompLen) LPCVOID lpComp, + _In_ DWORD dwCompLen, + _In_reads_bytes_opt_(dwReadLen) LPCVOID lpRead, + _In_ DWORD dwReadLen); + +#define ImmSetCompositionString WINELIB_NAME_AW(ImmSetCompositionString) + +BOOL WINAPI ImmSetCompositionWindow(_In_ HIMC, _In_ LPCOMPOSITIONFORM); +BOOL WINAPI ImmSetConversionStatus(_In_ HIMC, _In_ DWORD, _In_ DWORD); +BOOL WINAPI ImmSetOpenStatus(_In_ HIMC, _In_ BOOL); +BOOL WINAPI ImmSetStatusWindowPos(_In_ HIMC, _In_ LPPOINT); +BOOL WINAPI ImmSimulateHotKey(_In_ HWND, _In_ DWORD); + +BOOL +WINAPI +ImmUnregisterWordA( + _In_ HKL, + _In_ LPCSTR lpszReading, + _In_ DWORD, + _In_ LPCSTR lpszUnregister); + +BOOL +WINAPI +ImmUnregisterWordW( + _In_ HKL, + _In_ LPCWSTR lpszReading, + _In_ DWORD, + _In_ LPCWSTR lpszUnregister); + +#define ImmUnregisterWord WINELIB_NAME_AW(ImmUnregisterWord) #ifdef __cplusplus

1 0

[akhaldi] 59851: [SVCHOST] * Fix a typo.
by akhaldi＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: akhaldi Date: Wed Aug 28 11:08:28 2013 New Revision: 59851 URL: http://svn.reactos.org/svn/reactos?rev=59851&view=rev Log: [SVCHOST] * Fix a typo. Modified: trunk/reactos/base/services/svchost/globals.c Modified: trunk/reactos/base/services/svchost/globals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/glob… ============================================================================== --- trunk/reactos/base/services/svchost/globals.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/globals.c [iso-8859-1] Wed Aug 28 11:08:28 2013 @@ -241,7 +241,7 @@ { NTSTATUS Status; - /* Allocare toom for the SID */ + /* Allocate room for the SID */ *Sid = RtlAllocateHeap(RtlGetProcessHeap(), 0, RtlLengthRequiredSid(SubAuthorityCount));

1 0

[hbelusca] 59850: [SVCHOST] Fix debug prints.
by hbelusca＠svn.reactos.org 28 Aug '13

28 Aug '13

Author: hbelusca Date: Wed Aug 28 10:19:54 2013 New Revision: 59850 URL: http://svn.reactos.org/svn/reactos?rev=59850&view=rev Log: [SVCHOST] Fix debug prints. Modified: trunk/reactos/base/services/svchost/svchost.h Modified: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] Wed Aug 28 10:19:54 2013 @@ -22,22 +22,22 @@ // This prints out a SVCHOST-specific debug print, with the PID/TID // #if _EX_ -#define SvchostDbgPrint(l, x, ...) \ +#define SvchostDbgPrint(lev, fmt, ...) \ DbgPrintEx(DPFLTR_SVCHOST_ID, \ - DPFLTR_MASK | l, \ - "[SVCHOST] %lx.%lx: " # x, \ + DPFLTR_MASK | lev, \ + "[SVCHOST] %lx.%lx: " fmt, \ GetCurrentProcessId(), \ GetCurrentThreadId(), \ __VA_ARGS__); #else -#define SvchostDbgPrint(l, x, ...) \ - DbgPrint("[SVCHOST] %lx.%lx: " # x, \ - GetCurrentProcessId(), \ - GetCurrentThreadId(), \ +#define SvchostDbgPrint(lev, fmt, ...) \ + DbgPrint("[SVCHOST] %lx.%lx: " fmt, \ + GetCurrentProcessId(), \ + GetCurrentThreadId(), \ __VA_ARGS__); #endif -#define DBG_ERR(x, ...) SvchostDbgPrint(1, x, __VA_ARGS__) -#define DBG_TRACE(x, ...) SvchostDbgPrint(4, x, __VA_ARGS__) +#define DBG_ERR(fmt, ...) SvchostDbgPrint(1, fmt, __VA_ARGS__) +#define DBG_TRACE(fmt, ...) SvchostDbgPrint(4, fmt, __VA_ARGS__) // // This is the callback that a hosted service can register for stop notification

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