Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[hpoussin] 65866: [FREELDR] Add missing dependency (required by scsiport.c)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Dec 28 22:15:34 2014 New Revision: 65866 URL: http://svn.reactos.org/svn/reactos?rev=65866&view=rev Log: [FREELDR] Add missing dependency (required by scsiport.c) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Dec 28 22:15:34 2014 @@ -167,6 +167,7 @@ if(ARCH STREQUAL "i386" AND NOT MSVC) list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) + target_link_libraries(freeldr_common mini_hal) endif() if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")

9 years, 8 months

[hpoussin] 65865: [WHOAMI] Better error message when we're unable to find the logon SID

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Dec 28 22:15:08 2014 New Revision: 65865 URL: http://svn.reactos.org/svn/reactos?rev=65865&view=rev Log: [WHOAMI] Better error message when we're unable to find the logon SID Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] Sun Dec 28 22:15:08 2014 @@ -386,7 +386,13 @@ } } - if (pSid == 0 || !ConvertSidToStringSidW(pSid, &pSidStr)) + if (pSid == 0) + { + WhoamiFree(pGroupInfo); + wprintf(L"ERROR: Couldn't find the logon SID.\n"); + return 1; + } + if (!ConvertSidToStringSidW(pSid, &pSidStr)) { WhoamiFree(pGroupInfo); wprintf(L"ERROR: Couldn't convert the logon SID to a string.\n");

9 years, 8 months

[pschweitzer] 65864: [NTOSKRNL] Add missing specifiers

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 28 21:29:32 2014 New Revision: 65864 URL: http://svn.reactos.org/svn/reactos?rev=65864&view=rev Log: [NTOSKRNL] Add missing specifiers Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sun Dec 28 21:29:32 2014 @@ -1318,7 +1318,7 @@ PDEVICE_OBJECT NTAPI -IopGetDeviceAttachmentBase(PDEVICE_OBJECT DeviceObject) +IopGetDeviceAttachmentBase(IN PDEVICE_OBJECT DeviceObject) { PDEVICE_OBJECT PDO = DeviceObject; @@ -1331,7 +1331,7 @@ PDEVICE_OBJECT NTAPI -IopGetDevicePDO(PDEVICE_OBJECT DeviceObject) +IopGetDevicePDO(IN PDEVICE_OBJECT DeviceObject) { KIRQL OldIrql; PDEVICE_OBJECT PDO;

9 years, 8 months

