Author: fireball Date: Wed Aug 14 11:02:08 2013 New Revision: 59733
URL: http://svn.reactos.org/svn/reactos?rev=59733&view=rev Log: [WIN32K] - Do not use a internal section object structure type, it's just not necessary and win32k should not ever need to access its fields directly.
Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.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
Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype.... ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Wed Aug 14 11:02:08 2013 @@ -307,7 +307,7 @@ FT_Face Face; ANSI_STRING AnsiFaceName; PFONT_ENTRY Entry; - PSECTION_OBJECT SectionObject; + PVOID SectionObject; ULONG ViewSize = 0; LARGE_INTEGER SectionSize; UNICODE_STRING FontRegPath = RTL_CONSTANT_STRING(L"\REGISTRY\Machine\Software\Microsoft\Windows NT\CurrentVersion\Fonts"); @@ -330,7 +330,7 @@ }
SectionSize.QuadPart = 0LL; - Status = MmCreateSection((PVOID)&SectionObject, SECTION_ALL_ACCESS, + Status = MmCreateSection(&SectionObject, SECTION_ALL_ACCESS, NULL, &SectionSize, PAGE_READONLY, SEC_COMMIT, FileHandle, NULL); if (!NT_SUCCESS(Status))
Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/desktop... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Wed Aug 14 11:02:08 2013 @@ -11,7 +11,7 @@ PWND spwndTray; PWND spwndMessage; PWND spwndTooltip; - PSECTION_OBJECT hsectionDesktop; + PVOID hsectionDesktop; PWIN32HEAP pheapDesktop; ULONG_PTR ulHeapSize; LIST_ENTRY PtiList;
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] Wed Aug 14 11:02:08 2013 @@ -15,12 +15,12 @@
HANDLE hModuleWin;
-PGDI_HANDLE_TABLE NTAPI GDIOBJ_iAllocHandleTable(OUT PSECTION_OBJECT *SectionObject); +PGDI_HANDLE_TABLE NTAPI GDIOBJ_iAllocHandleTable(OUT PVOID *SectionObject); BOOL NTAPI GDI_CleanupForProcess (struct _EPROCESS *Process); NTSTATUS NTAPI UserDestroyThreadInfo(struct _ETHREAD *Thread);
HANDLE GlobalUserHeap = NULL; -PSECTION_OBJECT GlobalUserHeapSection = 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] Wed Aug 14 11:02:08 2013 @@ -30,7 +30,7 @@ extern HANDLE GlobalUserHeap;
PWIN32HEAP -UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, +UserCreateHeap(OUT PVOID *SectionObject, IN OUT PVOID *SystemBase, IN SIZE_T HeapSize);
Modified: trunk/reactos/win32ss/user/ntuser/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/usrheap... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/usrheap.c [iso-8859-1] Wed Aug 14 11:02:08 2013 @@ -63,7 +63,7 @@ { SIZE_T ViewSize = 0; LARGE_INTEGER Offset; - extern PSECTION_OBJECT GlobalUserHeapSection; + extern PVOID GlobalUserHeapSection;
/* HACK: This needs to be handled during startup only... */ ASSERT(Base == (PVOID)GlobalUserHeap); @@ -114,7 +114,7 @@ }
static PWIN32HEAP -IntUserHeapCreate(IN PSECTION_OBJECT SectionObject, +IntUserHeapCreate(IN PVOID SectionObject, IN PVOID *SystemMappedBase, IN ULONG HeapSize) { @@ -172,7 +172,7 @@ }
PWIN32HEAP -UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, +UserCreateHeap(OUT PVOID *SectionObject, IN OUT PVOID *SystemBase, IN SIZE_T HeapSize) {