Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 58487: [NTOSKRNL] Disable enqueuing processes into the SessionGlobal->ProcessList, since it's broken and causes non paged pool corruption. The reason is that sometimes the process is not...
by tkreuzer＠svn.reactos.org 13 Mar '13

13 Mar '13

Author: tkreuzer Date: Wed Mar 13 18:26:11 2013 New Revision: 58487 URL: http://svn.reactos.org/svn/reactos?rev=58487&view=rev Log: [NTOSKRNL] Disable enqueuing processes into the SessionGlobal->ProcessList, since it's broken and causes non paged pool corruption. The reason is that sometimes the process is not removed, so a dead allocation stays in the list, causing havoc, when the next or previous process in that list is removed. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c 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 Mar 13 18:26:11 2013 @@ -1644,7 +1644,8 @@ ASSERT(MmIsAddressValid(MmSessionSpace) == TRUE); /* Remove the process from the list ,and dereference the session */ - RemoveEntryList(&CurrentProcess->SessionProcessLinks); + // DO NOT ENABLE THIS UNLESS YOU FIXED THE NP POOL CORRUPTION THAT IT CAUSES!!! + //RemoveEntryList(&CurrentProcess->SessionProcessLinks); //MiDereferenceSession(); } @@ -1673,7 +1674,8 @@ NewProcess->Session = SessionGlobal; /* Insert it into the process list */ - InsertTailList(&SessionGlobal->ProcessList, &NewProcess->SessionProcessLinks); + // DO NOT ENABLE THIS UNLESS YOU FIXED THE NP POOL CORRUPTION THAT IT CAUSES!!! + //InsertTailList(&SessionGlobal->ProcessList, &NewProcess->SessionProcessLinks); /* Set the flag */ PspSetProcessFlag(NewProcess, PSF_PROCESS_IN_SESSION_BIT);

1 0

[tkreuzer] 58486: [NTOSKRNL] Fix non-KDBG builds
by tkreuzer＠svn.reactos.org 13 Mar '13

13 Mar '13

Author: tkreuzer Date: Wed Mar 13 18:25:52 2013 New Revision: 58486 URL: http://svn.reactos.org/svn/reactos?rev=58486&view=rev Log: [NTOSKRNL] Fix non-KDBG builds Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Wed Mar 13 18:25:52 2013 @@ -2516,6 +2516,7 @@ return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); } +#if DBG && KDBG BOOLEAN ExpKdbgExtPool( @@ -2612,5 +2613,6 @@ return TRUE; } +#endif // DBG && KDBG /* EOF */

1 0

[tkreuzer] 58485: [NTOSKRNL] - Implement "!pool" kdbg extension that works like in WinDbg - Implement ExpCheckPoolAllocation to check a single allocation for sanity - Rename MEMORY_ARE::PageOpCount...
by tkreuzer＠svn.reactos.org 13 Mar '13

13 Mar '13