[hbelusca] 65863: [WIN32K] A bit of code reorganization: - move a maximum of typedefs into their corresponding headers, - move user heap functionality into a dedicated header, - add a note in some ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 28 20:50:35 2014 New Revision: 65863 URL: http://svn.reactos.org/svn/reactos?rev=65863&view=rev Log: [WIN32K] A bit of code reorganization: - move a maximum of typedefs into their corresponding headers, - move user heap functionality into a dedicated header, - add a note in some functions that the first heap mapping entry in the W32 process info structure is dedicated for the global user heap mapping, - remove extra-parenthesis in casts. Added: trunk/reactos/win32ss/user/ntuser/usrheap.h (with props) Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/palette.h trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/desktop.h trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/ntuser/usrheap.c trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/win32kp.h Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -132,6 +132,7 @@ PVOID pSurfInfo; POINTL ptlDoBanding; } DC; +// typedef struct _DC *PDC; extern PDC defaultDCstate; Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -44,7 +44,7 @@ ULONG ulBlueShift; HDEV hPDev; PALETTEENTRY apalColors[0]; -} PALETTE; +} PALETTE, *PPALETTE; extern PALETTE gpalRGB, gpalBGR, gpalRGB555, gpalRGB565, *gppalMono, *gppalDefault; extern PPALETTE appalSurfaceDefault[]; Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -1893,8 +1893,12 @@ ppi = PsGetCurrentProcessWin32Process(); - /* Find out if another thread already mapped the desktop heap */ - PrevLink = &ppi->HeapMappings.Next; + /* + * Find out if another thread already mapped the desktop heap. + * Start the search at the next mapping: skip the first entry + * as it must be the global user heap mapping. + */ + PrevLink = &ppi->HeapMappings.Next; HeapMapping = *PrevLink; while (HeapMapping != NULL) { @@ -1904,7 +1908,7 @@ return STATUS_SUCCESS; } - PrevLink = &HeapMapping->Next; + PrevLink = &HeapMapping->Next; HeapMapping = HeapMapping->Next; } @@ -1929,7 +1933,7 @@ TRACE("ppi 0x%p mapped heap of desktop 0x%p\n", ppi, pdesk); /* Add the mapping */ - HeapMapping = UserHeapAlloc(sizeof(W32HEAP_USER_MAPPING)); + HeapMapping = UserHeapAlloc(sizeof(*HeapMapping)); if (HeapMapping == NULL) { MmUnmapViewOfSection(PsGetCurrentProcess(), UserBase); Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -37,7 +37,7 @@ /* Thread blocking input */ PVOID BlockInputThread; LIST_ENTRY ShellHookWindows; -} DESKTOP; +} DESKTOP, *PDESKTOP; // Desktop flags #define DF_TME_HOVER 0x00000400 @@ -259,6 +259,11 @@ pheapDesktop = pti->rpdesk->pheapDesktop; W32Process = PsGetCurrentProcessWin32Process(); + + /* + * Start the search at the next mapping: skip the first entry + * as it must be the global user heap mapping. + */ Mapping = W32Process->HeapMappings.Next; while (Mapping != NULL) { @@ -281,6 +286,11 @@ PPROCESSINFO W32Process; W32Process = PsGetCurrentProcessWin32Process(); + + /* + * Start the search at the next mapping: skip the first entry + * as it must be the global user heap mapping. + */ Mapping = W32Process->HeapMappings.Next; while (Mapping != NULL) { @@ -303,4 +313,5 @@ BOOL FASTCALL DesktopWindowProc(PWND, UINT, WPARAM, LPARAM, LRESULT *); BOOL FASTCALL UserMessageWindowProc(PWND pwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *lResult); VOID NTAPI DesktopThreadMain(); + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -23,9 +23,6 @@ NTSTATUS GdiProcessDestroy(PEPROCESS Process); NTSTATUS GdiThreadCreate(PETHREAD Thread); NTSTATUS GdiThreadDestroy(PETHREAD Thread); - -HANDLE GlobalUserHeap = NULL; -PVOID GlobalUserHeapSection = NULL; PSERVERINFO gpsi = NULL; // Global User Server Information. Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -24,78 +24,4 @@ BOOL FASTCALL UserIsEntered(VOID); BOOL FASTCALL UserIsEnteredExclusive(VOID); -/* User heap */ -extern HANDLE GlobalUserHeap; - -PWIN32HEAP -UserCreateHeap(OUT PVOID *SectionObject, - IN OUT PVOID *SystemBase, - IN SIZE_T HeapSize); - -static __inline PVOID -UserHeapAlloc(SIZE_T Bytes) -{ - return RtlAllocateHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - Bytes); -} - -static __inline BOOL -UserHeapFree(PVOID lpMem) -{ - return RtlFreeHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - lpMem); -} - -static __inline PVOID -UserHeapReAlloc(PVOID lpMem, - SIZE_T Bytes) -{ -#if 0 - /* NOTE: ntoskrnl doesn't export RtlReAllocateHeap... */ - return RtlReAllocateHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - lpMem, - Bytes); -#else - SIZE_T PrevSize; - PVOID pNew; - - PrevSize = RtlSizeHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - lpMem); - - if (PrevSize == Bytes) - return lpMem; - - pNew = RtlAllocateHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - Bytes); - if (pNew != NULL) - { - if (PrevSize < Bytes) - Bytes = PrevSize; - - RtlCopyMemory(pNew, - lpMem, - Bytes); - - RtlFreeHeap(GlobalUserHeap, - HEAP_NO_SERIALIZE, - lpMem); - } - - return pNew; -#endif -} - -static __inline PVOID -UserHeapAddressToUser(PVOID lpMem) -{ - PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); - return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)GlobalUserHeap) + - (ULONG_PTR)W32Process->HeapMappings.UserMapping); -} - /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/usrhea… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/usrheap.c [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -22,6 +22,9 @@ #define NDEBUG #include <debug.h> +HANDLE GlobalUserHeap = NULL; +PVOID GlobalUserHeapSection = NULL; + _Function_class_(RTL_HEAP_COMMIT_ROUTINE) _IRQL_requires_same_ @@ -63,7 +66,6 @@ { SIZE_T ViewSize = 0; LARGE_INTEGER Offset; - extern PVOID GlobalUserHeapSection; /* HACK: This needs to be handled during startup only... */ ASSERT(Base == (PVOID)GlobalUserHeap); @@ -86,8 +88,8 @@ } /* Apply the commit address offset to the user base address */ - Delta = (SIZE_T) ((ULONG_PTR) (*CommitAddress) - (ULONG_PTR) (Base)); - UserCommitAddress = (PVOID) ((ULONG_PTR) (UserBase) + Delta); + Delta = (SIZE_T)((ULONG_PTR)(*CommitAddress) - (ULONG_PTR)Base); + UserCommitAddress = (PVOID)((ULONG_PTR)UserBase + Delta); /* Perform the actual commit */ Status = ZwAllocateVirtualMemory(NtCurrentProcess(), @@ -100,8 +102,8 @@ if (NT_SUCCESS(Status)) { /* Determine the address to return */ - Delta = (SIZE_T) ((ULONG_PTR) (UserCommitAddress) - (ULONG_PTR) (UserBase)); - *CommitAddress = (PVOID) ((ULONG_PTR) (Base) + Delta); + Delta = (SIZE_T)((ULONG_PTR)UserCommitAddress - (ULONG_PTR)UserBase); + *CommitAddress = (PVOID)((ULONG_PTR)Base + Delta); } if (W32Process == NULL) Added: trunk/reactos/win32ss/user/ntuser/usrheap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/usrhea… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/usrheap.h (added) +++ trunk/reactos/win32ss/user/ntuser/usrheap.h [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -0,0 +1,93 @@ +#pragma once + +typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; + +/* +typedef struct _W32HEAP_USER_MAPPING +{ + struct _W32HEAP_USER_MAPPING* Next; + PVOID KernelMapping; + PVOID UserMapping; + ULONG_PTR Limit; + ULONG Count; +} W32HEAP_USER_MAPPING, *PW32HEAP_USER_MAPPING; +*/ + +/* User heap */ +extern HANDLE GlobalUserHeap; +extern PVOID GlobalUserHeapSection; + +PWIN32HEAP +UserCreateHeap(OUT PVOID *SectionObject, + IN OUT PVOID *SystemBase, + IN SIZE_T HeapSize); + +static __inline PVOID +UserHeapAlloc(SIZE_T Bytes) +{ + return RtlAllocateHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + Bytes); +} + +static __inline BOOL +UserHeapFree(PVOID lpMem) +{ + return RtlFreeHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem); +} + +static __inline PVOID +UserHeapReAlloc(PVOID lpMem, + SIZE_T Bytes) +{ +#if 0 + /* NOTE: ntoskrnl doesn't export RtlReAllocateHeap... */ + return RtlReAllocateHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem, + Bytes); +#else + SIZE_T PrevSize; + PVOID pNew; + + PrevSize = RtlSizeHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem); + + if (PrevSize == Bytes) + return lpMem; + + pNew = RtlAllocateHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + Bytes); + if (pNew != NULL) + { + if (PrevSize < Bytes) + Bytes = PrevSize; + + RtlCopyMemory(pNew, + lpMem, + Bytes); + + RtlFreeHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem); + } + + return pNew; +#endif +} + +static __inline PVOID +UserHeapAddressToUser(PVOID lpMem) +{ + PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); + + /* The first mapping entry is the global user heap mapping */ + return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)GlobalUserHeap) + + (ULONG_PTR)W32Process->HeapMappings.UserMapping); +} + +/* EOF */ Propchange: trunk/reactos/win32ss/user/ntuser/usrheap.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -52,7 +52,6 @@ extern PCLS SystemClassList; extern BOOL RegisteredSysClasses; -typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; typedef struct tagMENUSTATE MENUSTATE, *PMENUSTATE; #include <pshpack1.h> @@ -172,6 +171,7 @@ } \ } while(0) + #define IntReferenceProcessInfo(ppi) \ InterlockedIncrement((volatile LONG*)(&(ppi)->RefCount)) Modified: trunk/reactos/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?rev=6586… ============================================================================== --- trunk/reactos/win32ss/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32kp.h [iso-8859-1] Sun Dec 28 20:50:35 2014 @@ -38,8 +38,8 @@ /* Internal NtGdi Headers */ typedef struct _DC *PDC; -typedef struct _PALETTE *PPALETTE; #include "gdi/ntgdi/gdiobj.h" +#include "gdi/ntgdi/palette.h" #include "gdi/eng/surface.h" #include "gdi/eng/pdevobj.h" #include "gdi/eng/ldevobj.h" @@ -57,7 +57,6 @@ #include "gdi/ntgdi/brush.h" #include "gdi/ntgdi/color.h" #include "gdi/ntgdi/bitmaps.h" -#include "gdi/ntgdi/palette.h" #include "gdi/ntgdi/region.h" #include "gdi/ntgdi/dc.h" #include "gdi/ntgdi/dib.h" @@ -74,8 +73,8 @@ #include "reactx/ntddraw/intddraw.h" /* Internal NtUser Headers */ -typedef struct _DESKTOP *PDESKTOP; #include "user/ntuser/win32.h" +#include "user/ntuser/usrheap.h" #include "user/ntuser/object.h" #include "user/ntuser/ntuser.h" #include "user/ntuser/shutdown.h"

9 years, 8 months

[pschweitzer] 65862: [NTOSKRNL] - In case of AssignSecurityDescriptor operation in IopGetSetSecurityObject(), put the security descriptor in cache before attempting the assignement - In IopUnloadDe...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 28 18:31:06 2014 New Revision: 65862 URL: http://svn.reactos.org/svn/reactos?rev=65862&view=rev Log: [NTOSKRNL] - In case of AssignSecurityDescriptor operation in IopGetSetSecurityObject(), put the security descriptor in cache before attempting the assignement - In IopUnloadDevice(), don't attempt to free the security descriptor, let this to Ob by just derefencing it. Spotted & fixed by Thomas. This unregresses VMware Tools installation. CORE-7991 Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sun Dec 28 18:31:06 2014 @@ -396,8 +396,8 @@ /* Check if we have a Security Descriptor */ if (DeviceObject->SecurityDescriptor) { - /* Free it */ - ExFreePoolWithTag(DeviceObject->SecurityDescriptor, TAG_SD); + /* Dereference it */ + ObDereferenceSecurityDescriptor(DeviceObject->SecurityDescriptor, 1); } /* Remove the device from the list */ Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sun Dec 28 18:31:06 2014 @@ -1551,15 +1551,30 @@ } else if (OperationCode == AssignSecurityDescriptor) { + Status = STATUS_SUCCESS; + /* Make absolutely sure this is a device object */ if (!(FileObject) || !(FileObject->Flags & FO_STREAM_FILE)) { - /* Assign the Security Descriptor */ - DeviceObject->SecurityDescriptor = SecurityDescriptor; - } - - /* Return success */ - return STATUS_SUCCESS; + PSECURITY_DESCRIPTOR CachedSecurityDescriptor; + + /* Add the security descriptor in cache */ + Status = ObLogSecurityDescriptor(SecurityDescriptor, &CachedSecurityDescriptor, 1); + if (NT_SUCCESS(Status)) + { + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&IopSecurityResource, TRUE); + + /* Assign the Security Descriptor */ + DeviceObject->SecurityDescriptor = CachedSecurityDescriptor; + + ExReleaseResourceLite(&IopSecurityResource); + KeLeaveCriticalRegion(); + } + } + + /* Return status */ + return Status; } else if (OperationCode == SetSecurityDescriptor) {

9 years, 8 months

[hbelusca] 65861: [WIN32K] Split init code into GDI part and USER part. Don't use Eng* functions to initialize the InputIdleEvent. Part 2/x

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 28 15:28:00 2014 New Revision: 65861 URL: http://svn.reactos.org/svn/reactos?rev=65861&view=rev Log: [WIN32K] Split init code into GDI part and USER part. Don't use Eng* functions to initialize the InputIdleEvent. Part 2/x Modified: trunk/reactos/win32ss/gdi/ntgdi/init.c trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/gdi/ntgdi/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/init.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/init.c [iso-8859-1] Sun Dec 28 15:28:00 2014 @@ -12,6 +12,67 @@ #include <debug.h> #include <kdros.h> +BOOL NTAPI GDI_CleanupForProcess(struct _EPROCESS *Process); + +NTSTATUS +GdiProcessCreate(PEPROCESS Process) +{ + PPROCESSINFO ppiCurrent = PsGetProcessWin32Process(Process); + ASSERT(ppiCurrent); + + InitializeListHead(&ppiCurrent->PrivateFontListHead); + ExInitializeFastMutex(&ppiCurrent->PrivateFontListLock); + + InitializeListHead(&ppiCurrent->GDIBrushAttrFreeList); + InitializeListHead(&ppiCurrent->GDIDcAttrFreeList); + + /* Map the GDI handle table to user land */ + Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process); + Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; + + /* Create pools for GDI object attributes */ + ppiCurrent->pPoolDcAttr = GdiPoolCreate(sizeof(DC_ATTR), 'acdG'); + ppiCurrent->pPoolBrushAttr = GdiPoolCreate(sizeof(BRUSH_ATTR), 'arbG'); + ppiCurrent->pPoolRgnAttr = GdiPoolCreate(sizeof(RGN_ATTR), 'agrG'); + ASSERT(ppiCurrent->pPoolDcAttr); + ASSERT(ppiCurrent->pPoolBrushAttr); + ASSERT(ppiCurrent->pPoolRgnAttr); + + return STATUS_SUCCESS; +} + +NTSTATUS +GdiProcessDestroy(PEPROCESS Process) +{ + PPROCESSINFO ppiCurrent = PsGetProcessWin32Process(Process); + ASSERT(ppiCurrent); + ASSERT(ppiCurrent->peProcess == Process); + + /* And GDI ones too */ + GDI_CleanupForProcess(Process); + + /* So we can now free the pools */ + GdiPoolDestroy(ppiCurrent->pPoolDcAttr); + GdiPoolDestroy(ppiCurrent->pPoolBrushAttr); + GdiPoolDestroy(ppiCurrent->pPoolRgnAttr); + + return STATUS_SUCCESS; +} + + +NTSTATUS +GdiThreadCreate(PETHREAD Thread) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +GdiThreadDestroy(PETHREAD Thread) +{ + return STATUS_SUCCESS; +} + + /* * @implemented */ Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sun Dec 28 15:28:00 2014 @@ -15,11 +15,14 @@ HANDLE hModuleWin; -PGDI_HANDLE_TABLE NTAPI GDIOBJ_iAllocHandleTable(OUT PVOID *SectionObject); -BOOL NTAPI GDI_CleanupForProcess (struct _EPROCESS *Process); - NTSTATUS DestroyProcessCallback(PEPROCESS Process); NTSTATUS NTAPI DestroyThreadCallback(PETHREAD Thread); + +// TODO: Should be moved to some GDI header +NTSTATUS GdiProcessCreate(PEPROCESS Process); +NTSTATUS GdiProcessDestroy(PEPROCESS Process); +NTSTATUS GdiThreadCreate(PETHREAD Thread); +NTSTATUS GdiThreadDestroy(PETHREAD Thread); HANDLE GlobalUserHeap = NULL; PVOID GlobalUserHeapSection = NULL; @@ -77,7 +80,7 @@ return STATUS_NO_MEMORY; } - TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", + TRACE_CH(UserProcess, "Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); RtlZeroMemory(ppiCurrent, sizeof(*ppiCurrent)); @@ -104,7 +107,8 @@ { if (ppiCurrent->InputIdleEvent) { - EngDeleteEvent((PEVENT)ppiCurrent->InputIdleEvent); + /* Free the allocated memory */ + ExFreePoolWithTag(ppiCurrent->InputIdleEvent, USERTAG_EVENT); } /* Close the startup desktop */ @@ -121,6 +125,109 @@ /* Free the PROCESSINFO */ ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); +} + +NTSTATUS +UserProcessCreate(PEPROCESS Process) +{ + PPROCESSINFO ppiCurrent = PsGetProcessWin32Process(Process); + ASSERT(ppiCurrent); + + InitializeListHead(&ppiCurrent->DriverObjListHead); + ExInitializeFastMutex(&ppiCurrent->DriverObjListLock); + + ppiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout(); + { + PKEVENT Event; + + /* Allocate memory for the event structure */ + Event = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*Event), + USERTAG_EVENT); + if (Event) + { + /* Initialize the kernel event */ + KeInitializeEvent(Event, + SynchronizationEvent, + FALSE); + } + else + { + /* Out of memory */ + DPRINT("CreateEvent() failed\n"); + KeBugCheck(0); + } + + /* Set the event */ + ppiCurrent->InputIdleEvent = Event; + KeInitializeEvent(ppiCurrent->InputIdleEvent, NotificationEvent, FALSE); + } + + ppiCurrent->peProcess = Process; + + /* Setup process flags */ + ppiCurrent->W32PF_flags = W32PF_PROCESSCONNECTED; + if ( Process->Peb->ProcessParameters && + Process->Peb->ProcessParameters->WindowFlags & STARTF_SCRNSAVER ) + { + ppiScrnSaver = ppiCurrent; + ppiCurrent->W32PF_flags |= W32PF_SCREENSAVER; + } + + // FIXME: check if this process is allowed. + ppiCurrent->W32PF_flags |= W32PF_ALLOWFOREGROUNDACTIVATE; // Starting application it will get toggled off. + + return STATUS_SUCCESS; +} + +NTSTATUS +UserProcessDestroy(PEPROCESS Process) +{ + PPROCESSINFO ppiCurrent = PsGetProcessWin32Process(Process); + ASSERT(ppiCurrent); + + if (ppiScrnSaver == ppiCurrent) + ppiScrnSaver = NULL; + + /* Destroy user objects */ + UserDestroyObjectsForOwner(gHandleTable, ppiCurrent); + + TRACE_CH(UserProcess, "Freeing ppi 0x%p\n", ppiCurrent); +#if DBG + if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) + { + TRACE_CH(UserObj, "Dumping user handles at the end of the process %s (Info %p).\n", + ppiCurrent->peProcess->ImageFileName, ppiCurrent); + DbgUserDumpHandleTable(); + } +#endif + + /* Remove it from the list of GUI apps */ + co_IntGraphicsCheck(FALSE); + + /* + * Deregister logon application automatically + */ + if (gpidLogon == ppiCurrent->peProcess->UniqueProcessId) + gpidLogon = 0; + + /* Close the current window station */ + UserSetProcessWindowStation(NULL); + + if (gppiInputProvider == ppiCurrent) gppiInputProvider = NULL; + + if (ppiCurrent->hdeskStartup) + { + ZwClose(ppiCurrent->hdeskStartup); + ppiCurrent->hdeskStartup = NULL; + } + +#ifdef NEW_CURSORICON + /* Clean up the process icon cache */ + IntCleanupCurIconCache(ppiCurrent); +#endif + + return STATUS_SUCCESS; } NTSTATUS @@ -131,7 +238,6 @@ SIZE_T ViewSize = 0; LARGE_INTEGER Offset; PVOID UserBase = NULL; - PRTL_USER_PROCESS_PARAMETERS pParams = Process->Peb->ProcessParameters; /* We might be called with an already allocated win32 process */ ppiCurrent = PsGetProcessWin32Process(Process); @@ -171,7 +277,7 @@ PAGE_EXECUTE_READ); /* would prefer PAGE_READONLY, but thanks to RTL heaps... */ if (!NT_SUCCESS(Status)) { - TRACE_CH(UserProcess,"Failed to map the global heap! 0x%x\n", Status); + TRACE_CH(UserProcess, "Failed to map the global heap! 0x%x\n", Status); goto error; } ppiCurrent->HeapMappings.Next = NULL; @@ -179,49 +285,21 @@ ppiCurrent->HeapMappings.UserMapping = UserBase; ppiCurrent->HeapMappings.Count = 1; - InitializeListHead(&ppiCurrent->GDIBrushAttrFreeList); - InitializeListHead(&ppiCurrent->GDIDcAttrFreeList); - - InitializeListHead(&ppiCurrent->PrivateFontListHead); - ExInitializeFastMutex(&ppiCurrent->PrivateFontListLock); - - InitializeListHead(&ppiCurrent->DriverObjListHead); - ExInitializeFastMutex(&ppiCurrent->DriverObjListLock); - - ppiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout(); - if (!EngCreateEvent((PEVENT *)&ppiCurrent->InputIdleEvent)) - { - KeBugCheck(0); - } - - KeInitializeEvent(ppiCurrent->InputIdleEvent, NotificationEvent, FALSE); - - /* Map the gdi handle table to user land */ - Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process); - Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; - pParams = Process->Peb->ProcessParameters; - - ppiCurrent->peProcess = Process; - /* Setup process flags */ - ppiCurrent->W32PF_flags = W32PF_THREADCONNECTED; - - if ( pParams && - pParams->WindowFlags & STARTF_SCRNSAVER ) - { - ppiScrnSaver = ppiCurrent; - ppiCurrent->W32PF_flags |= W32PF_SCREENSAVER; - } - - // FIXME: check if this process is allowed. - ppiCurrent->W32PF_flags |= W32PF_ALLOWFOREGROUNDACTIVATE; // Starting application it will get toggled off. - - /* Create pools for GDI object attributes */ - ppiCurrent->pPoolDcAttr = GdiPoolCreate(sizeof(DC_ATTR), 'acdG'); - ppiCurrent->pPoolBrushAttr = GdiPoolCreate(sizeof(BRUSH_ATTR), 'arbG'); - ppiCurrent->pPoolRgnAttr = GdiPoolCreate(sizeof(RGN_ATTR), 'agrG'); - ASSERT(ppiCurrent->pPoolDcAttr); - ASSERT(ppiCurrent->pPoolBrushAttr); - ASSERT(ppiCurrent->pPoolRgnAttr); + /* Initialize USER process info */ + Status = UserProcessCreate(Process); + if (!NT_SUCCESS(Status)) + { + ERR_CH(UserProcess, "UserProcessCreate failed, Status 0x%08lx\n", Status); + goto error; + } + + /* Initialize GDI process info */ + Status = GdiProcessCreate(Process); + if (!NT_SUCCESS(Status)) + { + ERR_CH(UserProcess, "GdiProcessCreate failed, Status 0x%08lx\n", Status); + goto error; + } /* Add the process to the global list */ ppiCurrent->ppiNext = gppiList; @@ -230,7 +308,7 @@ return STATUS_SUCCESS; error: - ERR_CH(UserProcess,"CreateProcessCallback failed! Freeing ppi 0x%p for PID:0x%lx\n", + ERR_CH(UserProcess, "CreateProcessCallback failed! Freeing ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); DestroyProcessCallback(Process); return Status; @@ -244,67 +322,25 @@ /* Get the Win32 Process */ ppiCurrent = PsGetProcessWin32Process(Process); ASSERT(ppiCurrent); + ASSERT(ppiCurrent->peProcess == Process); TRACE_CH(UserProcess, "Destroying ppi 0x%p\n", ppiCurrent); ppiCurrent->W32PF_flags |= W32PF_TERMINATED; - - if (ppiScrnSaver == ppiCurrent) - ppiScrnSaver = NULL; - - /* Destroy user objects */ - UserDestroyObjectsForOwner(gHandleTable, ppiCurrent); - - TRACE_CH(UserProcess,"Freeing ppi 0x%p\n", ppiCurrent); -#if DBG - if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) - { - TRACE_CH(UserObj, "Dumping user handles at the end of the process %s (Info %p).\n", - ppiCurrent->peProcess->ImageFileName, ppiCurrent); - DbgUserDumpHandleTable(); - } -#endif - - /* And GDI ones too */ - GDI_CleanupForProcess(Process); - - /* So we can now free the pools */ - GdiPoolDestroy(ppiCurrent->pPoolDcAttr); - GdiPoolDestroy(ppiCurrent->pPoolBrushAttr); - GdiPoolDestroy(ppiCurrent->pPoolRgnAttr); - - /* Remove it from the list of GUI apps */ - co_IntGraphicsCheck(FALSE); - - /* - * Deregister logon application automatically - */ - if (gpidLogon == ppiCurrent->peProcess->UniqueProcessId) - gpidLogon = 0; - - /* Close the current window station */ - UserSetProcessWindowStation(NULL); - - if (gppiInputProvider == ppiCurrent) gppiInputProvider = NULL; /* Remove it from the list */ pppi = &gppiList; while (*pppi != NULL && *pppi != ppiCurrent) + { pppi = &(*pppi)->ppiNext; - + } ASSERT(*pppi == ppiCurrent); - *pppi = ppiCurrent->ppiNext; - if (ppiCurrent->hdeskStartup) - { - ZwClose(ppiCurrent->hdeskStartup); - ppiCurrent->hdeskStartup = NULL; - } - -#ifdef NEW_CURSORICON - /* Clean up the process icon cache */ - IntCleanupCurIconCache(ppiCurrent); -#endif + /* Cleanup GDI info */ + GdiProcessDestroy(Process); + + /* Cleanup USER info */ + UserProcessDestroy(Process); /* The process is dying */ PsSetProcessWin32Process(Process, NULL, ppiCurrent); @@ -325,7 +361,7 @@ ASSERT(Process->Peb); - TRACE_CH(UserProcess,"Win32kProcessCallback -->\n"); + TRACE_CH(UserProcess, "Win32kProcessCallback -->\n"); UserEnterExclusive(); @@ -340,7 +376,7 @@ UserLeave(); - TRACE_CH(UserProcess,"<-- Win32kProcessCallback\n"); + TRACE_CH(UserProcess, "<-- Win32kProcessCallback\n"); return Status; } @@ -374,7 +410,7 @@ return STATUS_NO_MEMORY; } - TRACE_CH(UserThread,"Allocated pti 0x%p for TID:0x%lx\n", + TRACE_CH(UserThread, "Allocated pti 0x%p for TID:0x%lx\n", ptiCurrent, HandleToUlong(Thread->Cid.UniqueThread)); RtlZeroMemory(ptiCurrent, sizeof(*ptiCurrent)); @@ -394,14 +430,14 @@ } while(0) /* - Called from IntDereferenceThreadInfo. + * Called from IntDereferenceThreadInfo */ VOID UserDeleteW32Thread(PTHREADINFO pti) { PPROCESSINFO ppi = pti->ppi; - TRACE_CH(UserThread,"UserDeleteW32Thread pti 0x%p\n",pti); + TRACE_CH(UserThread, "UserDeleteW32Thread pti 0x%p\n",pti); /* Free the message queue */ if (pti->MessageQueue) @@ -414,6 +450,18 @@ ExFreePoolWithTag(pti, USERTAG_THREADINFO); IntDereferenceProcessInfo(ppi); +} + +NTSTATUS +UserThreadCreate(PETHREAD Thread) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +UserThreadDestroy(PETHREAD Thread) +{ + return STATUS_SUCCESS; } NTSTATUS NTAPI @@ -447,6 +495,9 @@ IntReferenceProcessInfo(ptiCurrent->ppi); pTeb->Win32ThreadInfo = ptiCurrent; ptiCurrent->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; + + /* Mark the process as having threads */ + ptiCurrent->ppi->W32PF_flags |= W32PF_THREADCONNECTED; InitializeListHead(&ptiCurrent->WindowListHead); InitializeListHead(&ptiCurrent->W32CallbackListHead); @@ -468,18 +519,18 @@ NULL, SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status)) { - ERR_CH(UserThread, "Event creation failed, Status 0x%08x.\n", Status); - goto error; + ERR_CH(UserThread, "Event creation failed, Status 0x%08x.\n", Status); + goto error; } Status = ObReferenceObjectByHandle(ptiCurrent->hEventQueueClient, 0, *ExEventObjectType, KernelMode, (PVOID*)&ptiCurrent->pEventQueueServer, NULL); if (!NT_SUCCESS(Status)) { - ERR_CH(UserThread, "Failed referencing the event object, Status 0x%08x.\n", Status); - ZwClose(ptiCurrent->hEventQueueClient); - ptiCurrent->hEventQueueClient = NULL; - goto error; + ERR_CH(UserThread, "Failed referencing the event object, Status 0x%08x.\n", Status); + ZwClose(ptiCurrent->hEventQueueClient); + ptiCurrent->hEventQueueClient = NULL; + goto error; } KeQueryTickCount(&LargeTickCount); @@ -488,7 +539,7 @@ ptiCurrent->MessageQueue = MsqCreateMessageQueue(ptiCurrent); if (ptiCurrent->MessageQueue == NULL) { - ERR_CH(UserThread,"Failed to allocate message loop\n"); + ERR_CH(UserThread, "Failed to allocate message loop\n"); Status = STATUS_NO_MEMORY; goto error; } @@ -509,7 +560,7 @@ /* Initialize the CLIENTINFO */ pci = (PCLIENTINFO)pTeb->Win32ClientInfo; - RtlZeroMemory(pci, sizeof(CLIENTINFO)); + RtlZeroMemory(pci, sizeof(*pci)); pci->ppi = ptiCurrent->ppi; pci->fsHooks = ptiCurrent->fsHooks; pci->dwTIFlags = ptiCurrent->TIF_flags; @@ -562,7 +613,7 @@ if (!UserSetProcessWindowStation(hWinSta)) { Status = STATUS_UNSUCCESSFUL; - ERR_CH(UserThread,"Failed to set initial process winsta\n"); + ERR_CH(UserThread, "Failed to set initial process winsta\n"); goto error; } @@ -570,7 +621,7 @@ Status = IntValidateDesktopHandle(hDesk, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - ERR_CH(UserThread,"Failed to validate initial desktop handle\n"); + ERR_CH(UserThread, "Failed to validate initial desktop handle\n"); goto error; } @@ -583,7 +634,7 @@ { if (!IntSetThreadDesktop(ptiCurrent->ppi->hdeskStartup, FALSE)) { - ERR_CH(UserThread,"Failed to set thread desktop\n"); + ERR_CH(UserThread, "Failed to set thread desktop\n"); Status = STATUS_UNSUCCESSFUL; goto error; } @@ -595,7 +646,7 @@ if (!(ptiCurrent->ppi->W32PF_flags & (W32PF_ALLOWFOREGROUNDACTIVATE | W32PF_APPSTARTING)) && (gptiForeground && gptiForeground->ppi == ptiCurrent->ppi )) { - ptiCurrent->TIF_flags |= TIF_ALLOWFOREGROUNDACTIVATE; + ptiCurrent->TIF_flags |= TIF_ALLOWFOREGROUNDACTIVATE; } ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; @@ -603,25 +654,25 @@ if (!(ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD))) { /* Callback to User32 Client Thread Setup */ - TRACE_CH(UserThread,"Call co_IntClientThreadSetup...\n"); + TRACE_CH(UserThread, "Call co_IntClientThreadSetup...\n"); Status = co_IntClientThreadSetup(); if (!NT_SUCCESS(Status)) { - ERR_CH(UserThread,"ClientThreadSetup failed with Status 0x%08lx\n", Status); + ERR_CH(UserThread, "ClientThreadSetup failed with Status 0x%08lx\n", Status); goto error; } - TRACE_CH(UserThread,"co_IntClientThreadSetup succeeded!\n"); + TRACE_CH(UserThread, "co_IntClientThreadSetup succeeded!\n"); } else { - TRACE_CH(UserThread,"co_IntClientThreadSetup cannot be called...\n"); - } - - TRACE_CH(UserThread,"UserCreateW32Thread pti 0x%p\n", ptiCurrent); + TRACE_CH(UserThread, "co_IntClientThreadSetup cannot be called...\n"); + } + + TRACE_CH(UserThread, "UserCreateW32Thread pti 0x%p\n", ptiCurrent); return STATUS_SUCCESS; error: - ERR_CH(UserThread,"CreateThreadCallback failed! Freeing pti 0x%p for TID:0x%lx\n", + ERR_CH(UserThread, "CreateThreadCallback failed! Freeing pti 0x%p for TID:0x%lx\n", ptiCurrent, HandleToUlong(Thread->Cid.UniqueThread)); DestroyThreadCallback(Thread); return Status; @@ -643,7 +694,7 @@ ptiCurrent = PsGetThreadWin32Thread(Thread); ASSERT(ptiCurrent); - TRACE_CH(UserThread,"Destroying pti 0x%p eThread 0x%p\n", ptiCurrent, Thread); + TRACE_CH(UserThread, "Destroying pti 0x%p eThread 0x%p\n", ptiCurrent, Thread); ptiCurrent->TIF_flags |= TIF_INCLEANUP; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; @@ -705,10 +756,10 @@ if (ppiCurrent && ppiCurrent->ptiList == ptiCurrent && !ptiCurrent->ptiSibling && ppiCurrent->W32PF_flags & W32PF_CLASSESREGISTERED) { - TRACE_CH(UserThread,"DestroyProcessClasses\n"); - /* no process windows should exist at this point, or the function will assert! */ - DestroyProcessClasses(ppiCurrent); - ppiCurrent->W32PF_flags &= ~W32PF_CLASSESREGISTERED; + TRACE_CH(UserThread, "DestroyProcessClasses\n"); + /* no process windows should exist at this point, or the function will assert! */ + DestroyProcessClasses(ppiCurrent); + ppiCurrent->W32PF_flags &= ~W32PF_CLASSESREGISTERED; } IntBlockInput(ptiCurrent, FALSE); @@ -719,7 +770,7 @@ while (psle) { PUSER_REFERENCE_ENTRY ref = CONTAINING_RECORD(psle, USER_REFERENCE_ENTRY, Entry); - TRACE_CH(UserThread,"thread clean: remove reference obj 0x%p\n",ref->obj); + TRACE_CH(UserThread, "thread clean: remove reference obj 0x%p\n",ref->obj); UserDereferenceObject(ref->obj); psle = PopEntryList(&ptiCurrent->ReferencesList); @@ -757,10 +808,10 @@ ptiLastInput = gptiForeground; else ptiLastInput = ppiCurrent->ptiList; - ERR_CH(UserThread,"DTI: ptiLastInput is Cleared!!\n"); + ERR_CH(UserThread, "DTI: ptiLastInput is Cleared!!\n"); } */ - TRACE_CH(UserThread,"Freeing pti 0x%p\n", ptiCurrent); + TRACE_CH(UserThread, "Freeing pti 0x%p\n", ptiCurrent); IntSetThreadDesktop(NULL, TRUE); @@ -902,14 +953,14 @@ } /* Allocate global server info structure */ - gpsi = UserHeapAlloc(sizeof(SERVERINFO)); + gpsi = UserHeapAlloc(sizeof(*gpsi)); if (!gpsi) { DPRINT1("Failed allocate server info structure!\n"); return STATUS_UNSUCCESSFUL; } - RtlZeroMemory(gpsi, sizeof(SERVERINFO)); + RtlZeroMemory(gpsi, sizeof(*gpsi)); DPRINT("Global Server Data -> %p\n", gpsi); NT_ROF(InitGdiHandleTable());