Author: tkreuzer Date: Wed Mar 13 18:13:55 2013 New Revision: 58485 URL: http://svn.reactos.org/svn/reactos?rev=58485&view=rev Log: [NTOSKRNL] - Implement "!pool" kdbg extension that works like in WinDbg - Implement ExpCheckPoolAllocation to check a single allocation for sanity - Rename MEMORY_ARE::PageOpCount (which is unused) to Magic and set it to 'MAre' - Implement MiRosCheckMemoryAreas, that checks all memory areas for integrity and PspCheckProcessList that checks the process list. The code is not used anywhere, since it can cause a major performance impact, but it proved useful to detect non paged pool corruptions. So I'll commit it in the hope that it will be useful. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/kdbg/kdb.h trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/ps/kill.c 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 Mar 13 18:13:55 2013 @@ -257,7 +257,7 @@ ULONG Protect; ULONG Flags; BOOLEAN DeleteInProgress; - ULONG PageOpCount; + ULONG Magic; PVOID Vad; union { @@ -586,6 +586,15 @@ ULONG Consumer, ULONG Protection); +VOID +NTAPI +MiRosCheckMemoryAreas( + PMMSUPPORT AddressSpace); + +VOID +NTAPI +MiCheckAllProcessMemoryAreas(VOID); + /* npool.c *******************************************************************/ VOID @@ -1748,3 +1757,13 @@ { return MmKernelAddressSpace; } + + +/* expool.c ******************************************************************/ + +VOID +NTAPI +ExpCheckPoolAllocation( + PVOID P, + POOL_TYPE PoolType, + ULONG Tag); Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.h?rev=58… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] Wed Mar 13 18:13:55 2013 @@ -114,6 +114,12 @@ IN PCHAR Format, IN ... OPTIONAL); +BOOLEAN +NTAPI +KdbpGetHexNumber( + IN PCHAR pszNum, + OUT ULONG_PTR *pulValue); + /* from kdb_expr.c */ BOOLEAN Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Wed Mar 13 18:13:55 2013 @@ -90,6 +90,8 @@ static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdDmesg(ULONG Argc, PCHAR Argv[]); +BOOLEAN ExpKdbgExtPool(ULONG Argc, PCHAR Argv[]); + #ifdef __ROS_DWARF__ static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); #endif @@ -178,7 +180,8 @@ { "set", "set [var] [value]", "Sets var to value or displays value of var.", KdbpCmdSet }, { "dmesg", "dmesg", "Display debug messages on screen, with navigation on pages.", KdbpCmdDmesg }, { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg }, - { "help", "help", "Display help screen.", KdbpCmdHelp } + { "help", "help", "Display help screen.", KdbpCmdHelp }, + { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool } }; /* FUNCTIONS *****************************************************************/ @@ -403,6 +406,24 @@ return Ok; } +BOOLEAN +NTAPI +KdbpGetHexNumber( + IN PCHAR pszNum, + OUT ULONG_PTR *pulValue) +{ + char *endptr; + + /* Skip optional '0x' prefix */ + if ((pszNum[0] == '0') && ((pszNum[1] == 'x') || (pszNum[1] == 'X'))) + pszNum += 2; + + /* Make a number from the string (hex) */ + *pulValue = strtoul(pszNum, &endptr, 16); + + return (*endptr == '\0'); +} + /*!\brief Evaluates an expression and displays the result. */ static BOOLEAN Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Wed Mar 13 18:13:55 2013 @@ -277,6 +277,86 @@ (ULONG_PTR)NextEntry, __LINE__, (ULONG_PTR)Entry); + } + } +} + +VOID +NTAPI +ExpCheckPoolAllocation( + PVOID P, + POOL_TYPE PoolType, + ULONG Tag) +{ + PPOOL_HEADER Entry; + ULONG i; + KIRQL OldIrql; + POOL_TYPE RealPoolType; + + /* Get the pool header */ + Entry = ((PPOOL_HEADER)P) - 1; + + /* Check if this is a large allocation */ + if (PAGE_ALIGN(P) == P) + { + /* Lock the pool table */ + KeAcquireSpinLock(&ExpLargePoolTableLock, &OldIrql); + + /* Find the pool tag */ + for (i = 0; i < PoolBigPageTableSize; i++) + { + /* Check if this is our allocation */ + if (PoolBigPageTable[i].Va == P) + { + /* Make sure the tag is ok */ + if (PoolBigPageTable[i].Key != Tag) + { + KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, PoolBigPageTable[i].Key, Tag); + } + + break; + } + } + + /* Release the lock */ + KeReleaseSpinLock(&ExpLargePoolTableLock, OldIrql); + + if (i == PoolBigPageTableSize) + { + /* Did not find the allocation */ + //ASSERT(FALSE); + } + + /* Get Pool type by address */ + RealPoolType = MmDeterminePoolType(P); + } + else + { + /* Verify the tag */ + if (Entry->PoolTag != Tag) + { + DPRINT1("Allocation has wrong pool tag! Expected '%.4s', got '%.4s' (0x%08lx)\n", + &Tag, &Entry->PoolTag, Entry->PoolTag); + KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Entry->PoolTag, Tag); + } + + /* Check the rest of the header */ + ExpCheckPoolHeader(Entry); + + /* Get Pool type from entry */ + RealPoolType = (Entry->PoolType - 1); + } + + /* Should we check the pool type? */ + if (PoolType != -1) + { + /* Verify the pool type */ + if (RealPoolType != PoolType) + { + DPRINT1("Wrong pool type! Expected %s, got %s\n", + PoolType & BASE_POOL_TYPE_MASK ? "PagedPool" : "NonPagedPool", + (Entry->PoolType - 1) & BASE_POOL_TYPE_MASK ? "PagedPool" : "NonPagedPool"); + KeBugCheckEx(BAD_POOL_CALLER, 0xCC, (ULONG_PTR)P, Entry->PoolTag, Tag); } } } @@ -2436,4 +2516,101 @@ return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); } + +BOOLEAN +ExpKdbgExtPool( + ULONG Argc, + PCHAR Argv[]) +{ + ULONG_PTR Address = 0, Flags = 0; + PVOID PoolPage; + PPOOL_HEADER Entry; + BOOLEAN ThisOne; + PULONG Data; + + if (Argc > 1) + { + /* Get address */ + if (!KdbpGetHexNumber(Argv[1], &Address)) + { + KdbpPrint("Invalid parameter: %s\n", Argv[0]); + return TRUE; + } + } + + if (Argc > 2) + { + /* Get address */ + if (!KdbpGetHexNumber(Argv[1], &Flags)) + { + KdbpPrint("Invalid parameter: %s\n", Argv[0]); + return TRUE; + } + } + + /* Check if we got an address */ + if (Address != 0) + { + /* Get the base page */ + PoolPage = PAGE_ALIGN(Address); + } + else + { + KdbpPrint("Heap is unimplemented\n"); + return TRUE; + } + + /* No paging support! */ + if (!MmIsAddressValid(PoolPage)) + { + KdbpPrint("Address not accessible!\n"); + return TRUE; + } + + /* Get pool type */ + if ((Address >= (ULONG_PTR)MmPagedPoolStart) && (Address <= (ULONG_PTR)MmPagedPoolEnd)) + KdbpPrint("Allocation is from PagedPool region\n"); + else if ((Address >= (ULONG_PTR)MmNonPagedPoolStart) && (Address <= (ULONG_PTR)MmNonPagedPoolEnd)) + KdbpPrint("Allocation is from NonPagedPool region\n"); + else + { + KdbpPrint("Address 0x%p is not within any pool!\n", (PVOID)Address); + return TRUE; + } + + /* Loop all entries of that page */ + Entry = PoolPage; + do + { + /* Check if the address is within that entry */ + ThisOne = ((Address >= (ULONG_PTR)Entry) && + (Address < (ULONG_PTR)(Entry + Entry->BlockSize))); + + if (!(Flags & 1) || ThisOne) + { + /* Print the line */ + KdbpPrint("%c%p size: %4d previous size: %4d %s %.4s\n", + ThisOne ? '*' : ' ', Entry, Entry->BlockSize, Entry->PreviousSize, + (Flags & 0x80000000) ? "" : (Entry->PoolType ? "(Allocated)" : "(Free) "), + (Flags & 0x80000000) ? "" : (PCHAR)&Entry->PoolTag); + } + + if (Flags & 1) + { + Data = (PULONG)(Entry + 1); + KdbpPrint(" %p %08lx %08lx %08lx %08lx\n" + " %p %08lx %08lx %08lx %08lx\n", + &Data[0], Data[0], Data[1], Data[2], Data[3], + &Data[4], Data[4], Data[5], Data[6], Data[7]); + } + + /* Go to next entry */ + Entry = POOL_BLOCK(Entry, Entry->BlockSize); + } + while ((Entry->BlockSize != 0) && ((ULONG_PTR)Entry < (ULONG_PTR)PoolPage + PAGE_SIZE)); + + return TRUE; +} + + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=58… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Wed Mar 13 18:13:55 2013 @@ -401,7 +401,7 @@ Vad->u.VadFlags.Spare = 1; Vad->u.VadFlags.PrivateMemory = 1; Vad->u.VadFlags.Protection = MiMakeProtectionMask(marea->Protect); - + /* Insert the VAD */ MiInsertVad(Vad, Process); marea->Vad = Vad; @@ -675,6 +675,100 @@ NTAPI MiRemoveNode(IN PMMADDRESS_NODE Node, IN PMM_AVL_TABLE Table); + +#if DBG + +static +VOID +MiRosCheckMemoryAreasRecursive( + PMEMORY_AREA Node) +{ + /* Check if the allocation is ok */ + ExpCheckPoolAllocation(Node, NonPagedPool, 'ERAM'); + + /* Check some fields */ + ASSERT(Node->Magic == 'erAM'); + ASSERT(PAGE_ALIGN(Node->StartingAddress) == Node->StartingAddress); + ASSERT(Node->EndingAddress != NULL); + ASSERT(PAGE_ALIGN(Node->EndingAddress) == Node->EndingAddress); + ASSERT((ULONG_PTR)Node->StartingAddress < (ULONG_PTR)Node->EndingAddress); + ASSERT((Node->Type == 0) || + (Node->Type == MEMORY_AREA_CACHE) || + // (Node->Type == MEMORY_AREA_CACHE_SEGMENT) || + (Node->Type == MEMORY_AREA_SECTION_VIEW) || + (Node->Type == MEMORY_AREA_OWNED_BY_ARM3) || + (Node->Type == (MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC))); + + /* Recursively check children */ + if (Node->LeftChild != NULL) + MiRosCheckMemoryAreasRecursive(Node->LeftChild); + if (Node->RightChild != NULL) + MiRosCheckMemoryAreasRecursive(Node->RightChild); +} + +VOID +NTAPI +MiRosCheckMemoryAreas( + PMMSUPPORT AddressSpace) +{ + PMEMORY_AREA RootNode; + PEPROCESS AddressSpaceOwner; + BOOLEAN NeedReleaseLock; + + NeedReleaseLock = FALSE; + + /* Get the address space owner */ + AddressSpaceOwner = CONTAINING_RECORD(AddressSpace, EPROCESS, Vm); + + /* Check if we already own the address space lock */ + if (AddressSpaceOwner->AddressCreationLock.Owner != KeGetCurrentThread()) + { + /* We must own it! */ + MmLockAddressSpace(AddressSpace); + NeedReleaseLock = TRUE; + } + + /* Check all memory areas */ + RootNode = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; + MiRosCheckMemoryAreasRecursive(RootNode); + + /* Release the lock, if we acquired it */ + if (NeedReleaseLock) + { + MmUnlockAddressSpace(AddressSpace); + } +} + +extern KGUARDED_MUTEX PspActiveProcessMutex; + +VOID +NTAPI +MiCheckAllProcessMemoryAreas(VOID) +{ + PEPROCESS Process; + PLIST_ENTRY Entry; + + /* Acquire the Active Process Lock */ + KeAcquireGuardedMutex(&PspActiveProcessMutex); + + /* Loop the process list */ + Entry = PsActiveProcessHead.Flink; + while (Entry != &PsActiveProcessHead) + { + /* Get the process */ + Process = CONTAINING_RECORD(Entry, EPROCESS, ActiveProcessLinks); + + /* Check memory areas */ + MiRosCheckMemoryAreas(&Process->Vm); + + Entry = Entry->Flink; + } + + /* Release the lock */ + KeReleaseGuardedMutex(&PspActiveProcessMutex); +} + +#endif /** * @name MmFreeMemoryArea @@ -712,6 +806,12 @@ ULONG_PTR Address; PVOID EndAddress; + /* Make sure we own the address space lock! */ + ASSERT(CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock.Owner == KeGetCurrentThread()); + + /* Check magic */ + ASSERT(MemoryArea->Magic == 'erAM'); + if (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3) { PEPROCESS CurrentProcess = PsGetCurrentProcess(); @@ -731,7 +831,7 @@ BOOLEAN Dirty = FALSE; SWAPENTRY SwapEntry = 0; PFN_NUMBER Page = 0; - + if (MmIsPageSwapEntry(Process, (PVOID)Address)) { MmDeletePageFileMapping(Process, (PVOID)Address, &SwapEntry); @@ -788,9 +888,6 @@ } } - /* There must be no page ops in progress */ - ASSERT(MemoryArea->PageOpCount == 0); - /* Remove the tree item. */ { if (MemoryArea->Parent != NULL) @@ -979,7 +1076,7 @@ MemoryArea->Protect = Protect; MemoryArea->Flags = AllocationFlags; //MemoryArea->LockCount = 0; - MemoryArea->PageOpCount = 0; + MemoryArea->Magic = 'erAM'; MemoryArea->DeleteInProgress = FALSE; MmInsertMemoryArea(AddressSpace, MemoryArea); @@ -1072,17 +1169,17 @@ KeBugCheck(MEMORY_MANAGEMENT); } } - + #if (_MI_PAGING_LEVELS == 2) { KIRQL OldIrql; PMMPDE pointerPde; /* Attach to Process */ KeAttachProcess(&Process->Pcb); - + /* Acquire PFN lock */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - + for(Address = MI_LOWEST_VAD_ADDRESS; Address < MM_HIGHEST_VAD_ADDRESS; Address =(PVOID)((ULONG_PTR)Address + (PAGE_SIZE * PTE_COUNT))) @@ -1098,7 +1195,7 @@ } /* Release lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - + /* Detach */ KeDetachProcess(); } Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=584… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Wed Mar 13 18:13:55 2013 @@ -205,6 +205,52 @@ (PVOID)1) != (PVOID)1); } +#if DBG +VOID +NTAPI +PspCheckProcessList() +{ + PLIST_ENTRY Entry; + + KeAcquireGuardedMutex(&PspActiveProcessMutex); + DbgPrint("# checking PsActiveProcessHead @ %p\n", &PsActiveProcessHead); + for (Entry = PsActiveProcessHead.Flink; + Entry != &PsActiveProcessHead; + Entry = Entry->Flink) + { + PEPROCESS Process = CONTAINING_RECORD(Entry, EPROCESS, ActiveProcessLinks); + POBJECT_HEADER Header; + PVOID Info, HeaderLocation; + + /* Get the header and assume this is what we'll free */ + Header = OBJECT_TO_OBJECT_HEADER(Process); + HeaderLocation = Header; + + /* To find the header, walk backwards from how we allocated */ + if ((Info = OBJECT_HEADER_TO_CREATOR_INFO(Header))) + { + HeaderLocation = Info; + } + if ((Info = OBJECT_HEADER_TO_NAME_INFO(Header))) + { + HeaderLocation = Info; + } + if ((Info = OBJECT_HEADER_TO_HANDLE_INFO(Header))) + { + HeaderLocation = Info; + } + if ((Info = OBJECT_HEADER_TO_QUOTA_INFO(Header))) + { + HeaderLocation = Info; + } + + ExpCheckPoolAllocation(HeaderLocation, NonPagedPool, 'corP'); + } + + KeReleaseGuardedMutex(&PspActiveProcessMutex); +} +#endif + VOID NTAPI PspDeleteProcess(IN PVOID ObjectBody) @@ -221,6 +267,8 @@ /* Remove it from the Active List */ KeAcquireGuardedMutex(&PspActiveProcessMutex); RemoveEntryList(&Process->ActiveProcessLinks); + Process->ActiveProcessLinks.Flink = NULL; + Process->ActiveProcessLinks.Blink = NULL; KeReleaseGuardedMutex(&PspActiveProcessMutex); }