9 years, 8 months

[pschweitzer] 65860: [NTOSKRNL] Also lock IopSecurityResource during access check in IopParseDevice

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 28 13:15:14 2014 New Revision: 65860 URL: http://svn.reactos.org/svn/reactos?rev=65860&view=rev Log: [NTOSKRNL] Also lock IopSecurityResource during access check in IopParseDevice Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sun Dec 28 13:15:14 2014 @@ -393,6 +393,9 @@ (!(OpenPacket->RelatedFileObject) || (VolumeOpen)) && !(OpenPacket->Override)) { + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&IopSecurityResource, TRUE); + /* Check if a device object is being parsed */ if (!RemainingName->Length) { @@ -504,6 +507,9 @@ } } + ExReleaseResourceLite(&IopSecurityResource); + KeLeaveCriticalRegion(); + /* Check if we hold the lock */ if (LockHeld) {

9 years, 8 months

[tfaber] 65859: [MSI] - Apply Wine commit f41ac94e (msi: Include the terminating null in the buffer size for decoded stream names.) by Hans Leidekker. Fixes a stack buffer overflow when installing ...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Dec 28 13:05:48 2014 New Revision: 65859 URL: http://svn.reactos.org/svn/reactos?rev=65859&view=rev Log: [MSI] - Apply Wine commit f41ac94e (msi: Include the terminating null in the buffer size for decoded stream names.) by Hans Leidekker. Fixes a stack buffer overflow when installing VMware Tools. Modified: trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/streams.c Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Sun Dec 28 13:05:48 2014 @@ -113,7 +113,7 @@ { HRESULT r; IStorage *stg; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; decode_streamname( stname, decoded ); TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded)); Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] Sun Dec 28 13:05:48 2014 @@ -56,7 +56,7 @@ static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) { STREAM *stream; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; stream = msi_alloc(sizeof(STREAM)); if (!stream)