1 0

[akhaldi] 58484: [CRT] * Annotate locale.h.
by akhaldi＠svn.reactos.org 13 Mar '13

13 Mar '13

Author: akhaldi Date: Wed Mar 13 14:19:51 2013 New Revision: 58484 URL: http://svn.reactos.org/svn/reactos?rev=58484&view=rev Log: [CRT] * Annotate locale.h. Modified: trunk/reactos/include/crt/locale.h Modified: trunk/reactos/include/crt/locale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/locale.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/locale.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/locale.h [iso-8859-1] Wed Mar 13 14:19:51 2013 @@ -68,19 +68,68 @@ #endif - int __cdecl _configthreadlocale(int _Flag); - char *__cdecl setlocale(int _Category,const char *_Locale); - _CRTIMP struct lconv *__cdecl localeconv(void); - _locale_t __cdecl _get_current_locale(void); - _locale_t __cdecl _create_locale(int _Category,const char *_Locale); - void __cdecl _free_locale(_locale_t _Locale); - _locale_t __cdecl __get_current_locale(void); - _locale_t __cdecl __create_locale(int _Category,const char *_Locale); - void __cdecl __free_locale(_locale_t _Locale); + _Check_return_opt_ + int + __cdecl + _configthreadlocale( + _In_ int _Flag); + + _Check_return_opt_ + char* + __cdecl + setlocale( + _In_ int _Category, + _In_opt_z_ const char *_Locale); + + _Check_return_opt_ + _CRTIMP + struct lconv* + __cdecl + localeconv(void); + + _Check_return_opt_ + _locale_t + __cdecl + _get_current_locale(void); + + _Check_return_opt_ + _locale_t + __cdecl + _create_locale( + _In_ int _Category, + _In_z_ const char *_Locale); + + void + __cdecl + _free_locale( + _In_opt_ _locale_t _Locale); + + _Check_return_ + _locale_t + __cdecl + __get_current_locale(void); + + _Check_return_ + _locale_t + __cdecl + __create_locale( + _In_ int _Category, + _In_z_ const char *_Locale); + + void + __cdecl + __free_locale( + _In_opt_ _locale_t _Locale); #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED - _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale); + _Check_return_opt_ + _CRTIMP + wchar_t* + __cdecl + _wsetlocale( + _In_ int _Category, + _In_opt_z_ const wchar_t *_Locale); #endif #ifdef __cplusplus

1 0

[akhaldi] 58483: [CRT] * Annotate errno.h.
by akhaldi＠svn.reactos.org 13 Mar '13

13 Mar '13

Author: akhaldi Date: Wed Mar 13 12:30:49 2013 New Revision: 58483 URL: http://svn.reactos.org/svn/reactos?rev=58483&view=rev Log: [CRT] * Annotate errno.h. Modified: trunk/reactos/include/crt/errno.h Modified: trunk/reactos/include/crt/errno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/errno.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/errno.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/errno.h [iso-8859-1] Wed Mar 13 12:30:49 2013 @@ -17,8 +17,8 @@ _CRTIMP extern int *__cdecl _errno(void); #define errno (*_errno()) - errno_t __cdecl _set_errno(int _Value); - errno_t __cdecl _get_errno(int *_Value); + errno_t __cdecl _set_errno(_In_ int _Value); + errno_t __cdecl _get_errno(_Out_ int *_Value); #endif #define EPERM 1

1 0

[akhaldi] 58482: [PSDK] * Annotate winnls.h.
by akhaldi＠svn.reactos.org 13 Mar '13

13 Mar '13

Author: akhaldi Date: Wed Mar 13 12:06:41 2013 New Revision: 58482 URL: http://svn.reactos.org/svn/reactos?rev=58482&view=rev Log: [PSDK] * Annotate winnls.h. Modified: trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Wed Mar 13 12:06:41 2013 @@ -624,44 +624,199 @@ #define IS_LOW_SURROGATE(ch) ((ch) >= LOW_SURROGATE_START && (ch) <= LOW_SURROGATE_END) #define IS_SURROGATE_PAIR(high,low) (IS_HIGH_SURROGATE(high) && IS_LOW_SURROGATE(low)) -int WINAPI CompareStringA(LCID,DWORD,LPCSTR,int,LPCSTR,int); -int WINAPI CompareStringW(LCID,DWORD,LPCWSTR,int,LPCWSTR,int); -LCID WINAPI ConvertDefaultLocale(LCID); -BOOL WINAPI EnumCalendarInfoA(CALINFO_ENUMPROCA,LCID,CALID,CALTYPE); -BOOL WINAPI EnumCalendarInfoW(CALINFO_ENUMPROCW,LCID,CALID,CALTYPE); -BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA,LCID,DWORD); -BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW,LCID,DWORD); -BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA,DWORD); -BOOL WINAPI EnumSystemCodePagesW(CODEPAGE_ENUMPROCW,DWORD); -BOOL WINAPI EnumSystemGeoID(GEOCLASS,GEOID,GEO_ENUMPROC); -BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD); -BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD); -BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA,LCID,DWORD); -BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW,LCID,DWORD); -int WINAPI FoldStringA(DWORD,LPCSTR,int,LPSTR,int); -int WINAPI FoldStringW(DWORD,LPCWSTR,int,LPWSTR,int); +int +WINAPI +CompareStringA( + _In_ LCID Locale, + _In_ DWORD dwCmpFlags, + _In_reads_(cchCount1) LPCSTR lpString1, + _In_ int cchCount1, + _In_reads_(cchCount2) LPCSTR lpString2, + _In_ int cchCount2); + +int +WINAPI +CompareStringW( + _In_ LCID Locale, + _In_ DWORD dwCmpFlags, + _In_reads_(cchCount1) LPCWSTR lpString1, + _In_ int cchCount1, + _In_reads_(cchCount2) LPCWSTR lpString2, + _In_ int cchCount2); + +LCID WINAPI ConvertDefaultLocale(_In_ LCID); +BOOL WINAPI EnumCalendarInfoA(_In_ CALINFO_ENUMPROCA, _In_ LCID, _In_ CALID, _In_ CALTYPE); +BOOL WINAPI EnumCalendarInfoW(_In_ CALINFO_ENUMPROCW, _In_ LCID, _In_ CALID, _In_ CALTYPE); +BOOL WINAPI EnumDateFormatsA(_In_ DATEFMT_ENUMPROCA, _In_ LCID, _In_ DWORD); +BOOL WINAPI EnumDateFormatsW(_In_ DATEFMT_ENUMPROCW, _In_ LCID, _In_ DWORD); +BOOL WINAPI EnumSystemCodePagesA(_In_ CODEPAGE_ENUMPROCA, _In_ DWORD); +BOOL WINAPI EnumSystemCodePagesW(_In_ CODEPAGE_ENUMPROCW, _In_ DWORD); +BOOL WINAPI EnumSystemGeoID(_In_ GEOCLASS, _In_ GEOID, _In_ GEO_ENUMPROC); +BOOL WINAPI EnumSystemLocalesA(_In_ LOCALE_ENUMPROCA, _In_ DWORD); +BOOL WINAPI EnumSystemLocalesW(_In_ LOCALE_ENUMPROCW, _In_ DWORD); +BOOL WINAPI EnumTimeFormatsA(_In_ TIMEFMT_ENUMPROCA, _In_ LCID, _In_ DWORD); +BOOL WINAPI EnumTimeFormatsW(_In_ TIMEFMT_ENUMPROCW, _In_ LCID, _In_ DWORD); + +int +WINAPI +FoldStringA( + _In_ DWORD dwMapFlags, + _In_reads_(cchSrc) LPCSTR lpSrcStr, + _In_ int cchSrc, + _Out_writes_opt_(cchDest) LPSTR lpDestStr, + _In_ int cchDest); + +int +WINAPI +FoldStringW( + _In_ DWORD dwMapFlags, + _In_reads_(cchSrc) LPCWSTR lpSrcStr, + _In_ int cchSrc, + _Out_writes_opt_(cchDest) LPWSTR lpDestStr, + _In_ int cchDest); + UINT WINAPI GetACP(void); -int WINAPI GetCalendarInfoA(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD); -int WINAPI GetCalendarInfoW(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); -BOOL WINAPI GetCPInfo(UINT,LPCPINFO); -BOOL WINAPI GetCPInfoExA(UINT,DWORD,LPCPINFOEXA); -BOOL WINAPI GetCPInfoExW(UINT,DWORD,LPCPINFOEXW); -int WINAPI GetCurrencyFormatA(LCID,DWORD,LPCSTR,const CURRENCYFMTA*,LPSTR,int); -int WINAPI GetCurrencyFormatW(LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int); + +int +WINAPI +GetCalendarInfoA( + _In_ LCID Locale, + _In_ CALID Calendar, + _In_ CALTYPE CalType, + _Out_writes_opt_(cchData) LPSTR lpCalData, + _In_ int cchData, + _Out_opt_ LPDWORD lpValue); + +int +WINAPI +GetCalendarInfoW( + _In_ LCID Locale, + _In_ CALID Calendar, + _In_ CALTYPE CalType, + _Out_writes_opt_(cchData) LPWSTR lpCalData, + _In_ int cchData, + _Out_opt_ LPDWORD lpValue); + +BOOL WINAPI GetCPInfo(_In_ UINT, _Out_ LPCPINFO); +BOOL WINAPI GetCPInfoExA(_In_ UINT, _In_ DWORD, _Out_ LPCPINFOEXA); +BOOL WINAPI GetCPInfoExW(_In_ UINT, _In_ DWORD, _Out_ LPCPINFOEXW); + +int +WINAPI +GetCurrencyFormatA( + _In_ LCID Locale, + _In_ DWORD dwFlags, + _In_ LPCSTR lpValue, + _In_opt_ const CURRENCYFMTA *lpFormat, + _Out_writes_opt_(cchCurrency) LPSTR lpCurrencyStr, + _In_ int cchCurrency); + +int +WINAPI +GetCurrencyFormatW( + _In_ LCID Locale, + _In_ DWORD dwFlags, + _In_ LPCWSTR lpValue, + _In_opt_ const CURRENCYFMTW *lpFormat, + _Out_writes_opt_(cchCurrency) LPWSTR lpCurrencyStr, + _In_ int cchCurrency); + int WINAPI GetDateFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,int); int WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int); -int WINAPI GetGeoInfoA(GEOID,GEOTYPE,LPSTR,int,LANGID); -int WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,int,LANGID); -int WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,int); -int WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,int); -BOOL WINAPI GetNLSVersion(NLS_FUNCTION,LCID,LPNLSVERSIONINFO); -int WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMTA*,LPSTR,int); -int WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,int); + +int +WINAPI +GetGeoInfoA( + _In_ GEOID Location, + _In_ GEOTYPE GeoType, + _Out_writes_opt_(cchData) LPSTR lpGeoData, + _In_ int cchData, + _In_ LANGID LangId); + +int +WINAPI +GetGeoInfoW( + _In_ GEOID Location, + _In_ GEOTYPE GeoType, + _Out_writes_opt_(cchData) LPWSTR lpGeoData, + _In_ int cchData, + _In_ LANGID LangId); + +int +WINAPI +GetLocaleInfoA( + _In_ LCID Locale, + _In_ LCTYPE LCType, + _Out_writes_opt_(cchData) LPSTR lpLCData, + _In_ int cchData); + +int +WINAPI +GetLocaleInfoW( + _In_ LCID Locale, + _In_ LCTYPE LCType, + _Out_writes_opt_(cchData) LPWSTR lpLCData, + _In_ int cchData); + +BOOL WINAPI GetNLSVersion(_In_ NLS_FUNCTION, _In_ LCID, _Inout_ LPNLSVERSIONINFO); + +int +WINAPI +GetNumberFormatA( + _In_ LCID Locale, + _In_ DWORD dwFlags, + _In_ LPCSTR lpValue, + _In_opt_ const NUMBERFMTA *lpFormat, + _Out_writes_opt_(cchNumber) LPSTR lpNumberStr, + _In_ int cchNumber); + +int +WINAPI +GetNumberFormatW( + _In_ LCID Locale, + _In_ DWORD dwFlags, + _In_ LPCWSTR lpValue, + _In_opt_ const NUMBERFMTW *lpFormat, + _Out_writes_opt_(cchNumber) LPWSTR lpNumberStr, + _In_ int cchNumber); + UINT WINAPI GetOEMCP(void); -BOOL WINAPI GetStringTypeA(LCID,DWORD,LPCSTR,int,LPWORD); -BOOL WINAPI GetStringTypeW(DWORD,LPCWSTR,int,LPWORD); -BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,int,LPWORD); -BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,int,LPWORD); + +BOOL +WINAPI +GetStringTypeA( + _In_ LCID Locale, + _In_ DWORD dwInfoType, + _In_reads_(cchSrc) LPCSTR lpSrcStr, + _In_ int cchSrc, + _Out_ LPWORD lpCharType); + +BOOL +WINAPI +GetStringTypeW( + _In_ DWORD dwInfoType, + _In_reads_(cchSrc) LPCWSTR lpSrcStr, + _In_ int cchSrc, + _Out_ LPWORD lpCharType); + +BOOL +WINAPI +GetStringTypeExA( + _In_ LCID Locale, + _In_ DWORD dwInfoType, + _In_reads_(cchSrc) LPCSTR lpSrcStr, + _In_ int cchSrc, + _Out_writes_(cchSrc) LPWORD lpCharType); + +BOOL +WINAPI +GetStringTypeExW( + _In_ LCID Locale, + _In_ DWORD dwInfoType, + _In_reads_(cchSrc) LPCWSTR lpSrcStr, + _In_ int cchSrc, + _Out_writes_(cchSrc) LPWORD lpCharType); + LANGID WINAPI GetSystemDefaultLangID(void); LCID WINAPI GetSystemDefaultLCID(void); LCID WINAPI GetThreadLocale(void); @@ -670,60 +825,199 @@ LANGID WINAPI GetUserDefaultLangID(void); LCID WINAPI GetUserDefaultLCID(void); LANGID WINAPI GetUserDefaultUILanguage(void); -GEOID WINAPI GetUserGeoID(GEOCLASS); -BOOL WINAPI IsDBCSLeadByte(BYTE); -BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE); -BOOL WINAPI IsNLSDefinedString(NLS_FUNCTION,DWORD,LPNLSVERSIONINFO,LPCWSTR,int); -BOOL WINAPI IsValidCodePage(UINT); -BOOL WINAPI IsValidLocale(LCID,DWORD); -int WINAPI LCMapStringA(LCID,DWORD,LPCSTR,int,LPSTR,int); -int WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,int,LPWSTR,int); +GEOID WINAPI GetUserGeoID(_In_ GEOCLASS); +BOOL WINAPI IsDBCSLeadByte(_In_ BYTE); +BOOL WINAPI IsDBCSLeadByteEx(_In_ UINT, _In_ BYTE); + +BOOL +WINAPI +IsNLSDefinedString( + _In_ NLS_FUNCTION Function, + _In_ DWORD dwFlags, + _In_ LPNLSVERSIONINFO lpVersionInformation, + _In_reads_(cchStr) LPCWSTR lpString, + _In_ int cchStr); + +BOOL WINAPI IsValidCodePage(_In_ UINT); +BOOL WINAPI IsValidLocale(_In_ LCID, _In_ DWORD); + +int +WINAPI +LCMapStringA( + _In_ LCID Locale, + _In_ DWORD dwMapFlags, + _In_reads_(cchSrc) LPCSTR lpSrcStr, + _In_ int cchSrc, + _Out_writes_opt_(_Inexpressible_(cchDest)) LPSTR lpDestStr, + _In_ int cchDest); + +int +WINAPI +LCMapStringW( + _In_ LCID Locale, + _In_ DWORD dwMapFlags, + _In_reads_(cchSrc) LPCWSTR lpSrcStr, + _In_ int cchSrc, + _Out_writes_opt_(_Inexpressible_(cchDest)) LPWSTR lpDestStr, + _In_ int cchDest); + int WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,int,LPWSTR,int); -int WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR); -int WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR); -BOOL WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR); -BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); -BOOL WINAPI SetThreadLocale(LCID); -LANGID WINAPI SetThreadUILanguage(LANGID); +int WINAPI SetCalendarInfoA(_In_ LCID, _In_ CALID, _In_ CALTYPE, _In_ LPCSTR); +int WINAPI SetCalendarInfoW(_In_ LCID, _In_ CALID, _In_ CALTYPE, _In_ LPCWSTR); +BOOL WINAPI SetLocaleInfoA(_In_ LCID, _In_ LCTYPE, _In_ LPCSTR); +BOOL WINAPI SetLocaleInfoW(_In_ LCID, _In_ LCTYPE, _In_ LPCWSTR); +BOOL WINAPI SetThreadLocale(_In_ LCID); +LANGID WINAPI SetThreadUILanguage(_In_ LANGID); BOOL WINAPI SetUserDefaultLCID(LCID); BOOL WINAPI SetUserDefaultUILanguage(LANGID); -BOOL WINAPI SetUserGeoID(GEOID); +BOOL WINAPI SetUserGeoID(_In_ GEOID); int WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,int,LPSTR,int,LPCSTR,LPBOOL); #if (WINVER >= 0x0500) -BOOL WINAPI EnumCalendarInfoExA(CALINFO_ENUMPROCEXA,LCID,CALID,CALTYPE); -BOOL WINAPI EnumCalendarInfoExW(CALINFO_ENUMPROCEXW,LCID,CALID,CALTYPE); -BOOL WINAPI EnumDateFormatsExA(DATEFMT_ENUMPROCEXA,LCID,DWORD); -BOOL WINAPI EnumDateFormatsExW(DATEFMT_ENUMPROCEXW,LCID,DWORD); -BOOL WINAPI EnumSystemLanguageGroupsA(LANGUAGEGROUP_ENUMPROCA,DWORD,LONG_PTR); -BOOL WINAPI EnumSystemLanguageGroupsW(LANGUAGEGROUP_ENUMPROCW,DWORD,LONG_PTR); -BOOL WINAPI EnumLanguageGroupLocalesA(LANGGROUPLOCALE_ENUMPROCA,LGRPID,DWORD,LONG_PTR); -BOOL WINAPI EnumLanguageGroupLocalesW(LANGGROUPLOCALE_ENUMPROCW,LGRPID,DWORD,LONG_PTR); -BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ENUMPROCA,DWORD,LONG_PTR); -BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ENUMPROCW,DWORD,LONG_PTR); +BOOL WINAPI EnumCalendarInfoExA(_In_ CALINFO_ENUMPROCEXA, _In_ LCID, _In_ CALID, _In_ CALTYPE); +BOOL WINAPI EnumCalendarInfoExW(_In_ CALINFO_ENUMPROCEXW, _In_ LCID, _In_ CALID, _In_ CALTYPE); +BOOL WINAPI EnumDateFormatsExA(_In_ DATEFMT_ENUMPROCEXA, _In_ LCID, _In_ DWORD); +BOOL WINAPI EnumDateFormatsExW(_In_ DATEFMT_ENUMPROCEXW, _In_ LCID, _In_ DWORD); +BOOL WINAPI EnumSystemLanguageGroupsA(_In_ LANGUAGEGROUP_ENUMPROCA, _In_ DWORD, _In_ LONG_PTR); +BOOL WINAPI EnumSystemLanguageGroupsW(_In_ LANGUAGEGROUP_ENUMPROCW, _In_ DWORD, _In_ LONG_PTR); +BOOL WINAPI EnumLanguageGroupLocalesA(_In_ LANGGROUPLOCALE_ENUMPROCA, _In_ LGRPID, _In_ DWORD, _In_ LONG_PTR); +BOOL WINAPI EnumLanguageGroupLocalesW(_In_ LANGGROUPLOCALE_ENUMPROCW, _In_ LGRPID, _In_ DWORD, _In_ LONG_PTR); +BOOL WINAPI EnumUILanguagesA(_In_ UILANGUAGE_ENUMPROCA, _In_ DWORD, _In_ LONG_PTR); +BOOL WINAPI EnumUILanguagesW(_In_ UILANGUAGE_ENUMPROCW, _In_ DWORD, _In_ LONG_PTR); LANGID WINAPI GetSystemDefaultUILanguage(void); LANGID WINAPI GetUserDefaultUILanguage(void); -BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); +BOOL WINAPI IsValidLanguageGroup(_In_ LGRPID, _In_ DWORD); #endif /* (WINVER >= 0x0500) */ + #if (WINVER >= 0x0600) -BOOL WINAPI GetFileMUIInfo(DWORD,PCWSTR,PFILEMUIINFO,DWORD*); -BOOL WINAPI GetFileMUIPath(DWORD,PCWSTR,PWSTR,PULONG,PWSTR,PULONG,PULONGLONG); + +_Success_(return != FALSE) +BOOL +WINAPI +GetFileMUIInfo( + _In_ DWORD dwFlags, + _In_ PCWSTR pcwszFilePath, + _Inout_updates_bytes_to_opt_(*pcbFileMUIInfo, *pcbFileMUIInfo) PFILEMUIINFO pFileMUIInfo, + _Inout_ DWORD *pcbFileMUIInfo); + +BOOL +WINAPI +GetFileMUIPath( + _In_ DWORD dwFlags, + _In_ PCWSTR pcwszFilePath, + _Inout_updates_opt_(*pcchLanguage) PWSTR pwszLanguage, + _Inout_ PULONG pcchLanguage, + _Out_writes_opt_(*pcchFileMUIPath) PWSTR pwszFileMUIPath, + _Inout_ PULONG pcchFileMUIPath, + _Inout_ PULONGLONG pululEnumerator); + WINBASEAPI -int WINAPI GetLocaleInfoEx(LPCWSTR,LCTYPE,LPWSTR,int); -BOOL WINAPI GetProcessPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); -BOOL WINAPI GetSystemPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); -BOOL WINAPI GetThreadPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); +int +WINAPI +GetLocaleInfoEx( + _In_opt_ LPCWSTR lpLocaleName, + _In_ LCTYPE LCType, + _Out_writes_opt_(cchData) LPWSTR lpLCData, + _In_ int cchData); + +BOOL +WINAPI +GetProcessPreferredUILanguages( + _In_ DWORD dwFlags, + _Out_ PULONG pulNumLanguages, + _Out_writes_opt_(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer, + _Inout_ PULONG pcchLanguagesBuffer); + +BOOL +WINAPI +GetSystemPreferredUILanguages( + _In_ DWORD dwFlags, + _Out_ PULONG pulNumLanguages, + _Out_writes_opt_(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer, + _Inout_ PULONG pcchLanguagesBuffer); + +BOOL +WINAPI +GetThreadPreferredUILanguages( + _In_ DWORD dwFlags, + _Out_ PULONG pulNumLanguages, + _Out_writes_opt_(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer, + _Inout_ PULONG pcchLanguagesBuffer); + LANGID WINAPI GetThreadUILanguage(void); -BOOL WINAPI GetUILanguageInfo(DWORD,PCZZWSTR,PZZWSTR,PDWORD,PDWORD); -BOOL WINAPI GetUserPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); -int WINAPI IdnToAscii(DWORD,LPCWSTR,int,LPWSTR,int); -int WINAPI IdnToNameprepUnicode(DWORD,LPCWSTR,int,LPWSTR,int); -int WINAPI IdnToUnicode(DWORD,LPCWSTR,int,LPWSTR,int); -BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,int); -int WINAPI NormalizeString(NORM_FORM,LPCWSTR,int,LPWSTR,int); -int WINAPI GetStringScripts(DWORD,LPCWSTR,int,LPWSTR,int); -BOOL WINAPI SetProcessPreferredUILanguages(DWORD,PCZZWSTR,PULONG); -BOOL WINAPI SetThreadPreferredUILanguages(DWORD,PCZZWSTR,PULONG); -BOOL WINAPI VerifyScripts(DWORD,LPCWSTR,int,LPCWSTR,int); + +BOOL +WINAPI +GetUILanguageInfo( + _In_ DWORD dwFlags, + _In_ PCZZWSTR pwmszLanguage, + _Out_writes_opt_(*pcchFallbackLanguages) PZZWSTR pwszFallbackLanguages, + _Inout_opt_ PDWORD pcchFallbackLanguages, + _Out_ PDWORD pAttributes); + +BOOL +WINAPI +GetUserPreferredUILanguages( + _In_ DWORD dwFlags, + _Out_ PULONG pulNumLanguages, + _Out_writes_opt_(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer, + _Inout_ PULONG pcchLanguagesBuffer); + +int +WINAPI +IdnToAscii( + _In_ DWORD dwFlags, + _In_reads_(cchUnicodeChar) LPCWSTR lpUnicodeCharStr, + _In_ int cchUnicodeChar, + _Out_writes_opt_(cchASCIIChar) LPWSTR lpASCIICharStr, + _In_ int cchASCIIChar); + +int +WINAPI +IdnToNameprepUnicode( + _In_ DWORD dwFlags, + _In_reads_(cchUnicodeChar) LPCWSTR lpUnicodeCharStr, + _In_ int cchUnicodeChar, + _Out_writes_opt_(cchNameprepChar) LPWSTR lpNameprepCharStr, + _In_ int cchNameprepChar); + +int +WINAPI +IdnToUnicode( + _In_ DWORD dwFlags, + _In_reads_(cchASCIIChar) LPCWSTR lpASCIICharStr, + _In_ int cchASCIIChar, + _Out_writes_opt_(cchUnicodeChar) LPWSTR lpUnicodeCharStr, + _In_ int cchUnicodeChar); + +BOOL +WINAPI +IsNormalizedString( + _In_ NORM_FORM NormForm, + _In_reads_(cwLength) LPCWSTR lpString, + _In_ int cwLength); + +int +WINAPI +NormalizeString( + _In_ NORM_FORM NormForm, + _In_reads_(cwSrcLength) LPCWSTR lpSrcString, + _In_ int cwSrcLength, + _Out_writes_opt_(cwDstLength) LPWSTR lpDstString, + _In_ int cwDstLength); + +int +WINAPI +GetStringScripts( + _In_ DWORD dwFlags, + _In_ LPCWSTR lpString, + _In_ int cchString, + _Out_writes_opt_(cchScripts) LPWSTR lpScripts, + _In_ int cchScripts); + +BOOL WINAPI SetProcessPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG); +BOOL WINAPI SetThreadPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG); +BOOL WINAPI VerifyScripts(_In_ DWORD, _In_ LPCWSTR, _In_ int, _In_ LPCWSTR, _In_ int); + #endif /* (WINVER >= 0x0600) */ #ifdef UNICODE