9 years, 8 months

[hbelusca] 65858: [WIN32K]: Rework a bit the initialization code to modularize it a bit (some parts to be reused in other places). Part 1/x

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 28 13:00:28 2014 New Revision: 65858 URL: http://svn.reactos.org/svn/reactos?rev=65858&view=rev Log: [WIN32K]: Rework a bit the initialization code to modularize it a bit (some parts to be reused in other places). Part 1/x Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sun Dec 28 13:00:28 2014 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Driver entry and initialization of win32k - * FILE: subsystems/win32/win32k/main/main.c + * FILE: win32ss/user/ntuser/main.c * PROGRAMER: */ @@ -17,7 +17,9 @@ PGDI_HANDLE_TABLE NTAPI GDIOBJ_iAllocHandleTable(OUT PVOID *SectionObject); BOOL NTAPI GDI_CleanupForProcess (struct _EPROCESS *Process); -NTSTATUS NTAPI UserDestroyThreadInfo(struct _ETHREAD *Thread); + +NTSTATUS DestroyProcessCallback(PEPROCESS Process); +NTSTATUS NTAPI DestroyThreadCallback(PETHREAD Thread); HANDLE GlobalUserHeap = NULL; PVOID GlobalUserHeapSection = NULL; @@ -51,9 +53,78 @@ } #endif -static + NTSTATUS -UserCreateProcessInfo(PEPROCESS Process) +AllocW32Process(IN PEPROCESS Process, + OUT PPROCESSINFO* W32Process) +{ + PPROCESSINFO ppiCurrent; + + TRACE_CH(UserProcess, "In AllocW32Process(0x%p)\n", Process); + + /* Check that we were not called with an already existing Win32 process info */ + ppiCurrent = PsGetProcessWin32Process(Process); + if (ppiCurrent) return STATUS_SUCCESS; + + /* Allocate a new Win32 process info */ + ppiCurrent = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*ppiCurrent), + USERTAG_PROCESSINFO); + if (ppiCurrent == NULL) + { + ERR_CH(UserProcess, "Failed to allocate ppi for PID:0x%lx\n", + HandleToUlong(Process->UniqueProcessId)); + return STATUS_NO_MEMORY; + } + + TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", + ppiCurrent, HandleToUlong(Process->UniqueProcessId)); + + RtlZeroMemory(ppiCurrent, sizeof(*ppiCurrent)); + + PsSetProcessWin32Process(Process, ppiCurrent, NULL); + IntReferenceProcessInfo(ppiCurrent); + + *W32Process = ppiCurrent; + return STATUS_SUCCESS; +} + +#define FreeW32Process(/*Process*/ W32Process) \ +do { \ + /*PPROCESSINFO W32Process = PsGetProcessWin32Process(Process);*/ \ + /*ASSERT(W32Process);*/ \ + IntDereferenceProcessInfo(W32Process); \ +} while(0) + +/* + * Called from IntDereferenceProcessInfo + */ +VOID +UserDeleteW32Process(PPROCESSINFO ppiCurrent) +{ + if (ppiCurrent->InputIdleEvent) + { + EngDeleteEvent((PEVENT)ppiCurrent->InputIdleEvent); + } + + /* Close the startup desktop */ + if (ppiCurrent->rpdeskStartup) + ObDereferenceObject(ppiCurrent->rpdeskStartup); + +#if DBG + if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) + { + TRACE_PPI(ppiCurrent, UserObj, "Dumping user handles now that process info %p is gets freed.\n", ppiCurrent); + DbgUserDumpHandleTable(); + } +#endif + + /* Free the PROCESSINFO */ + ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); +} + +NTSTATUS +CreateProcessCallback(PEPROCESS Process) { PPROCESSINFO ppiCurrent; NTSTATUS Status; @@ -70,20 +141,14 @@ return STATUS_ALREADY_WIN32; } - /* Allocate a new win32 process */ - ppiCurrent = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PROCESSINFO), - USERTAG_PROCESSINFO); - if (ppiCurrent == NULL) + /* Allocate a new Win32 process info */ + Status = AllocW32Process(Process, &ppiCurrent); + if (!NT_SUCCESS(Status)) { ERR_CH(UserProcess, "Failed to allocate ppi for PID:0x%lx\n", HandleToUlong(Process->UniqueProcessId)); - return STATUS_NO_MEMORY; - } - - RtlZeroMemory(ppiCurrent, sizeof(PROCESSINFO)); - - PsSetProcessWin32Process(Process, ppiCurrent, NULL); + return Status; + } #if DBG DbgInitDebugChannels(); @@ -91,8 +156,6 @@ KdRosRegisterCliCallback(DbgGdiKdbgCliCallback); #endif #endif - - TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); /* Map the global heap into the process */ Offset.QuadPart = 0; @@ -109,7 +172,7 @@ if (!NT_SUCCESS(Status)) { TRACE_CH(UserProcess,"Failed to map the global heap! 0x%x\n", Status); - return Status; + goto error; } ppiCurrent->HeapMappings.Next = NULL; ppiCurrent->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; @@ -163,20 +226,23 @@ /* Add the process to the global list */ ppiCurrent->ppiNext = gppiList; gppiList = ppiCurrent; - IntReferenceProcessInfo(ppiCurrent); return STATUS_SUCCESS; -} - -static + +error: + ERR_CH(UserProcess,"CreateProcessCallback failed! Freeing ppi 0x%p for PID:0x%lx\n", + ppiCurrent, HandleToUlong(Process->UniqueProcessId)); + DestroyProcessCallback(Process); + return Status; +} + NTSTATUS -UserDestroyProcessInfo(PEPROCESS Process) +DestroyProcessCallback(PEPROCESS Process) { PPROCESSINFO ppiCurrent, *pppi; /* Get the Win32 Process */ ppiCurrent = PsGetProcessWin32Process(Process); - ASSERT(ppiCurrent); TRACE_CH(UserProcess, "Destroying ppi 0x%p\n", ppiCurrent); @@ -229,7 +295,7 @@ *pppi = ppiCurrent->ppiNext; - if(ppiCurrent->hdeskStartup) + if (ppiCurrent->hdeskStartup) { ZwClose(ppiCurrent->hdeskStartup); ppiCurrent->hdeskStartup = NULL; @@ -244,64 +310,116 @@ PsSetProcessWin32Process(Process, NULL, ppiCurrent); ppiCurrent->peProcess = NULL; - /* At last, dereference */ - IntDereferenceProcessInfo(ppiCurrent); + /* Finally, dereference */ + FreeW32Process(/*Process*/ ppiCurrent); // IntDereferenceProcessInfo(ppiCurrent); return STATUS_SUCCESS; -} - -VOID -UserDeleteW32Process(PPROCESSINFO ppiCurrent) -{ - if (ppiCurrent->InputIdleEvent) - { - EngDeleteEvent((PEVENT)ppiCurrent->InputIdleEvent); - } - - /* Close the startup desktop */ - if(ppiCurrent->rpdeskStartup) - ObDereferenceObject(ppiCurrent->rpdeskStartup); - -#if DBG - if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) - { - TRACE_PPI(ppiCurrent, UserObj, "Dumping user handles now that process info %p is gets freed.\n", ppiCurrent); - DbgUserDumpHandleTable(); - } -#endif - - /* Free the PROCESSINFO */ - ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); } NTSTATUS APIENTRY -Win32kProcessCallback(struct _EPROCESS *Process, +Win32kProcessCallback(PEPROCESS Process, BOOLEAN Create) { NTSTATUS Status; ASSERT(Process->Peb); + TRACE_CH(UserProcess,"Win32kProcessCallback -->\n"); + UserEnterExclusive(); if (Create) { - Status = UserCreateProcessInfo(Process); + Status = CreateProcessCallback(Process); } else { - Status = UserDestroyProcessInfo(Process); + Status = DestroyProcessCallback(Process); } UserLeave(); + + TRACE_CH(UserProcess,"<-- Win32kProcessCallback\n"); + return Status; } + + +NTSTATUS +AllocW32Thread(IN PETHREAD Thread, + OUT PTHREADINFO* W32Thread) +{ + PTHREADINFO ptiCurrent; + + TRACE_CH(UserThread, "In AllocW32Thread(0x%p)\n", Thread); + + /* Check that we were not called with an already existing Win32 thread info */ + ptiCurrent = PsGetThreadWin32Thread(Thread); + if (ptiCurrent) + { + ERR_CH(UserThread, "PsGetThreadWin32Thread returned non-NULL thread info!!\n"); + // return STATUS_SUCCESS; + } + + /* Allocate a new Win32 thread info */ + ptiCurrent = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*ptiCurrent), + USERTAG_THREADINFO); + if (ptiCurrent == NULL) + { + ERR_CH(UserThread, "Failed to allocate pti for TID:0x%lx\n", + HandleToUlong(Thread->Cid.UniqueThread)); + return STATUS_NO_MEMORY; + } + + TRACE_CH(UserThread,"Allocated pti 0x%p for TID:0x%lx\n", + ptiCurrent, HandleToUlong(Thread->Cid.UniqueThread)); + + RtlZeroMemory(ptiCurrent, sizeof(*ptiCurrent)); + + PsSetThreadWin32Thread(Thread, ptiCurrent, NULL); + IntReferenceThreadInfo(ptiCurrent); + + *W32Thread = ptiCurrent; + return STATUS_SUCCESS; +} + +#define FreeW32Thread(/*Thread*/ W32Thread) \ +do { \ + /*PTHREADINFO W32Thread = PsGetThreadWin32Thread(Thread);*/ \ + /*ASSERT(W32Thread);*/ \ + IntDereferenceThreadInfo(W32Thread); \ +} while(0) + +/* + Called from IntDereferenceThreadInfo. + */ +VOID +UserDeleteW32Thread(PTHREADINFO pti) +{ + PPROCESSINFO ppi = pti->ppi; + + TRACE_CH(UserThread,"UserDeleteW32Thread pti 0x%p\n",pti); + + /* Free the message queue */ + if (pti->MessageQueue) + { + MsqDestroyMessageQueue(pti); + } + + MsqCleanupThreadMsgs(pti); + + ExFreePoolWithTag(pti, USERTAG_THREADINFO); + + IntDereferenceProcessInfo(ppi); +} + NTSTATUS NTAPI -UserCreateThreadInfo(struct _ETHREAD *Thread) -{ - struct _EPROCESS *Process; +CreateThreadCallback(PETHREAD Thread) +{ + PEPROCESS Process; PCLIENTINFO pci; PTHREADINFO ptiCurrent; int i; @@ -312,33 +430,23 @@ Process = Thread->ThreadsProcess; pTeb = NtCurrentTeb(); - ASSERT(pTeb); - ptiCurrent = ExAllocatePoolWithTag(NonPagedPool, - sizeof(THREADINFO), - USERTAG_THREADINFO); - if (ptiCurrent == NULL) - { - ERR_CH(UserThread, "Failed to allocate pti for TID %p\n", Thread->Cid.UniqueThread); - return STATUS_NO_MEMORY; - } - - TRACE_CH(UserThread,"Create pti 0x%p eThread 0x%p\n", ptiCurrent, Thread); - - RtlZeroMemory(ptiCurrent, sizeof(THREADINFO)); + /* Allocate a new Win32 thread info */ + Status = AllocW32Thread(Thread, &ptiCurrent); + if (!NT_SUCCESS(Status)) + { + ERR_CH(UserThread, "Failed to allocate pti for TID:0x%lx\n", + HandleToUlong(Thread->Cid.UniqueThread)); + return Status; + } /* Initialize the THREADINFO */ - - PsSetThreadWin32Thread(Thread, ptiCurrent, NULL); - IntReferenceThreadInfo(ptiCurrent); ptiCurrent->pEThread = Thread; ptiCurrent->ppi = PsGetProcessWin32Process(Process); IntReferenceProcessInfo(ptiCurrent->ppi); pTeb->Win32ThreadInfo = ptiCurrent; ptiCurrent->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; - - TRACE_CH(UserThread, "Allocated pti 0x%p for TID %p\n", ptiCurrent, Thread->Cid.UniqueThread); InitializeListHead(&ptiCurrent->WindowListHead); InitializeListHead(&ptiCurrent->W32CallbackListHead); @@ -378,7 +486,7 @@ ptiCurrent->timeLast = LargeTickCount.u.LowPart; ptiCurrent->MessageQueue = MsqCreateMessageQueue(ptiCurrent); - if(ptiCurrent->MessageQueue == NULL) + if (ptiCurrent->MessageQueue == NULL) { ERR_CH(UserThread,"Failed to allocate message loop\n"); Status = STATUS_NO_MEMORY; @@ -428,11 +536,11 @@ ProcessParams = pTeb->ProcessEnvironmentBlock->ProcessParameters; Status = STATUS_UNSUCCESSFUL; - if(ProcessParams && ProcessParams->DesktopInfo.Length > 0) + if (ProcessParams && ProcessParams->DesktopInfo.Length > 0) { Status = IntSafeCopyUnicodeStringTerminateNULL(&DesktopPath, &ProcessParams->DesktopInfo); } - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { RtlInitUnicodeString(&DesktopPath, NULL); } @@ -445,13 +553,13 @@ if (DesktopPath.Buffer) ExFreePoolWithTag(DesktopPath.Buffer, TAG_STRING); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ERR_CH(UserThread, "Failed to assign default dekstop and winsta to process\n"); goto error; } - if(!UserSetProcessWindowStation(hWinSta)) + if (!UserSetProcessWindowStation(hWinSta)) { Status = STATUS_UNSUCCESSFUL; ERR_CH(UserThread,"Failed to set initial process winsta\n"); @@ -460,7 +568,7 @@ /* Validate the new desktop. */ Status = IntValidateDesktopHandle(hDesk, UserMode, 0, &pdesk); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ERR_CH(UserThread,"Failed to validate initial desktop handle\n"); goto error; @@ -513,49 +621,26 @@ return STATUS_SUCCESS; error: - ERR_CH(UserThread,"UserCreateThreadInfo failed! Freeing pti 0x%p for TID %p\n", ptiCurrent, Thread->Cid.UniqueThread); - UserDestroyThreadInfo(Thread); + ERR_CH(UserThread,"CreateThreadCallback failed! Freeing pti 0x%p for TID:0x%lx\n", + ptiCurrent, HandleToUlong(Thread->Cid.UniqueThread)); + DestroyThreadCallback(Thread); return Status; -} - -/* - Called from IntDereferenceThreadInfo. - */ -VOID -UserDeleteW32Thread(PTHREADINFO pti) -{ - PPROCESSINFO ppi = pti->ppi; - - TRACE_CH(UserThread,"UserDeleteW32Thread pti 0x%p\n",pti); - - /* Free the message queue */ - if (pti->MessageQueue) - { - MsqDestroyMessageQueue(pti); - } - - MsqCleanupThreadMsgs(pti); - - ExFreePoolWithTag(pti, USERTAG_THREADINFO); - - IntDereferenceProcessInfo(ppi); } NTSTATUS NTAPI -UserDestroyThreadInfo(struct _ETHREAD *Thread) +DestroyThreadCallback(PETHREAD Thread) { PTHREADINFO *ppti; PSINGLE_LIST_ENTRY psle; PPROCESSINFO ppiCurrent; - struct _EPROCESS *Process; + PEPROCESS Process; PTHREADINFO ptiCurrent; Process = Thread->ThreadsProcess; /* Get the Win32 Thread */ ptiCurrent = PsGetThreadWin32Thread(Thread); - ASSERT(ptiCurrent); TRACE_CH(UserThread,"Destroying pti 0x%p eThread 0x%p\n", ptiCurrent, Thread); @@ -574,22 +659,22 @@ /* Decrement thread count and check if its 0 */ ppiCurrent->cThreads--; - if(ptiCurrent->TIF_flags & TIF_GUITHREADINITIALIZED) + if (ptiCurrent->TIF_flags & TIF_GUITHREADINITIALIZED) { /* Do now some process cleanup that requires a valid win32 thread */ - if(ptiCurrent->ppi->cThreads == 0) + if (ptiCurrent->ppi->cThreads == 0) { /* Check if we have registered the user api hook */ - if(ptiCurrent->ppi == ppiUahServer) + if (ptiCurrent->ppi == ppiUahServer) { /* Unregister the api hook */ UserUnregisterUserApiHook(); } /* Notify logon application to restart shell if needed */ - if(ptiCurrent->pDeskInfo) + if (ptiCurrent->pDeskInfo) { - if(ptiCurrent->pDeskInfo->ppiShellProcess == ppiCurrent) + if (ptiCurrent->pDeskInfo->ppiShellProcess == ppiCurrent) { DWORD ExitCode = PsGetProcessExitStatus(Process); @@ -687,35 +772,35 @@ ptiCurrent->hEventQueueClient = NULL; /* The thread is dying */ - PsSetThreadWin32Thread(ptiCurrent->pEThread, NULL, ptiCurrent); + PsSetThreadWin32Thread(Thread /*ptiCurrent->pEThread*/, NULL, ptiCurrent); ptiCurrent->pEThread = NULL; /* Free the THREADINFO */ - IntDereferenceThreadInfo(ptiCurrent); + FreeW32Thread(/*Thread*/ ptiCurrent); // IntDereferenceThreadInfo(ptiCurrent); return STATUS_SUCCESS; } NTSTATUS APIENTRY -Win32kThreadCallback(struct _ETHREAD *Thread, +Win32kThreadCallback(PETHREAD Thread, PSW32THREADCALLOUTTYPE Type) { NTSTATUS Status; + ASSERT(NtCurrentTeb()); + UserEnterExclusive(); - ASSERT(NtCurrentTeb()); - if (Type == PsW32ThreadCalloutInitialize) { ASSERT(PsGetThreadWin32Thread(Thread) == NULL); - Status = UserCreateThreadInfo(Thread); + Status = CreateThreadCallback(Thread); } else { ASSERT(PsGetThreadWin32Thread(Thread) != NULL); - Status = UserDestroyThreadInfo(Thread); + Status = DestroyThreadCallback(Thread); } UserLeave(); Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Sun Dec 28 13:00:28 2014 @@ -123,7 +123,7 @@ // { /* Initialize the current thread */ - Status = UserCreateThreadInfo(PsGetCurrentThread()); + Status = CreateThreadCallback(PsGetCurrentThread()); if (!NT_SUCCESS(Status)) return Status; // } Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Sun Dec 28 13:00:28 2014 @@ -42,7 +42,7 @@ /*************** MAIN.C ***************/ -NTSTATUS NTAPI UserCreateThreadInfo(struct _ETHREAD *Thread); +NTSTATUS NTAPI CreateThreadCallback(PETHREAD Thread); /*************** WINSTA.C ***************/ Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sun Dec 28 13:00:28 2014 @@ -216,7 +216,7 @@ { /* * Normally we are called by win32k so the win32 thread pointers - * should be valid as they are set in win32k::UserCreateThreadInfo. + * should be valid as they are set in win32k::CreateThreadCallback. */ PCLIENTINFO ClientInfo = GetWin32ClientInfo(); BOOLEAN IsFirstThread = _InterlockedExchange8((PCHAR)&gfFirstThread, FALSE);

9 years, 8 months

[pschweitzer] 65857: [NTOSKRNL] Acquire IopSecurityResource exclusive when required. Spotted by Thomas.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 28 12:57:58 2014 New Revision: 65857 URL: http://svn.reactos.org/svn/reactos?rev=65857&view=rev Log: [NTOSKRNL] Acquire IopSecurityResource exclusive when required. Spotted by Thomas. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sun Dec 28 12:57:58 2014 @@ -1405,7 +1405,7 @@ } KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&IopSecurityResource, TRUE); + ExAcquireResourceExclusiveLite(&IopSecurityResource, TRUE); /* Check if someone changed it in our back */ if (DeviceObject->SecurityDescriptor == OldSecurityDescriptor) {

9 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014