1 0

[hbelusca] 58481: *** INFORMATIONAL COMMIT !! NO CODE CHANGES !! (but svn properties, yes !) *** The previous commit r58480 was the Part 2/2 of the commit r58305 from 4 weeks ago.
by hbelusca＠svn.reactos.org 13 Mar '13

13 Mar '13

Author: hbelusca Date: Wed Mar 13 01:44:48 2013 New Revision: 58481 URL: http://svn.reactos.org/svn/reactos?rev=58481&view=rev Log: *** INFORMATIONAL COMMIT !! NO CODE CHANGES !! (but svn properties, yes !) *** The previous commit r58480 was the Part 2/2 of the commit r58305 from 4 weeks ago. Modified: branches/ros-csrss/dll/win32/shell32/TODO.txt (props changed) branches/ros-csrss/dll/win32/shell32/drvdefext.h (props changed) branches/ros-csrss/dll/win32/shell32/filedefext.h (props changed) Propchange: branches/ros-csrss/dll/win32/shell32/TODO.txt ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Rev URL Propchange: branches/ros-csrss/dll/win32/shell32/drvdefext.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Rev URL Propchange: branches/ros-csrss/dll/win32/shell32/filedefext.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Rev URL

1 0

[hbelusca] 58480: [SHELL32] Implement the usage of the STARTF_TITLEISLINKNAME flag (in a STARTUPINFO structure, it signals that the program was started from a shell link, and therefore its lpTitle ...
by hbelusca＠svn.reactos.org 13 Mar '13

13 Mar '13

Author: hbelusca Date: Wed Mar 13 01:35:46 2013 New Revision: 58480 URL: http://svn.reactos.org/svn/reactos?rev=58480&view=rev Log: [SHELL32] Implement the usage of the STARTF_TITLEISLINKNAME flag (in a STARTUPINFO structure, it signals that the program was started from a shell link, and therefore its lpTitle member holds the path of the link). What I do is that, in CShellLink::InvokeCommand (called when a shortcut is being executed), I initialize the SHELLEXECUTEINFO structure such that we know that we are starting from a shortcut (use the SEE_MASK_HASLINKNAME flag), and to hold the path to the flag I use its lpClass member (which is not used for other things in this code path). Then the whole thing is passed to ShellExecuteExW which, in turn, calls the SHELL_ExecuteW function. This function reads the SHELLEXECUTEINFO structure and, if it has the flag SEE_MASK_HASLINKNAME (or SEE_MASK_HASTITLE too, if somebody also uses lpClass to pass a particular title for the startup), we use the forementioned lpClass member, holding the link path, as the title (lpTitle member) of a new STARTUPINFO object used when calling CreateProcess (and thus, launching the new application). So that this application will be aware that she was launched via a link (therefore we become compliant with the STARTF_TITLEISLINKNAME documentation). Modified: branches/ros-csrss/dll/win32/shell32/shelllink.cpp branches/ros-csrss/dll/win32/shell32/shelllink.h branches/ros-csrss/dll/win32/shell32/shlexec.cpp Modified: branches/ros-csrss/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/she… ============================================================================== --- branches/ros-csrss/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/shell32/shelllink.cpp [iso-8859-1] Wed Mar 13 01:35:46 2013 @@ -1825,10 +1825,10 @@ else path = strdupW(sPath); - if (lpici->cbSize == sizeof (CMINVOKECOMMANDINFOEX) && - (lpici->fMask & CMIC_MASK_UNICODE)) - { - LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX) lpici; + if ( lpici->cbSize == sizeof(CMINVOKECOMMANDINFOEX) && + (lpici->fMask & CMIC_MASK_UNICODE) ) + { + LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX)lpici; DWORD len = 2; if (sArgs) @@ -1854,8 +1854,10 @@ SHELLEXECUTEINFOW sei; memset(&sei, 0, sizeof sei); sei.cbSize = sizeof sei; - sei.fMask = SEE_MASK_UNICODE | (lpici->fMask & (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); + sei.fMask = SEE_MASK_HASLINKNAME | SEE_MASK_UNICODE | + (lpici->fMask & (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); sei.lpFile = path; + sei.lpClass = sLinkPath; sei.nShow = iShowCmd; sei.lpDirectory = sWorkDir; sei.lpParameters = args; Modified: branches/ros-csrss/dll/win32/shell32/shelllink.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/she… ============================================================================== --- branches/ros-csrss/dll/win32/shell32/shelllink.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/shell32/shelllink.h [iso-8859-1] Wed Mar 13 01:35:46 2013 @@ -67,11 +67,11 @@ LPWSTR sWorkDir; LPWSTR sDescription; LPWSTR sPathRel; - LPWSTR sProduct; - LPWSTR sComponent; + LPWSTR sProduct; + LPWSTR sComponent; volume_info volume; - LPWSTR sLinkPath; - BOOL bRunAs; + LPWSTR sLinkPath; + BOOL bRunAs; BOOL bDirty; INT iIdOpen; /* id of the "Open" entry in the context menu */ CComPtr<IUnknown> site; Modified: branches/ros-csrss/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/shl… ============================================================================== --- branches/ros-csrss/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/shell32/shlexec.cpp [iso-8859-1] Wed Mar 13 01:35:46 2013 @@ -450,6 +450,11 @@ startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = psei->nShow; + startup.lpTitle = (LPWSTR)(psei->fMask & (SEE_MASK_HASLINKNAME | SEE_MASK_HASTITLE) ? psei->lpClass : NULL); + + if (psei->fMask & SEE_MASK_HASLINKNAME) + startup.dwFlags |= STARTF_TITLEISLINKNAME; + dwCreationFlags = CREATE_UNICODE_ENVIRONMENT; if (psei->fMask & SEE_MASK_NO_CONSOLE)

1 0

[hbelusca] 58479: [PSDK] - Define all the missing STARTF_* flags needed for the STARTUPINFO structure (taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms686331(v=vs.85).aspx). Am...
by hbelusca＠svn.reactos.org 13 Mar '13

13 Mar '13

Author: hbelusca Date: Wed Mar 13 01:19:43 2013 New Revision: 58479 URL: http://svn.reactos.org/svn/reactos?rev=58479&view=rev Log: [PSDK] - Define all the missing STARTF_* flags needed for the STARTUPINFO structure (taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms686331(v=vs.85).a…). Amongst them is the STARTF_TITLEISLINKNAME flag that I use in the console server to determine whether a console app was started from a shell link, and if so, extract the name of the link and its icon. - Define all the missing SEE_MASK_* flags needed for the SHELLEXECUTEINFO structure, but the Windows 8 flag (taken from http://msdn.microsoft.com/en-us/library/windows/desktop/bb759784(v=vs.85).a…). Furthermore I add three undocumented flags, SEE_MASK_HASLINKNAME, SEE_MASK_HASTITLE and SEE_MASK_FLAG_SEPVDM. These three flags are undocumented and even not present in the official Windows SDK. However they are used in shobjidl.idl to define some CMIC_MASK_* flags, these ones being mentioned in the MSDN documentation of the CMINVOKECOMMANDINFOEX structure (see http://msdn.microsoft.com/en-us/library/windows/desktop/bb773217(v=vs.85).a…). So I affect them a range of values which seems to be strangely empty (see the code). Of course their values may differ from the real ones, however I have no way of discovering them. If somebody else can verify them, it would be great. Modified: branches/ros-csrss/include/psdk/shellapi.h branches/ros-csrss/include/psdk/winbase.h Modified: branches/ros-csrss/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/shellapi… ============================================================================== --- branches/ros-csrss/include/psdk/shellapi.h [iso-8859-1] (original) +++ branches/ros-csrss/include/psdk/shellapi.h [iso-8859-1] Wed Mar 13 01:19:43 2013 @@ -20,23 +20,42 @@ #define ABE_BOTTOM 3 #define ABS_AUTOHIDE 1 #define ABS_ALWAYSONTOP 2 -#define SEE_MASK_CLASSNAME 1 -#define SEE_MASK_CLASSKEY 3 -#define SEE_MASK_IDLIST 4 -#define SEE_MASK_INVOKEIDLIST 12 -#define SEE_MASK_ICON 0x10 -#define SEE_MASK_HOTKEY 0x20 -#define SEE_MASK_NOCLOSEPROCESS 0x40 -#define SEE_MASK_CONNECTNETDRV 0x80 + +#define SEE_MASK_DEFAULT 0x00000000 +#define SEE_MASK_CLASSNAME 0x00000001 +#define SEE_MASK_CLASSKEY 0x00000003 +#define SEE_MASK_IDLIST 0x00000004 +#define SEE_MASK_INVOKEIDLIST 0x0000000C +#define SEE_MASK_ICON 0x00000010 +#define SEE_MASK_HOTKEY 0x00000020 +#define SEE_MASK_NOCLOSEPROCESS 0x00000040 +#define SEE_MASK_CONNECTNETDRV 0x00000080 #define SEE_MASK_NOASYNC 0x00000100 #define SEE_MASK_FLAG_DDEWAIT SEE_MASK_NOASYNC -#define SEE_MASK_DOENVSUBST 0x200 -#define SEE_MASK_FLAG_NO_UI 0x400 -#define SEE_MASK_NO_CONSOLE 0x8000 -#define SEE_MASK_UNICODE 0x10000 -#define SEE_MASK_ASYNCOK 0x100000 -#define SEE_MASK_HMONITOR 0x200000 -#define SEE_MASK_NOZONECHECKS 0x00800000 +#define SEE_MASK_DOENVSUBST 0x00000200 +#define SEE_MASK_FLAG_NO_UI 0x00000400 +#define SEE_MASK_UNICODE 0x00004000 +#define SEE_MASK_NO_CONSOLE 0x00008000 +/* + * NOTE: The following three flags are undocumented and are not present in the + * official Windows SDK. However they are used in shobjidl.idl to define some + * CMIC_MASK_* flags, these ones being mentioned in the MSDN documentation of + * the CMINVOKECOMMANDINFOEX structure. + * I affect them this range of values which seems to be strangely empty. Of + * course their values may differ from the real ones, however I have no way + * of discovering them. If somebody else can verify them, it would be great. + */ +#define SEE_MASK_HASLINKNAME 0x00010000 +#define SEE_MASK_HASTITLE 0x00020000 +#define SEE_MASK_FLAG_SEPVDM 0x00040000 +/* END NOTE */ +#define SEE_MASK_ASYNCOK 0x00100000 +#define SEE_MASK_HMONITOR 0x00200000 +#define SEE_MASK_NOZONECHECKS 0x00800000 +#define SEE_MASK_NOQUERYCLASSSTORE 0x01000000 +#define SEE_MASK_WAITFORINPUTIDLE 0x02000000 +#define SEE_MASK_FLAG_LOG_USAGE 0x04000000 + #define ABM_NEW 0 #define ABM_REMOVE 1 #define ABM_QUERYPOS 2 Modified: branches/ros-csrss/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winbase.… ============================================================================== --- branches/ros-csrss/include/psdk/winbase.h [iso-8859-1] (original) +++ branches/ros-csrss/include/psdk/winbase.h [iso-8859-1] Wed Mar 13 01:19:43 2013 @@ -467,16 +467,23 @@ #define STREAM_MODIFIED_WHEN_READ 1 #define STREAM_CONTAINS_SECURITY 2 #define STREAM_CONTAINS_PROPERTIES 4 -#define STARTF_USESHOWWINDOW 1 -#define STARTF_USESIZE 2 -#define STARTF_USEPOSITION 4 -#define STARTF_USECOUNTCHARS 8 -#define STARTF_USEFILLATTRIBUTE 16 -#define STARTF_RUNFULLSCREEN 32 -#define STARTF_FORCEONFEEDBACK 64 -#define STARTF_FORCEOFFFEEDBACK 128 -#define STARTF_USESTDHANDLES 256 -#define STARTF_USEHOTKEY 512 + +#define STARTF_USESHOWWINDOW 0x00000001 +#define STARTF_USESIZE 0x00000002 +#define STARTF_USEPOSITION 0x00000004 +#define STARTF_USECOUNTCHARS 0x00000008 +#define STARTF_USEFILLATTRIBUTE 0x00000010 +#define STARTF_RUNFULLSCREEN 0x00000020 +#define STARTF_FORCEONFEEDBACK 0x00000040 +#define STARTF_FORCEOFFFEEDBACK 0x00000080 +#define STARTF_USESTDHANDLES 0x00000100 +#if (WINVER >= 0x400) +#define STARTF_USEHOTKEY 0x00000200 +#define STARTF_TITLEISLINKNAME 0x00000800 +#define STARTF_TITLEISAPPID 0x00001000 +#define STARTF_PREVENTPINNING 0x00002000 +#endif /* (WINVER >= 0x400) */ + #define TC_NORMAL 0 #define TC_HARDERR 1 #define TC_GP_TRAP 2

1 0

[ekohl] 58478: [SAMSRV] Set MaxPasswordAge, LockoutDuration and LockoutObservationWindow for domains during setup.
by ekohl＠svn.reactos.org 12 Mar '13

12 Mar '13

Author: ekohl Date: Tue Mar 12 21:27:35 2013 New Revision: 58478 URL: http://svn.reactos.org/svn/reactos?rev=58478&view=rev Log: [SAMSRV] Set MaxPasswordAge, LockoutDuration and LockoutObservationWindow for domains during setup. Modified: trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Tue Mar 12 21:27:35 2013 @@ -69,11 +69,11 @@ ULONG Reserved; LARGE_INTEGER CreationTime; LARGE_INTEGER DomainModifiedCount; - LARGE_INTEGER MaxPasswordAge; - LARGE_INTEGER MinPasswordAge; - LARGE_INTEGER ForceLogoff; - LARGE_INTEGER LockoutDuration; - LARGE_INTEGER LockoutObservationWindow; + LARGE_INTEGER MaxPasswordAge; /* relative Time */ + LARGE_INTEGER MinPasswordAge; /* relative Time */ + LARGE_INTEGER ForceLogoff; /* relative Time */ + LARGE_INTEGER LockoutDuration; /* relative Time */ + LARGE_INTEGER LockoutObservationWindow; /* relative Time */ LARGE_INTEGER ModifiedCountAtLastPromotion; ULONG NextRid; ULONG PasswordProperties; Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Tue Mar 12 21:27:35 2013 @@ -13,9 +13,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + /* GLOBALS *****************************************************************/ +#define TICKS_PER_SECOND 10000000LL + SID_IDENTIFIER_AUTHORITY SecurityNtAuthority = {SECURITY_NT_AUTHORITY}; + /* FUNCTIONS ***************************************************************/ @@ -423,11 +427,11 @@ FixedData.Version = 1; NtQuerySystemTime(&FixedData.CreationTime); FixedData.DomainModifiedCount.QuadPart = 0; -// FixedData.MaxPasswordAge // 6 Weeks - FixedData.MinPasswordAge.QuadPart = 0; // Now -// FixedData.ForceLogoff -// FixedData.LockoutDuration // 30 minutes -// FixedData.LockoutObservationWindow // 30 minutes + FixedData.MaxPasswordAge.QuadPart = -(6LL * 7LL * 24LL * 60LL * 60LL * TICKS_PER_SECOND); /* 6 weeks */ + FixedData.MinPasswordAge.QuadPart = 0; /* right now */ +// FixedData.ForceLogoff.QuadPart = // very far in the future aka never + FixedData.LockoutDuration.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND); /* 30 minutes */ + FixedData.LockoutObservationWindow.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND); /* 30 minutes */ FixedData.ModifiedCountAtLastPromotion.QuadPart = 0; FixedData.NextRid = 1000; FixedData.PasswordProperties = 0;

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