Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[ion] 16278: make usb miniports not to use old header

by ion＠svn.reactos.com

make usb miniports not to use old header Modified: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.h Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.h Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h _____ Modified: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.h --- trunk/reactos/drivers/usb/miniport/usbehci/usbehci.h 2005-06-26 05:04:12 UTC (rev 16277) +++ trunk/reactos/drivers/usb/miniport/usbehci/usbehci.h 2005-06-26 05:06:38 UTC (rev 16278) @@ -26,7 +26,6 @@ #include "stddef.h" #include "windef.h" //#include <ddk/miniport.h> -#include <ddk/ntapi.h> #ifdef DBG #define DPRINT(arg) DbgPrint arg; _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.h --- trunk/reactos/drivers/usb/miniport/usbohci/usbohci.h 2005-06-26 05:04:12 UTC (rev 16277) +++ trunk/reactos/drivers/usb/miniport/usbohci/usbohci.h 2005-06-26 05:06:38 UTC (rev 16278) @@ -26,7 +26,6 @@ #include "stddef.h" #include "windef.h" //#include <ddk/miniport.h> -#include <ddk/ntapi.h> #ifdef DBG #define DPRINT(arg) DbgPrint arg; _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h --- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h 2005-06-26 05:04:12 UTC (rev 16277) +++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h 2005-06-26 05:06:38 UTC (rev 16278) @@ -26,7 +26,6 @@ #include "stddef.h" #include "windef.h" //#include <ddk/miniport.h> -#include <ddk/ntapi.h> // Export funcs here /*

19 years, 2 months

[ion] 16277: make lsass, win32k and vbe/xbox miniports use ndk instead of old headers

by ion＠svn.reactos.com

make lsass, win32k and vbe/xbox miniports use ndk instead of old headers Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h Modified: trunk/reactos/subsys/system/lsass/lsass.c Modified: trunk/reactos/subsys/win32k/ldr/loader.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-06-26 04:50:07 UTC (rev 16276) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-06-26 05:04:12 UTC (rev 16277) @@ -27,7 +27,6 @@ #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> -#include <ddk/ntapi.h> /* * Compile-time define to get VBE 1.2 support. The implementation _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-06-26 04:50:07 UTC (rev 16276) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-06-26 05:04:12 UTC (rev 16277) @@ -366,7 +366,7 @@ sizeof(SYSTEM_BASIC_INFORMATION), &Length))) { - FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPage * PAGE_SIZE; + FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPageNumber * PAGE_SIZE; } else { _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-06-26 04:50:07 UTC (rev 16276) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-06-26 05:04:12 UTC (rev 16277) @@ -28,7 +28,7 @@ #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> -#include <ddk/ntapi.h> +#include <ndk/ntndk.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/lsass/lsass.c --- trunk/reactos/subsys/system/lsass/lsass.c 2005-06-26 04:50:07 UTC (rev 16276) +++ trunk/reactos/subsys/system/lsass/lsass.c 2005-06-26 05:04:12 UTC (rev 16277) @@ -26,9 +26,9 @@ * 19990704 (Emanuele Aliberti) * Compiled successfully with egcs 1.1.2 */ -#include <ddk/ntddk.h> #include <windows.h> -#include <ddk/ntapi.h> +#include NTOS_MODE_USER +#include <ndk/ntndk.h> #include <lsass/lsasrv.h> #define NDEBUG _____ Modified: trunk/reactos/subsys/win32k/ldr/loader.c --- trunk/reactos/subsys/win32k/ldr/loader.c 2005-06-26 04:50:07 UTC (rev 16276) +++ trunk/reactos/subsys/win32k/ldr/loader.c 2005-06-26 05:04:12 UTC (rev 16277) @@ -19,21 +19,11 @@ /* $Id$ * */ +#include <w32k.h> -#include <ddk/ntddk.h> -#include <ddk/winddi.h> -#include <ddk/ntapi.h> - #define NDEBUG #include <debug.h> -#ifdef __USE_W32API -PIMAGE_NT_HEADERS STDCALL -RtlImageNtHeader(PVOID); -PVOID STDCALL -RtlImageDirectoryEntryToData(PVOID,BOOLEAN,ULONG,PULONG); -#endif - /* * Blatantly stolen from ldr/utils.c in ntdll. I can't link ntdll from * here, though. @@ -198,14 +188,14 @@ STDCALL EngLoadImage (LPWSTR DriverName) { - SYSTEM_LOAD_IMAGE GdiDriverInfo; + SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; NTSTATUS Status; - RtlInitUnicodeString(&GdiDriverInfo.ModuleName, DriverName); - Status = ZwSetSystemInformation(SystemLoadImage, &GdiDriverInfo, sizeof(SYSTEM_LOAD_IMAGE)); + RtlInitUnicodeString(&GdiDriverInfo.DriverName, DriverName); + Status = ZwSetSystemInformation(SystemLoadGdiDriverInformation, &GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); if (!NT_SUCCESS(Status)) return NULL; - return (HANDLE)GdiDriverInfo.ModuleBase; + return (HANDLE)GdiDriverInfo.ImageAddress; } @@ -216,16 +206,16 @@ STDCALL EngLoadModule(LPWSTR ModuleName) { - SYSTEM_LOAD_IMAGE GdiDriverInfo; + SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; NTSTATUS Status; // FIXME: should load as readonly - RtlInitUnicodeString (&GdiDriverInfo.ModuleName, ModuleName); - Status = ZwSetSystemInformation (SystemLoadImage, &GdiDriverInfo, sizeof(SYSTEM_LOAD_IMAGE)); + RtlInitUnicodeString (&GdiDriverInfo.DriverName, ModuleName); + Status = ZwSetSystemInformation (SystemLoadGdiDriverInformation, &GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); if (!NT_SUCCESS(Status)) return NULL; - return (HANDLE)GdiDriverInfo.ModuleBase; + return (HANDLE)GdiDriverInfo.ImageAddress; } /* EOF */

19 years, 2 months

[ion] 16276: Revert accidental commit

by ion＠svn.reactos.com

Revert accidental commit Modified: trunk/reactos/subsys/system/directory.xml _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-06-26 04:49:10 UTC (rev 16275) +++ trunk/reactos/subsys/system/directory.xml 2005-06-26 04:50:07 UTC (rev 16276) @@ -13,6 +13,12 @@ <directory name="expand"> <xi:include href="expand/expand.xml" /> </directory> +<directory name="explorer"> + <xi:include href="explorer/explorer.xml" /> +</directory> +<directory name="ibrowser"> + <xi:include href="ibrowser/ibrowser.xml" /> +</directory> <directory name="format"> <xi:include href="format/format.xml" /> </directory>

19 years, 2 months

[ion] 16275: Imitate NT and set some of the private object info for desktop/winsta inside win32k, not inside the kernel, so we don't need to know about win32k's private objects

by ion＠svn.reactos.com

Imitate NT and set some of the private object info for desktop/winsta inside win32k, not inside the kernel, so we don't need to know about win32k's private objects Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/subsys/system/directory.xml Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c _____ Modified: trunk/reactos/ntoskrnl/ex/win32k.c --- trunk/reactos/ntoskrnl/ex/win32k.c 2005-06-26 04:00:25 UTC (rev 16274) +++ trunk/reactos/ntoskrnl/ex/win32k.c 2005-06-26 04:49:10 UTC (rev 16275) @@ -69,7 +69,7 @@ PVOID STDCALL -ExpWinStaObjectFind(PWINSTATION_OBJECT WinStaObject, +ExpWinStaObjectFind(PVOID WinStaObject, PWSTR Name, ULONG Attributes) { @@ -130,7 +130,6 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"WindowStation"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT); ObjectTypeInitializer.GenericMapping = ExpWindowStationMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.UseDefaultObject = TRUE; @@ -141,7 +140,6 @@ /* Create desktop object type */ RtlInitUnicodeString(&Name, L"Desktop"); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT); ObjectTypeInitializer.GenericMapping = ExpDesktopMapping; ObjectTypeInitializer.OpenProcedure = NULL; ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-06-26 04:00:25 UTC (rev 16274) +++ trunk/reactos/subsys/system/directory.xml 2005-06-26 04:49:10 UTC (rev 16275) @@ -13,12 +13,6 @@ <directory name="expand"> <xi:include href="expand/expand.xml" /> </directory> -<directory name="explorer"> - <xi:include href="explorer/explorer.xml" /> -</directory> -<directory name="ibrowser"> - <xi:include href="ibrowser/ibrowser.xml" /> -</directory> <directory name="format"> <xi:include href="format/format.xml" /> </directory> _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-26 04:00:25 UTC (rev 16274) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-26 04:49:10 UTC (rev 16275) @@ -44,6 +44,10 @@ NTSTATUS FASTCALL InitDesktopImpl(VOID) { + /* Set Desktop Object Attributes */ + ExDesktopObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT); + /* FIXME: Set Generic Mapping correctly */ + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-06-26 04:00:25 UTC (rev 16274) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-06-26 04:49:10 UTC (rev 16275) @@ -70,7 +70,11 @@ "(Status 0x%X)\n", Status); return Status; } - + + /* Set Winsta Object Attributes */ + ExWindowStationObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT); + /* FIXME: Set Generic Mapping correctly */ + return STATUS_SUCCESS; }

19 years, 2 months

[ion] 16274: Build videoprt with NDK

by ion＠svn.reactos.com

Build videoprt with NDK Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/drivers/video/videoprt/videoprt.xml _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.c --- trunk/reactos/drivers/video/videoprt/videoprt.c 2005-06-26 01:12:21 UTC (rev 16273) +++ trunk/reactos/drivers/video/videoprt/videoprt.c 2005-06-26 04:00:25 UTC (rev 16274) @@ -65,7 +65,7 @@ IN PVOID HwDeviceExtension, IN PUCHAR FunctionName) { - SYSTEM_LOAD_IMAGE GdiDriverInfo; + SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; PVOID BaseAddress; PIMAGE_EXPORT_DIRECTORY ExportDir; PUSHORT OrdinalPtr; @@ -76,18 +76,18 @@ DPRINT("VideoPortGetProcAddress(%s)\n", FunctionName); - RtlInitUnicodeString(&GdiDriverInfo.ModuleName, L"videoprt"); + RtlInitUnicodeString(&GdiDriverInfo.DriverName, L"videoprt"); Status = ZwSetSystemInformation( - SystemLoadImage, + SystemLoadGdiDriverInformation, &GdiDriverInfo, - sizeof(SYSTEM_LOAD_IMAGE)); + sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); if (!NT_SUCCESS(Status)) { DPRINT("Couldn't get our own module handle?\n"); return NULL; } - BaseAddress = GdiDriverInfo.ModuleBase; + BaseAddress = GdiDriverInfo.ImageAddress; /* Get the pointer to the export directory */ ExportDir = (PIMAGE_EXPORT_DIRECTORY)IntVideoPortImageDirectoryEntryToData( @@ -359,7 +359,7 @@ { ConfigInfo.SystemMemorySize = SystemBasicInfo.NumberOfPhysicalPages * - SystemBasicInfo.PhysicalPageSize; + SystemBasicInfo.PageSize; } /* _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.h --- trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-26 01:12:21 UTC (rev 16273) +++ trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-26 04:00:25 UTC (rev 16274) @@ -28,29 +28,14 @@ #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> -#include <ddk/ntapi.h> #include <ddk/ntagp.h> -/* For process attaching functions */ #include <ddk/ntifs.h> +#include <ndk/ntndk.h> +#include <reactos/helper.h> + #define NDEBUG #include <debug.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - -int swprintf(wchar_t *buf, const wchar_t *fmt, ...); -int vsprintf(char *buf, const char *fmt, va_list args); - -BOOLEAN STDCALL -HalDisableSystemInterrupt(ULONG Vector, - KIRQL Irql); - -BOOLEAN STDCALL -HalEnableSystemInterrupt(ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode); - -PIMAGE_NT_HEADERS STDCALL RtlImageNtHeader(IN PVOID BaseAddress); - #define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') typedef struct _VIDEO_PORT_ADDRESS_MAPPING _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.xml --- trunk/reactos/drivers/video/videoprt/videoprt.xml 2005-06-26 01:12:21 UTC (rev 16273) +++ trunk/reactos/drivers/video/videoprt/videoprt.xml 2005-06-26 04:00:25 UTC (rev 16274) @@ -5,6 +5,7 @@ <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> + <pch>videoprt.h</pch> <file>agp.c</file> <file>ddc.c</file> <file>dispatch.c</file>

19 years, 2 months

[ekohl] 16273: Hal needs KPCR_BASE

by ekohl＠svn.reactos.com

Hal needs KPCR_BASE Modified: trunk/reactos/hal/halx86/include/hal.h _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-06-26 01:08:55 UTC (rev 16272) +++ trunk/reactos/hal/halx86/include/hal.h 2005-06-26 01:12:21 UTC (rev 16273) @@ -16,17 +16,17 @@ /* Internal Kernel Headers */ //#include <internal/mm.h> #include <internal/ke.h> -#include <internal/i386/ps.h> +#define KPCR_BASE 0xFF000000 // HACK! + //Temporary hack below until ntoskrnl is on NDK PVOID STDCALL MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes, - IN PHYSICAL_ADDRESS LowestAcceptableAddress, - IN PHYSICAL_ADDRESS HighestAcceptableAddress, - IN PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL, - IN MEMORY_CACHING_TYPE CacheType OPTIONAL, - IN ULONG Alignment); - + IN PHYSICAL_ADDRESS LowestAcceptableAddress, + IN PHYSICAL_ADDRESS HighestAcceptableAddress, + IN PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL, + IN MEMORY_CACHING_TYPE CacheType OPTIONAL, + IN ULONG Alignment); /* Internal HAL Headers */ #include "apic.h" #include "bus.h"

19 years, 2 months

[ekohl] 16272: Fix indentation, remove trailing whitespace and sort prototypes.

by ekohl＠svn.reactos.com

Fix indentation, remove trailing whitespace and sort prototypes. Modified: trunk/reactos/include/ndk/dbgktypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/kdtypes.h Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ndk/lpctypes.h Modified: trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/sefuncs.h Modified: trunk/reactos/include/ndk/setypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h _____ Modified: trunk/reactos/include/ndk/dbgktypes.h --- trunk/reactos/include/ndk/dbgktypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/dbgktypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -23,15 +23,15 @@ typedef enum _DEBUGOBJECTINFOCLASS { - DebugObjectUnusedInformation, - DebugObjectKillProcessOnExitInformation -} DEBUGOBJECTINFOCLASS, * PDEBUGOBJECTINFOCLASS; + DebugObjectUnusedInformation, + DebugObjectKillProcessOnExitInformation +} DEBUGOBJECTINFOCLASS, *PDEBUGOBJECTINFOCLASS; /* TYPES *********************************************************************/ typedef struct _DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION { - ULONG KillProcessOnExit; + ULONG KillProcessOnExit; } DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION, * PDEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION; @@ -134,6 +134,6 @@ DBGKM_LOAD_DLL LoadDll; DBGKM_UNLOAD_DLL UnloadDll; } StateInfo; -} DBGUI_WAIT_STATE_CHANGE, * PDBGUI_WAIT_STATE_CHANGE; +} DBGUI_WAIT_STATE_CHANGE, *PDBGUI_WAIT_STATE_CHANGE; #endif _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/extypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -42,7 +42,7 @@ /* You'll need the IFS for these, so let's not force everyone to have it */ #ifdef _NTIFS_ -typedef struct _EX_QUEUE_WORKER_INFO +typedef struct _EX_QUEUE_WORKER_INFO { UCHAR QueueDisabled:1; UCHAR MakeThreadsAsNecessary:1; @@ -50,14 +50,14 @@ ULONG WorkerCount:29; } EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO; -typedef struct _EX_WORK_QUEUE +typedef struct _EX_WORK_QUEUE { KQUEUE WorkerQueue; ULONG DynamicThreadCount; ULONG WorkItemsProcessed; ULONG WorkItemsProcessedLastPass; ULONG QueueDepthLastPass; - EX_QUEUE_WORKER_INFO Info; + EX_QUEUE_WORKER_INFO Info; } EX_WORK_QUEUE, *PEX_WORK_QUEUE; #endif @@ -71,11 +71,11 @@ }; } EX_FAST_REF, *PEX_FAST_REF; -typedef struct _EX_PUSH_LOCK +typedef struct _EX_PUSH_LOCK { - union + union { - struct + struct { ULONG Waiting:1; ULONG Exclusive:1; @@ -86,12 +86,12 @@ }; } EX_PUSH_LOCK, *PEX_PUSH_LOCK; -typedef struct _HANDLE_TABLE_ENTRY_INFO +typedef struct _HANDLE_TABLE_ENTRY_INFO { ULONG AuditMask; } HANDLE_TABLE_ENTRY_INFO, *PHANDLE_TABLE_ENTRY_INFO; -typedef struct _RUNDOWN_DESCRIPTOR +typedef struct _RUNDOWN_DESCRIPTOR { ULONG_PTR References; KEVENT RundownEvent; @@ -105,16 +105,16 @@ ULONG AllowMultipleCallbacks; } CALLBACK_OBJECT , *PCALLBACK_OBJECT; -typedef struct _HANDLE_TABLE_ENTRY +typedef struct _HANDLE_TABLE_ENTRY { - union + union { PVOID Object; ULONG_PTR ObAttributes; PHANDLE_TABLE_ENTRY_INFO InfoTable; ULONG_PTR Value; } u1; - union + union { ULONG GrantedAccess; USHORT GrantedAccessIndex; _____ Modified: trunk/reactos/include/ndk/halfuncs.h --- trunk/reactos/include/ndk/halfuncs.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/halfuncs.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -35,7 +35,7 @@ IN PDRIVER_CONTROL ExecutionRoutine ); -BOOLEAN +BOOLEAN STDCALL HalBeginSystemInterrupt( ULONG Vector, @@ -136,7 +136,7 @@ ULONG Unknown1, ULONG Unknown2 ); - + VOID STDCALL IoAssignDriveLetters( _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/haltypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -34,12 +34,12 @@ /* ENUMERATIONS **************************************************************/ typedef enum _FIRMWARE_ENTRY { - HalHaltRoutine, - HalPowerDownRoutine, - HalRestartRoutine, - HalRebootRoutine, - HalInteractiveModeRoutine, - HalMaximumRoutine + HalHaltRoutine, + HalPowerDownRoutine, + HalRestartRoutine, + HalRebootRoutine, + HalInteractiveModeRoutine, + HalMaximumRoutine } FIRMWARE_REENTRY, *PFIRMWARE_REENTRY; /* TYPES *********************************************************************/ @@ -55,35 +55,35 @@ extern NTOSAPI PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; #endif -#define HAL_PRIVATE_DISPATCH_VERSION 1 +#define HAL_PRIVATE_DISPATCH_VERSION 1 -typedef struct _LOADER_MODULE +typedef struct _LOADER_MODULE { - ULONG ModStart; - ULONG ModEnd; - ULONG String; - ULONG Reserved; + ULONG ModStart; + ULONG ModEnd; + ULONG String; + ULONG Reserved; } LOADER_MODULE, *PLOADER_MODULE; typedef struct _LOADER_PARAMETER_BLOCK { - ULONG Flags; - ULONG MemLower; - ULONG MemHigher; - ULONG BootDevice; - ULONG CommandLine; - ULONG ModsCount; - ULONG ModsAddr; - UCHAR Syms[12]; - ULONG MmapLength; - ULONG MmapAddr; - ULONG DrivesCount; - ULONG DrivesAddr; - ULONG ConfigTable; - ULONG BootLoaderName; - ULONG PageDirectoryStart; - ULONG PageDirectoryEnd; - ULONG KernelBase; + ULONG Flags; + ULONG MemLower; + ULONG MemHigher; + ULONG BootDevice; + ULONG CommandLine; + ULONG ModsCount; + ULONG ModsAddr; + UCHAR Syms[12]; + ULONG MmapLength; + ULONG MmapAddr; + ULONG DrivesCount; + ULONG DrivesAddr; + ULONG ConfigTable; + ULONG BootLoaderName; + ULONG PageDirectoryStart; + ULONG PageDirectoryEnd; + ULONG KernelBase; } LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; #endif _____ Modified: trunk/reactos/include/ndk/kdtypes.h --- trunk/reactos/include/ndk/kdtypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/kdtypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -19,18 +19,18 @@ typedef enum _DEBUG_CONTROL_CODE { - DebugGetTraceInformation = 1, - DebugSetInternalBreakpoint, - DebugSetSpecialCall, - DebugClearSpecialCalls, - DebugQuerySpecialCalls, - DebugDbgBreakPoint, - DebugDbgLoadSymbols + DebugGetTraceInformation = 1, + DebugSetInternalBreakpoint, + DebugSetSpecialCall, + DebugClearSpecialCalls, + DebugQuerySpecialCalls, + DebugDbgBreakPoint, + DebugDbgLoadSymbols } DEBUG_CONTROL_CODE; /* TYPES *********************************************************************/ -typedef struct _KD_PORT_INFORMATION +typedef struct _KD_PORT_INFORMATION { ULONG ComPort; ULONG BaudRate; _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/kefuncs.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -16,7 +16,7 @@ /* PROTOTYPES ****************************************************************/ -VOID +VOID STDCALL KeInitializeApc( IN PKAPC Apc, @@ -27,7 +27,7 @@ IN PKNORMAL_ROUTINE NormalRoutine, IN KPROCESSOR_MODE Mode, IN PVOID Context -); +); VOID STDCALL @@ -48,9 +48,9 @@ VOID STDCALL KiDeliverApc( - IN KPROCESSOR_MODE PreviousMode, - IN PVOID Reserved, - IN PKTRAP_FRAME TrapFrame + IN KPROCESSOR_MODE PreviousMode, + IN PVOID Reserved, + IN PKTRAP_FRAME TrapFrame ); VOID @@ -81,7 +81,7 @@ KeQueryRuntimeThread( IN PKTHREAD Thread, OUT PULONG UserTime - ); + ); BOOLEAN STDCALL @@ -104,10 +104,10 @@ IN PUCHAR Component ); -VOID +VOID STDCALL KeTerminateThread( - IN KPRIORITY Increment + IN KPRIORITY Increment ); BOOLEAN @@ -127,7 +127,7 @@ IN PKTHREAD *Thread OPTIONAL ); -PCONFIGURATION_COMPONENT_DATA +PCONFIGURATION_COMPONENT_DATA STDCALL KeFindConfigurationNextEntry( IN PCONFIGURATION_COMPONENT_DATA Child, @@ -136,8 +136,8 @@ IN PULONG ComponentKey OPTIONAL, IN PCONFIGURATION_COMPONENT_DATA *NextLink ); - -PCONFIGURATION_COMPONENT_DATA + +PCONFIGURATION_COMPONENT_DATA STDCALL KeFindConfigurationEntry( IN PCONFIGURATION_COMPONENT_DATA Child, @@ -189,7 +189,7 @@ PKTHREAD Thread, KAFFINITY Affinity ); - + VOID STDCALL KeSetSystemAffinityThread( @@ -199,11 +199,11 @@ NTSTATUS STDCALL KeUserModeCallback( - IN ULONG FunctionID, - IN PVOID InputBuffer, - IN ULONG InputLength, - OUT PVOID *OutputBuffer, - OUT PULONG OutputLength + IN ULONG FunctionID, + IN PVOID InputBuffer, + IN ULONG InputLength, + OUT PVOID *OutputBuffer, + OUT PULONG OutputLength ); VOID @@ -228,15 +228,15 @@ CHAR ProcessorNumber, BOOLEAN FloatingSave ); - + BOOLEAN -STDCALL +STDCALL KeConnectInterrupt( PKINTERRUPT InterruptObject ); BOOLEAN -STDCALL +STDCALL KeDisconnectInterrupt( PKINTERRUPT InterruptObject ); @@ -266,7 +266,7 @@ IN PKMUTANT Mutant, IN BOOLEAN InitialOwner ); - + LONG STDCALL KeReleaseMutant( @@ -282,8 +282,8 @@ IN NTSTATUS ExceptionCode ); -VOID +VOID STDCALL KeFlushWriteBuffer(VOID); - + #endif _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/ketypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -40,7 +40,7 @@ /* TYPES *********************************************************************/ -typedef struct _CONFIGURATION_COMPONENT_DATA +typedef struct _CONFIGURATION_COMPONENT_DATA { struct _CONFIGURATION_COMPONENT_DATA *Parent; struct _CONFIGURATION_COMPONENT_DATA *Child; @@ -48,14 +48,14 @@ CONFIGURATION_COMPONENT Component; } CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; -typedef enum _KAPC_ENVIRONMENT +typedef enum _KAPC_ENVIRONMENT { OriginalApcEnvironment, AttachedApcEnvironment, CurrentApcEnvironment } KAPC_ENVIRONMENT; -typedef struct _KDPC_DATA +typedef struct _KDPC_DATA { LIST_ENTRY DpcListHead; ULONG DpcLock; @@ -76,7 +76,7 @@ #endif /* FIXME: Most of these should go to i386 directory */ -typedef struct _FNSAVE_FORMAT +typedef struct _FNSAVE_FORMAT { ULONG ControlWord; ULONG StatusWord; @@ -117,7 +117,7 @@ ULONG Cr0NpxState; } FX_SAVE_AREA, *PFX_SAVE_AREA; -typedef struct _KTRAP_FRAME +typedef struct _KTRAP_FRAME { PVOID DebugEbp; PVOID DebugEip; @@ -167,29 +167,33 @@ /* FIXME: Win32k uses windows.h! */ #ifndef __WIN32K__ -typedef struct _LDT_ENTRY { - WORD LimitLow; - WORD BaseLow; - union { - struct { - BYTE BaseMid; - BYTE Flags1; - BYTE Flags2; - BYTE BaseHi; - } Bytes; - struct { - DWORD BaseMid : 8; - DWORD Type : 5; - DWORD Dpl : 2; - DWORD Pres : 1; - DWORD LimitHi : 4; - DWORD Sys : 1; - DWORD Reserved_0 : 1; - DWORD Default_Big : 1; - DWORD Granularity : 1; - DWORD BaseHi : 8; - } Bits; - } HighWord; +typedef struct _LDT_ENTRY +{ + WORD LimitLow; + WORD BaseLow; + union + { + struct + { + BYTE BaseMid; + BYTE Flags1; + BYTE Flags2; + BYTE BaseHi; + } Bytes; + struct + { + DWORD BaseMid : 8; + DWORD Type : 5; + DWORD Dpl : 2; + DWORD Pres : 1; + DWORD LimitHi : 4; + DWORD Sys : 1; + DWORD Reserved_0 : 1; + DWORD Default_Big : 1; + DWORD Granularity : 1; + DWORD BaseHi : 8; + } Bits; + } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; #endif @@ -197,14 +201,17 @@ { USHORT LimitLow; USHORT BaseLow; - union { - struct { + union + { + struct + { UCHAR BaseMid; UCHAR Flags1; UCHAR Flags2; UCHAR BaseHi; } Bytes; - struct { + struct + { ULONG BaseMid : 8; ULONG Type : 5; ULONG Dpl : 2; @@ -249,14 +256,14 @@ /* Fixme: Use correct types? */ typedef struct _KPROCESSOR_STATE { - PCONTEXT ContextFrame; - PVOID SpecialRegisters; + PCONTEXT ContextFrame; + PVOID SpecialRegisters; } KPROCESSOR_STATE; /* Processor Control Block */ typedef struct _KPRCB { - USHORT MinorVersion; + USHORT MinorVersion; USHORT MajorVersion; struct _KTHREAD *CurrentThread; struct _KTHREAD *NextThread; @@ -387,33 +394,34 @@ /* * This is the complete, internal KPCR structure */ -typedef struct _KIPCR { - KPCR_TIB Tib; /* 00 */ - struct _KPCR *Self; /* 1C */ - struct _KPRCB *Prcb; /* 20 */ - KIRQL Irql; /* 24 */ - ULONG IRR; /* 28 */ - ULONG IrrActive; /* 2C */ - ULONG IDR; /* 30 */ - PVOID KdVersionBlock; /* 34 */ - PUSHORT IDT; /* 38 */ - PUSHORT GDT; /* 3C */ - struct _KTSS *TSS; /* 40 */ - USHORT MajorVersion; /* 44 */ - USHORT MinorVersion; /* 46 */ - KAFFINITY SetMember; /* 48 */ - ULONG StallScaleFactor; /* 4C */ - UCHAR SparedUnused; /* 50 */ - UCHAR Number; /* 51 */ - UCHAR Reserved; /* 52 */ - UCHAR L2CacheAssociativity; /* 53 */ - ULONG VdmAlert; /* 54 */ - ULONG KernelReserved[14]; /* 58 */ - ULONG L2CacheSize; /* 90 */ - ULONG HalReserved[16]; /* 94 */ - ULONG InterruptMode; /* D4 */ - UCHAR KernelReserved2[0x48]; /* D8 */ - KPRCB PrcbData; /* 120 */ +typedef struct _KIPCR +{ + KPCR_TIB Tib; /* 00 */ + struct _KPCR *Self; /* 1C */ + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IrrActive; /* 2C */ + ULONG IDR; /* 30 */ + PVOID KdVersionBlock; /* 34 */ + PUSHORT IDT; /* 38 */ + PUSHORT GDT; /* 3C */ + struct _KTSS *TSS; /* 40 */ + USHORT MajorVersion; /* 44 */ + USHORT MinorVersion; /* 46 */ + KAFFINITY SetMember; /* 48 */ + ULONG StallScaleFactor; /* 4C */ + UCHAR SparedUnused; /* 50 */ + UCHAR Number; /* 51 */ + UCHAR Reserved; /* 52 */ + UCHAR L2CacheAssociativity; /* 53 */ + ULONG VdmAlert; /* 54 */ + ULONG KernelReserved[14]; /* 58 */ + ULONG L2CacheSize; /* 90 */ + ULONG HalReserved[16]; /* 94 */ + ULONG InterruptMode; /* D4 */ + UCHAR KernelReserved2[0x48]; /* D8 */ + KPRCB PrcbData; /* 120 */ } KIPCR, *PKIPCR; #pragma pack(pop) @@ -511,7 +519,8 @@ #include <poppack.h> /* i386 Doesn't have Exception Frames */ -typedef struct _KEXCEPTION_FRAME { +typedef struct _KEXCEPTION_FRAME +{ } KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; @@ -544,7 +553,7 @@ struct _KPROCESS *Process; } KPROFILE, *PKPROFILE; -typedef struct _KINTERRUPT +typedef struct _KINTERRUPT { CSHORT Type; CSHORT Size; @@ -621,94 +630,97 @@ typedef struct _KTHREAD { - /* For waiting on thread exit */ - DISPATCHER_HEADER DispatcherHeader; /* 00 */ + /* For waiting on thread exit */ + DISPATCHER_HEADER DispatcherHeader; /* 00 */ - /* List of mutants owned by the thread */ - LIST_ENTRY MutantListHead; /* 10 */ - PVOID InitialStack; /* 18 */ - ULONG_PTR StackLimit; /* 1C */ + /* List of mutants owned by the thread */ + LIST_ENTRY MutantListHead; /* 10 */ + PVOID InitialStack; /* 18 */ + ULONG_PTR StackLimit; /* 1C */ - /* Pointer to the thread's environment block in user memory */ - struct _TEB *Teb; /* 20 */ + /* Pointer to the thread's environment block in user memory */ + struct _TEB *Teb; /* 20 */ - /* Pointer to the thread's TLS array */ - PVOID TlsArray; /* 24 */ - PVOID KernelStack; /* 28 */ - UCHAR DebugActive; /* 2C */ + /* Pointer to the thread's TLS array */ + PVOID TlsArray; /* 24 */ + PVOID KernelStack; /* 28 */ + UCHAR DebugActive; /* 2C */ - /* Thread state (one of THREAD_STATE_xxx constants below) */ - UCHAR State; /* 2D */ - BOOLEAN Alerted[2]; /* 2E */ - UCHAR Iopl; /* 30 */ - UCHAR NpxState; /* 31 */ - CHAR Saturation; /* 32 */ - CHAR Priority; /* 33 */ - KAPC_STATE ApcState; /* 34 */ - ULONG ContextSwitches; /* 4C */ - LONG WaitStatus; /* 50 */ - KIRQL WaitIrql; /* 54 */ - CHAR WaitMode; /* 55 */ - UCHAR WaitNext; /* 56 */ - UCHAR WaitReason; /* 57 */ - union { /* 58 */ - PKWAIT_BLOCK WaitBlockList; /* 58 */ - PKGATE GateObject; /* 58 */ - }; /* 58 */ - LIST_ENTRY WaitListEntry; /* 5C */ - ULONG WaitTime; /* 64 */ - CHAR BasePriority; /* 68 */ - UCHAR DecrementCount; /* 69 */ - UCHAR PriorityDecrement; /* 6A */ - CHAR Quantum; /* 6B */ - KWAIT_BLOCK WaitBlock[4]; /* 6C */ - PVOID LegoData; /* CC */ - union { - struct { - USHORT KernelApcDisable; - USHORT SpecialApcDisable; - }; - ULONG CombinedApcDisable; /* D0 */ - }; - KAFFINITY UserAffinity; /* D4 */ - UCHAR SystemAffinityActive;/* D8 */ - UCHAR PowerState; /* D9 */ - UCHAR NpxIrql; /* DA */ - UCHAR Pad[1]; /* DB */ - PVOID ServiceTable; /* DC */ - struct _KQUEUE *Queue; /* E0 */ - KSPIN_LOCK ApcQueueLock; /* E4 */ - KTIMER Timer; /* E8 */ - LIST_ENTRY QueueListEntry; /* 110 */ - KAFFINITY Affinity; /* 118 */ - UCHAR Preempted; /* 11C */ - UCHAR ProcessReadyQueue; /* 11D */ - UCHAR KernelStackResident; /* 11E */ - UCHAR NextProcessor; /* 11F */ - PVOID CallbackStack; /* 120 */ - struct _W32THREAD *Win32Thread; /* 124 */ - struct _KTRAP_FRAME *TrapFrame; /* 128 */ - PKAPC_STATE ApcStatePointer[2]; /* 12C */ - UCHAR EnableStackSwap; /* 134 */ - UCHAR LargeStack; /* 135 */ - UCHAR ResourceIndex; /* 136 */ - UCHAR PreviousMode; /* 137 */ - ULONG KernelTime; /* 138 */ - ULONG UserTime; /* 13C */ - KAPC_STATE SavedApcState; /* 140 */ - UCHAR Alertable; /* 158 */ - UCHAR ApcStateIndex; /* 159 */ - UCHAR ApcQueueable; /* 15A */ - UCHAR AutoAlignment; /* 15B */ - PVOID StackBase; /* 15C */ - KAPC SuspendApc; /* 160 */ - KSEMAPHORE SuspendSemaphore; /* 190 */ - LIST_ENTRY ThreadListEntry; /* 1A4 */ - CHAR FreezeCount; /* 1AC */ - UCHAR SuspendCount; /* 1AD */ - UCHAR IdealProcessor; /* 1AE */ - UCHAR DisableBoost; /* 1AF */ - UCHAR QuantumReset; /* 1B0 */ + /* Thread state (one of THREAD_STATE_xxx constants below) */ + UCHAR State; /* 2D */ + BOOLEAN Alerted[2]; /* 2E */ + UCHAR Iopl; /* 30 */ + UCHAR NpxState; /* 31 */ + CHAR Saturation; /* 32 */ + CHAR Priority; /* 33 */ + KAPC_STATE ApcState; /* 34 */ + ULONG ContextSwitches; /* 4C */ + LONG WaitStatus; /* 50 */ + KIRQL WaitIrql; /* 54 */ + CHAR WaitMode; /* 55 */ + UCHAR WaitNext; /* 56 */ + UCHAR WaitReason; /* 57 */ + union /* 58 */ + { + PKWAIT_BLOCK WaitBlockList; /* 58 */ + PKGATE GateObject; /* 58 */ + }; /* 58 */ + LIST_ENTRY WaitListEntry; /* 5C */ + ULONG WaitTime; /* 64 */ + CHAR BasePriority; /* 68 */ + UCHAR DecrementCount; /* 69 */ + UCHAR PriorityDecrement; /* 6A */ + CHAR Quantum; /* 6B */ + KWAIT_BLOCK WaitBlock[4]; /* 6C */ + PVOID LegoData; /* CC */ + union + { + struct + { + USHORT KernelApcDisable; + USHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; /* D0 */ + }; + KAFFINITY UserAffinity; /* D4 */ + UCHAR SystemAffinityActive;/* D8 */ + UCHAR PowerState; /* D9 */ + UCHAR NpxIrql; /* DA */ + UCHAR Pad[1]; /* DB */ + PVOID ServiceTable; /* DC */ + struct _KQUEUE *Queue; /* E0 */ + KSPIN_LOCK ApcQueueLock; /* E4 */ + KTIMER Timer; /* E8 */ + LIST_ENTRY QueueListEntry; /* 110 */ + KAFFINITY Affinity; /* 118 */ + UCHAR Preempted; /* 11C */ + UCHAR ProcessReadyQueue; /* 11D */ + UCHAR KernelStackResident; /* 11E */ + UCHAR NextProcessor; /* 11F */ + PVOID CallbackStack; /* 120 */ + struct _W32THREAD *Win32Thread; /* 124 */ + struct _KTRAP_FRAME *TrapFrame; /* 128 */ + PKAPC_STATE ApcStatePointer[2]; /* 12C */ + UCHAR EnableStackSwap; /* 134 */ + UCHAR LargeStack; /* 135 */ + UCHAR ResourceIndex; /* 136 */ + UCHAR PreviousMode; /* 137 */ + ULONG KernelTime; /* 138 */ + ULONG UserTime; /* 13C */ + KAPC_STATE SavedApcState; /* 140 */ + UCHAR Alertable; /* 158 */ + UCHAR ApcStateIndex; /* 159 */ + UCHAR ApcQueueable; /* 15A */ + UCHAR AutoAlignment; /* 15B */ + PVOID StackBase; /* 15C */ + KAPC SuspendApc; /* 160 */ + KSEMAPHORE SuspendSemaphore; /* 190 */ + LIST_ENTRY ThreadListEntry; /* 1A4 */ + CHAR FreezeCount; /* 1AC */ + UCHAR SuspendCount; /* 1AD */ + UCHAR IdealProcessor; /* 1AE */ + UCHAR DisableBoost; /* 1AF */ + UCHAR QuantumReset; /* 1B0 */ } KTHREAD; #include <poppack.h> @@ -739,8 +751,10 @@ LIST_ENTRY ThreadListHead; /* 050 */ KSPIN_LOCK ProcessLock; /* 058 */ KAFFINITY Affinity; /* 05C */ - union { - struct { + union + { + struct + { ULONG AutoAlignment:1; /* 060.0 */ ULONG DisableBoost:1; /* 060.1 */ ULONG DisableQuantum:1; /* 060.2 */ _____ Modified: trunk/reactos/include/ndk/ldrfuncs.h --- trunk/reactos/include/ndk/ldrfuncs.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/ldrfuncs.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -42,5 +42,5 @@ IN ULONG Ordinal, OUT PVOID *ProcedureAddress ); - + #endif _____ Modified: trunk/reactos/include/ndk/ldrtypes.h --- trunk/reactos/include/ndk/ldrtypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/ldrtypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -20,17 +20,17 @@ #define RESOURCE_DATA_LEVEL 3 /* FIXME: USE CORRRECT LDR_ FLAGS */ -#define IMAGE_DLL 0x00000004 -#define LOAD_IN_PROGRESS 0x00001000 -#define UNLOAD_IN_PROGRESS 0x00002000 -#define ENTRY_PROCESSED 0x00004000 -#define DONT_CALL_FOR_THREAD 0x00040000 -#define PROCESS_ATTACH_CALLED 0x00080000 -#define IMAGE_NOT_AT_BASE 0x00200000 +#define IMAGE_DLL 0x00000004 +#define LOAD_IN_PROGRESS 0x00001000 +#define UNLOAD_IN_PROGRESS 0x00002000 +#define ENTRY_PROCESSED 0x00004000 +#define DONT_CALL_FOR_THREAD 0x00040000 +#define PROCESS_ATTACH_CALLED 0x00080000 +#define IMAGE_NOT_AT_BASE 0x00200000 /* ENUMERATIONS **************************************************************/ -/* TYPES *********************************************************************/ +/* TYPES *********************************************************************/ /* FIXME: Update with _LDR_DATA_TABLE_ENTRY and LDR_ flags */ typedef struct _PEB_LDR_DATA { @@ -69,7 +69,7 @@ #endif /* KDBG */ } LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY; -typedef struct _LDR_RESOURCE_INFO +typedef struct _LDR_RESOURCE_INFO { ULONG Type; ULONG Name; _____ Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/lpctypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -21,7 +21,7 @@ /* ENUMERATIONS **************************************************************/ -typedef enum _LPC_TYPE +typedef enum _LPC_TYPE { LPC_NEW_MESSAGE, LPC_REQUEST, @@ -41,7 +41,8 @@ /* TYPES *********************************************************************/ /* FIXME: USE REAL DEFINITION */ -typedef struct _LPC_MESSAGE { +typedef struct _LPC_MESSAGE +{ USHORT DataSize; USHORT MessageSize; USHORT MessageType; @@ -52,7 +53,7 @@ } LPC_MESSAGE, *PLPC_MESSAGE; /* FIXME: USE REAL DEFINITION */ -typedef struct _LPC_SECTION_WRITE +typedef struct _LPC_SECTION_WRITE { ULONG Length; HANDLE SectionHandle; @@ -63,15 +64,15 @@ } LPC_SECTION_WRITE, *PLPC_SECTION_WRITE; /* FIXME: USE REAL DEFINITION */ -typedef struct _LPC_SECTION_READ +typedef struct _LPC_SECTION_READ { ULONG Length; ULONG ViewSize; PVOID ViewBase; -} LPC_SECTION_READ, *PLPC_SECTION_READ; +} LPC_SECTION_READ, *PLPC_SECTION_READ; /* FIXME: USE REAL DEFINITION */ -typedef struct _LPC_MAX_MESSAGE +typedef struct _LPC_MAX_MESSAGE { LPC_MESSAGE Header; BYTE Data[MAX_MESSAGE_DATA]; _____ Modified: trunk/reactos/include/ndk/mmfuncs.h --- trunk/reactos/include/ndk/mmfuncs.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/mmfuncs.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -13,10 +13,10 @@ /* PROTOTYPES ****************************************************************/ -NTSTATUS +NTSTATUS STDCALL MmUnmapViewOfSection( - struct _EPROCESS* Process, + struct _EPROCESS* Process, PVOID BaseAddress ); _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/obtypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -34,7 +34,7 @@ /* ENUMERATIONS **************************************************************/ typedef enum _OB_OPEN_REASON -{ +{ ObCreateHandle, ObOpenHandle, ObDuplicateHandle, @@ -54,7 +54,7 @@ ACCESS_MASK GrantedAccess ); -typedef NTSTATUS +typedef NTSTATUS (STDCALL *OB_PARSE_METHOD)( PVOID Object, PVOID *NextObject, @@ -62,13 +62,13 @@ PWSTR *Path, ULONG Attributes ); - -typedef VOID + +typedef VOID (STDCALL *OB_DELETE_METHOD)( PVOID DeletedObject ); -typedef VOID +typedef VOID (STDCALL *OB_CLOSE_METHOD)( PVOID ClosedObject, ULONG HandleCount @@ -77,10 +77,10 @@ typedef VOID (STDCALL *OB_DUMP_METHOD)(VOID); -typedef NTSTATUS +typedef NTSTATUS (STDCALL *OB_OKAYTOCLOSE_METHOD)(VOID); -typedef NTSTATUS +typedef NTSTATUS (STDCALL *OB_QUERYNAME_METHOD)( PVOID ObjectBody, POBJECT_NAME_INFORMATION ObjectNameInfo, @@ -88,14 +88,14 @@ PULONG ReturnLength ); -typedef PVOID +typedef PVOID (STDCALL *OB_FIND_METHOD)( PVOID WinStaObject, PWSTR Name, ULONG Attributes ); -typedef NTSTATUS +typedef NTSTATUS (STDCALL *OB_SECURITY_METHOD)( PVOID ObjectBody, SECURITY_OPERATION_CODE OperationCode, @@ -116,7 +116,7 @@ /* TYPES *********************************************************************/ /* FIXME: Does this match NT's? */ [truncated at 1000 lines; 6297 more skipped]

19 years, 2 months

[ion] 16271: build win32k with NDK, finally\!

by ion＠svn.reactos.com

build win32k with NDK, finally\! Added: trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/obfuncs.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/win32k/kapi.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Deleted: trunk/reactos/ntoskrnl/include/internal/nt.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/subsys/win32k/include/accelerator.h Modified: trunk/reactos/subsys/win32k/include/caret.h Modified: trunk/reactos/subsys/win32k/include/class.h Modified: trunk/reactos/subsys/win32k/include/clipboard.h Modified: trunk/reactos/subsys/win32k/include/desktop.h Modified: trunk/reactos/subsys/win32k/include/guicheck.h Modified: trunk/reactos/subsys/win32k/include/hook.h Modified: trunk/reactos/subsys/win32k/include/hotkey.h Modified: trunk/reactos/subsys/win32k/include/menu.h Modified: trunk/reactos/subsys/win32k/include/monitor.h Modified: trunk/reactos/subsys/win32k/include/mouse.h Modified: trunk/reactos/subsys/win32k/include/msgqueue.h Modified: trunk/reactos/subsys/win32k/include/object.h Modified: trunk/reactos/subsys/win32k/include/painting.h Modified: trunk/reactos/subsys/win32k/include/useratom.h Modified: trunk/reactos/subsys/win32k/include/vis.h Added: trunk/reactos/subsys/win32k/include/win32k.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/include/winsta.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Deleted: trunk/reactos/subsys/win32k/main/svctabm.c Modified: trunk/reactos/subsys/win32k/misc/driver.c Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/subsys/win32k/win32k.xml Modified: trunk/reactos/tools/nci/nci.mak Modified: trunk/reactos/tools/nci/ncitool.c _____ Added: trunk/reactos/include/ndk/mmfuncs.h --- trunk/reactos/include/ndk/mmfuncs.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/include/ndk/mmfuncs.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/halfuncs.h + * PURPOSE: Prototypes for exported HAL Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _MMFUNCS_H +#define _MMFUNCS_H + +/* DEPENDENCIES **************************************************************/ + + +/* PROTOTYPES ****************************************************************/ +NTSTATUS +STDCALL +MmUnmapViewOfSection( + struct _EPROCESS* Process, + PVOID BaseAddress +); + +#endif _____ Modified: trunk/reactos/include/ndk/ntndk.h --- trunk/reactos/include/ndk/ntndk.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/include/ndk/ntndk.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -26,6 +26,7 @@ #include "ldrfuncs.h" /* Loader Functions */ #include "lpctypes.h" /* Local Procedure Call Types */ #include "mmtypes.h" /* Memory Manager Types */ + #include "mmfuncs.h" /* Memory Manager Functions */ #include "obtypes.h" /* Object Manager Types */ #include "obfuncs.h" /* Object Manager Functions */ #include "potypes.h" /* Power Manager Types */ _____ Modified: trunk/reactos/include/ndk/obfuncs.h --- trunk/reactos/include/ndk/obfuncs.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/include/ndk/obfuncs.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -93,4 +93,14 @@ OUT PVOID *Object ); +NTSTATUS +STDCALL +ObFindHandleForObject( + IN PEPROCESS Process, + IN PVOID Object, + IN POBJECT_TYPE ObjectType, + IN POBJECT_HANDLE_INFORMATION HandleInformation, + OUT PHANDLE Handle +); + #endif _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/include/ndk/obtypes.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -115,6 +115,17 @@ /* TYPES *********************************************************************/ +/* FIXME: Does this match NT's? */ +typedef struct _W32_OBJECT_CALLBACK +{ + OB_OPEN_METHOD WinStaCreate; + OB_PARSE_METHOD WinStaParse; + OB_DELETE_METHOD WinStaDelete; + OB_FIND_METHOD WinStaFind; + OB_CREATE_METHOD DesktopCreate; + OB_DELETE_METHOD DesktopDelete; +} W32_OBJECT_CALLBACK, *PW32_OBJECT_CALLBACK; + typedef struct _OBJECT_BASIC_INFORMATION { ULONG Attributes; _____ Modified: trunk/reactos/include/ndk/psfuncs.h --- trunk/reactos/include/ndk/psfuncs.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/include/ndk/psfuncs.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -10,6 +10,7 @@ #define _PSFUNCS_H /* DEPENDENCIES **************************************************************/ +#include "pstypes.h" /* PROTOTYPES ****************************************************************/ @@ -31,4 +32,19 @@ VOID ); +VOID +STDCALL +PsEstablishWin32Callouts( + PW32_PROCESS_CALLBACK W32ProcessCallback, + PW32_THREAD_CALLBACK W32ThreadCallback, + PW32_OBJECT_CALLBACK W32ObjectCallback, + PVOID Param4, + ULONG W32ThreadSize, + ULONG W32ProcessSize +); + +HANDLE +STDCALL +PsGetProcessId(struct _EPROCESS *Process); + #endif _____ Modified: trunk/reactos/include/win32k/kapi.h --- trunk/reactos/include/win32k/kapi.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/include/win32k/kapi.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -6,6 +6,8 @@ #endif #include <win32k/brush.h> +#include <win32k/callback.h> +#include <win32k/caret.h> #include <win32k/cliprgn.h> #include <win32k/color.h> #include <win32k/cursoricon.h> _____ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h --- trunk/reactos/ntoskrnl/include/internal/ex.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/ntoskrnl/include/internal/ex.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,70 +1,6 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_EXECUTIVE_H #define __NTOSKRNL_INCLUDE_INTERNAL_EXECUTIVE_H -typedef enum -{ - wmCenter = 0, - wmTile, - wmStretch -} WALLPAPER_MODE; - -typedef struct _WINSTATION_OBJECT -{ - PVOID SharedHeap; /* points to kmode memory! */ - - CSHORT Type; - CSHORT Size; - KSPIN_LOCK Lock; - UNICODE_STRING Name; - LIST_ENTRY DesktopListHead; - PRTL_ATOM_TABLE AtomTable; - PVOID HandleTable; - HANDLE SystemMenuTemplate; - PVOID SystemCursor; - UINT CaretBlinkRate; - HANDLE ShellWindow; - HANDLE ShellListView; - - /* Wallpaper */ - HANDLE hbmWallpaper; - ULONG cxWallpaper, cyWallpaper; - WALLPAPER_MODE WallpaperMode; - - ULONG Flags; - struct _DESKTOP_OBJECT* ActiveDesktop; - /* FIXME: Clipboard */ - LIST_ENTRY HotKeyListHead; - FAST_MUTEX HotKeyListLock; -} WINSTATION_OBJECT, *PWINSTATION_OBJECT; - -typedef struct _DESKTOP_OBJECT -{ - PVOID DesktopHeap; /* points to kmode memory! */ - - CSHORT Type; - CSHORT Size; - LIST_ENTRY ListEntry; - KSPIN_LOCK Lock; - UNICODE_STRING Name; - /* Pointer to the associated window station. */ - struct _WINSTATION_OBJECT *WindowStation; - /* Pointer to the active queue. */ - PVOID ActiveMessageQueue; - /* Rectangle of the work area */ -#ifdef __WIN32K__ - RECT WorkArea; -#else - LONG WorkArea[4]; -#endif - /* Handle of the desktop window. */ - HANDLE DesktopWindow; - HANDLE PrevActiveWindow; - /* Thread blocking input */ - PVOID BlockInputThread; - - LIST_ENTRY ShellHookWindows; -} DESKTOP_OBJECT, *PDESKTOP_OBJECT; - /* GLOBAL VARIABLES *********************************************************/ extern TIME_ZONE_INFORMATION ExpTimeZoneInfo; _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -845,11 +845,8 @@ NTSTATUS MmInitSectionImplementation(VOID); -NTSTATUS STDCALL -MmUnmapViewOfSection(struct _EPROCESS* Process, PVOID BaseAddress); - -/* FIXME: it should be in ddk/mmfuncs.h */ -NTSTATUS STDCALL +NTSTATUS +STDCALL MmCreateSection (OUT PSECTION_OBJECT * SectionObject, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, _____ Deleted: trunk/reactos/ntoskrnl/include/internal/nt.h --- trunk/reactos/ntoskrnl/include/internal/nt.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/ntoskrnl/include/internal/nt.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,7 +0,0 @@ -VOID NtInitializeEventImplementation(VOID); -VOID NtInitializeEventPairImplementation(VOID); -VOID NtInitializeSemaphoreImplementation(VOID); -VOID NtInitializeMutantImplementation(VOID); -VOID NtInitializeTimerImplementation(VOID); -NTSTATUS NiInitPort(VOID); -VOID NtInitializeProfileImplementation(VOID); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -18,15 +18,6 @@ #define FSRTL_FAST_IO_TOP_LEVEL_IRP (0x04) #define FSRTL_MAX_TOP_LEVEL_IRP_FLAG (0x04) -typedef struct _W32_OBJECT_CALLBACK { - OB_OPEN_METHOD WinStaCreate; - OB_PARSE_METHOD WinStaParse; - OB_DELETE_METHOD WinStaDelete; - OB_FIND_METHOD WinStaFind; - OB_CREATE_METHOD DesktopCreate; - OB_DELETE_METHOD DesktopDelete; -} W32_OBJECT_CALLBACK, *PW32_OBJECT_CALLBACK; - #define PROCESS_STATE_TERMINATED (1) #define PROCESS_STATE_ACTIVE (2) _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,6 +1,14 @@ -#ifndef __INCLUDE_NTOSKRNL_H -#define __INCLUDE_NTOSKRNL_H +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/include/ntoskrnl.h + * PURPOSE: Main Kernel Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ +/* INCLUDES ******************************************************************/ + +/* We are the Kernel */ #define NTKERNELAPI /* include the ntoskrnl config.h file */ @@ -37,5 +45,3 @@ /* Internal Headers */ #include "internal/ntoskrnl.h" - -#endif /* INCLUDE_NTOSKRNL_H */ _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/ntoskrnl/ps/win32.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -45,16 +45,18 @@ /* FUNCTIONS ***************************************************************/ -PW32THREAD STDCALL +struct _W32THREAD* +STDCALL PsGetWin32Thread(VOID) { return(PsGetCurrentThread()->Tcb.Win32Thread); } -PW32PROCESS STDCALL +struct _W32PROCESS* +STDCALL PsGetWin32Process(VOID) { - return (PW32PROCESS)PsGetCurrentProcess()->Win32Process; + return (struct _W32PROCESS*)PsGetCurrentProcess()->Win32Process; } NTSTATUS STDCALL _____ Modified: trunk/reactos/subsys/win32k/include/accelerator.h --- trunk/reactos/subsys/win32k/include/accelerator.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/accelerator.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,8 +1,6 @@ #ifndef _WIN32K_ACCELERATOR_H #define _WIN32K_ACCELERATOR_H -#include <windows.h> -#include <ddk/ntddk.h> #include <include/winsta.h> #include <include/window.h> _____ Modified: trunk/reactos/subsys/win32k/include/caret.h --- trunk/reactos/subsys/win32k/include/caret.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/caret.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,9 +1,6 @@ #ifndef _WIN32K_CARET_H #define _WIN32K_CARET_H -#include <windows.h> -#include <internal/ps.h> - #define IDCARETTIMER (0xffff) BOOL FASTCALL _____ Modified: trunk/reactos/subsys/win32k/include/class.h --- trunk/reactos/subsys/win32k/include/class.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/class.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,11 +1,6 @@ #ifndef _WIN32K_CLASS_H #define _WIN32K_CLASS_H -#include <windows.h> -#include <ddk/ntddk.h> -#include <ddk/ntapi.h> -#include <napi/win32.h> - #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) _____ Modified: trunk/reactos/subsys/win32k/include/clipboard.h --- trunk/reactos/subsys/win32k/include/clipboard.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/clipboard.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,8 +1,6 @@ #ifndef _WIN32K_CLIPBOARD_H #define _WIN32K_CLIPBOARD_H -#include <windows.h> - UINT FASTCALL IntEnumClipboardFormats(UINT format); _____ Modified: trunk/reactos/subsys/win32k/include/desktop.h --- trunk/reactos/subsys/win32k/include/desktop.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/desktop.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,13 +1,33 @@ #ifndef _WIN32K_DESKTOP_H #define _WIN32K_DESKTOP_H -#include <windows.h> -#include <ddk/ntddk.h> -#include <internal/ex.h> -#include <internal/ps.h> #include "msgqueue.h" #include "window.h" +typedef struct _DESKTOP_OBJECT +{ + PVOID DesktopHeap; /* points to kmode memory! */ + + CSHORT Type; + CSHORT Size; + LIST_ENTRY ListEntry; + KSPIN_LOCK Lock; + UNICODE_STRING Name; + /* Pointer to the associated window station. */ + struct _WINSTATION_OBJECT *WindowStation; + /* Pointer to the active queue. */ + PVOID ActiveMessageQueue; + /* Rectangle of the work area */ + RECT WorkArea; + /* Handle of the desktop window. */ + HANDLE DesktopWindow; + HANDLE PrevActiveWindow; + /* Thread blocking input */ + PVOID BlockInputThread; + + LIST_ENTRY ShellHookWindows; +} DESKTOP_OBJECT, *PDESKTOP_OBJECT; + extern PDESKTOP_OBJECT InputDesktop; extern HDESK InputDesktopHandle; extern PWNDCLASS_OBJECT DesktopWindowClass; _____ Modified: trunk/reactos/subsys/win32k/include/guicheck.h --- trunk/reactos/subsys/win32k/include/guicheck.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/guicheck.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,9 +1,6 @@ #ifndef _WIN32K_GUICHECK_H #define _WIN32K_GUICHECK_H -#include <windows.h> -#include <ddk/ntddk.h> - BOOL FASTCALL IntGraphicsCheck(BOOL Create); BOOL FASTCALL IntCreatePrimarySurface(); VOID FASTCALL IntDestroyPrimarySurface(); _____ Modified: trunk/reactos/subsys/win32k/include/hook.h --- trunk/reactos/subsys/win32k/include/hook.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/hook.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,9 +1,6 @@ #ifndef _WIN32K_HOOK_H #define _WIN32K_HOOK_H -#include <windows.h> -#include <internal/ps.h> - #define HOOK_THREAD_REFERENCED (0x1) typedef struct tagHOOK _____ Modified: trunk/reactos/subsys/win32k/include/hotkey.h --- trunk/reactos/subsys/win32k/include/hotkey.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/hotkey.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,8 +1,6 @@ #ifndef _WIN32K_HOTKEY_H #define _WIN32K_HOTKEY_H -#include <windows.h> -#include <ddk/ntddk.h> #include <include/winsta.h> #include <include/window.h> _____ Modified: trunk/reactos/subsys/win32k/include/menu.h --- trunk/reactos/subsys/win32k/include/menu.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/menu.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,8 +1,6 @@ #ifndef _WIN32K_MENU_H #define _WIN32K_MENU_H -#include <ddk/ntddk.h> -#include <napi/win32.h> #include <win32k/menu.h> #define IS_ATOM(x) \ _____ Modified: trunk/reactos/subsys/win32k/include/monitor.h --- trunk/reactos/subsys/win32k/include/monitor.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/monitor.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,8 +1,6 @@ #ifndef _WIN32K_MONITOR_H #define _WIN32K_MONITOR_H -#include <windows.h> - struct GDIDEVICE; /* monitor object */ _____ Modified: trunk/reactos/subsys/win32k/include/mouse.h --- trunk/reactos/subsys/win32k/include/mouse.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/mouse.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -3,7 +3,6 @@ #include "../eng/misc.h" #include <include/winsta.h> -//#include <ddk/ntddmou.h> INT INTERNAL_CALL MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2); INT INTERNAL_CALL MouseSafetyOnDrawEnd(SURFOBJ *SurfObj); _____ Modified: trunk/reactos/subsys/win32k/include/msgqueue.h --- trunk/reactos/subsys/win32k/include/msgqueue.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/msgqueue.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,8 +1,6 @@ #ifndef _WIN32K_MSGQUEUE_H #define _WIN32K_MSGQUEUE_H -#include <internal/ex.h> -#include <windows.h> #include "caret.h" #include "hook.h" _____ Modified: trunk/reactos/subsys/win32k/include/object.h --- trunk/reactos/subsys/win32k/include/object.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/object.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,7 +1,6 @@ #ifndef _WIN32K_OBJECT_H #define _WIN32K_OBJECT_H -#include <windows.h> #include <win32k/gdiobj.h> #include <win32k/bitmaps.h> #include <win32k/pen.h> _____ Modified: trunk/reactos/subsys/win32k/include/painting.h --- trunk/reactos/subsys/win32k/include/painting.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/painting.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,8 +1,6 @@ #ifndef _WIN32K_PAINTING_H #define _WIN32K_PAINTING_H -#include <windows.h> -#include <ddk/ntddk.h> #include <include/class.h> #include <include/msgqueue.h> #include <include/window.h> _____ Modified: trunk/reactos/subsys/win32k/include/useratom.h --- trunk/reactos/subsys/win32k/include/useratom.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/useratom.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,9 +1,6 @@ #ifndef _WIN32K_USERATOM_H #define _WIN32K_USERATOM_H -#include <windows.h> -#include <ddk/ntapi.h> - RTL_ATOM FASTCALL IntAddAtom(LPWSTR AtomName); ULONG FASTCALL _____ Modified: trunk/reactos/subsys/win32k/include/vis.h --- trunk/reactos/subsys/win32k/include/vis.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/vis.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -11,7 +11,6 @@ #ifndef _WIN32K_VIS_H #define _WIN32K_VIS_H -#include <internal/ex.h> #include <include/window.h> HRGN FASTCALL _____ Added: trunk/reactos/subsys/win32k/include/win32k.h --- trunk/reactos/subsys/win32k/include/win32k.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/win32k.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -0,0 +1,60 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Graphics Subsystem + * FILE: subsys/win32k/include/win32k.h + * PURPOSE: Internal Win32K Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +/* Internal Win32k Headers */ +#include <include/ssec.h> +#include <include/accelerator.h> +#include <include/callback.h> +#include <include/caret.h> +#include <include/class.h> +#include <include/cleanup.h> +#include <include/clipboard.h> +#include <include/color.h> +#include <include/csr.h> +#include <include/cursoricon.h> +#include <include/dce.h> +#include <include/desktop.h> +#include <include/dib.h> +#include <include/eng.h> +#include <include/error.h> +#include <include/focus.h> +#include <include/guicheck.h> +#include <include/hook.h> +#include <include/hotkey.h> +#include <include/input.h> +#include <include/inteng.h> +#include <include/intgdi.h> +#include <include/menu.h> +#include <include/monitor.h> +#include <include/mouse.h> +#include <include/msgqueue.h> +#include <include/object.h> +#include <include/paint.h> +#include <include/painting.h> +#include <include/palette.h> +#include <include/path.h> +#include <include/prop.h> +#include <include/rect.h> +#include <include/scroll.h> +#include <include/surface.h> +#include <include/tags.h> +#include <include/text.h> +#include <include/timer.h> +#include <include/timer.h> +#include <include/useratom.h> +#include <include/vis.h> +#include <include/window.h> +#include <include/winpos.h> +#include <include/winsta.h> +#include <eng/objects.h> +#include <eng/misc.h> +#include <dib/dib.h> + +/* EOF */ _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/window.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -5,8 +5,6 @@ struct _WINDOW_OBJECT; typedef struct _WINDOW_OBJECT *PWINDOW_OBJECT; -#include <windows.h> -#include <ddk/ntddk.h> #include <include/object.h> #include <include/class.h> #include <include/msgqueue.h> _____ Modified: trunk/reactos/subsys/win32k/include/winsta.h --- trunk/reactos/subsys/win32k/include/winsta.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/include/winsta.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,10 +1,6 @@ #ifndef _WIN32K_WINSTA_H #define _WIN32K_WINSTA_H -#include <windows.h> -#include <ddk/ntddk.h> -#include <internal/ex.h> -#include <internal/ps.h> #include "msgqueue.h" #define WINSTA_ROOT_NAME L"\\Windows\\WindowStations" @@ -14,6 +10,42 @@ #define WSS_LOCKED (1) #define WSS_NOINTERACTIVE (2) +typedef enum +{ + wmCenter = 0, + wmTile, + wmStretch +} WALLPAPER_MODE; + +typedef struct _WINSTATION_OBJECT +{ + PVOID SharedHeap; /* points to kmode memory! */ + + CSHORT Type; + CSHORT Size; + KSPIN_LOCK Lock; + UNICODE_STRING Name; + LIST_ENTRY DesktopListHead; + PRTL_ATOM_TABLE AtomTable; + PVOID HandleTable; + HANDLE SystemMenuTemplate; + PVOID SystemCursor; + UINT CaretBlinkRate; + HANDLE ShellWindow; + HANDLE ShellListView; + + /* Wallpaper */ + HANDLE hbmWallpaper; + ULONG cxWallpaper, cyWallpaper; + WALLPAPER_MODE WallpaperMode; + + ULONG Flags; + struct _DESKTOP_OBJECT* ActiveDesktop; + /* FIXME: Clipboard */ + LIST_ENTRY HotKeyListHead; + FAST_MUTEX HotKeyListLock; +} WINSTATION_OBJECT, *PWINSTATION_OBJECT; + extern WINSTATION_OBJECT *InputWindowStation; extern PW32PROCESS LogonProcess; _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -20,7 +20,9 @@ * * Entry Point for win32k.sys */ +#include <win32k/ntddraw.h> /* FIXME: FIX THIS! */ #include <w32k.h> +#include <include/napi.h> #define NDEBUG #include <win32k/debug1.h> _____ Deleted: trunk/reactos/subsys/win32k/main/svctabm.c --- trunk/reactos/subsys/win32k/main/svctabm.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/main/svctabm.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,56 +0,0 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * Entry Point for win32k.sys - */ - -#undef WIN32_LEAN_AND_MEAN -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_KERNEL -#include <ntos.h> -#include <win32k/ntddraw.h> -#include <ddk/winddi.h> -#include <win32k/win32k.h> - -/* - * NOTE: the table is actually in the file ./svctab.c, - * generated by iface/addsys/mktab.c + w32ksvc.db - */ -#include "svctab.c" - _____ Modified: trunk/reactos/subsys/win32k/misc/driver.c --- trunk/reactos/subsys/win32k/misc/driver.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/misc/driver.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -74,7 +74,7 @@ { static WCHAR DefaultPath[] = L"\\SystemRoot\\System32\\"; static WCHAR DefaultExtension[] = L".DLL"; - SYSTEM_LOAD_IMAGE GdiDriverInfo; + SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; GRAPHICS_DRIVER *Driver = DriverList; NTSTATUS Status; WCHAR *FullName; @@ -140,8 +140,8 @@ } /* If not, then load it */ - RtlInitUnicodeString (&GdiDriverInfo.ModuleName, (LPWSTR)FullName); - Status = ZwSetSystemInformation (SystemLoadImage, &GdiDriverInfo, sizeof(SYSTEM_LOAD_IMAGE)); + RtlInitUnicodeString (&GdiDriverInfo.DriverName, (LPWSTR)FullName); + Status = ZwSetSystemInformation (SystemLoadGdiDriverInformation, &GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); ExFreePool(FullName); if (!NT_SUCCESS(Status)) return NULL; _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -8,10 +8,11 @@ * REVISION HISTORY: * 25-10-2003 PB Created */ - +/* FIXME: FOR THE LOVE OF GOD SOMEONE PLEASE FIX THIS FUCKFEST */ #include <ddk/ntddk.h> #include <win32k/ntddraw.h> #include <ddk/winddi.h> +#include <w32k.h> #include <win32k/win32k.h> #include <include/intddraw.h> #include <win32k/gdiobj.h> _____ Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c --- trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -8,9 +8,11 @@ * REVISION HISTORY: * 25-10-2003 PB Created */ +/* FIXME: FOR THE LOVE OF GOD SOMEONE PLEASE FIX THIS FUCKFEST */ #include <ddk/ntddk.h> #include <win32k/ntddraw.h> #include <ddk/winddi.h> +#include <w32k.h> #include <win32k/win32k.h> #define NDEBUG _____ Modified: trunk/reactos/subsys/win32k/ntuser/csr.c --- trunk/reactos/subsys/win32k/ntuser/csr.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/ntuser/csr.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -58,7 +58,7 @@ OldProcess = PsGetCurrentProcess(); if (CsrProcess != OldProcess) { - KeAttachProcess(EPROCESS_TO_KPROCESS(CsrProcess)); + KeAttachProcess(&CsrProcess->Pcb); } Status = ZwRequestWaitReplyPort(WindowsApiPort, &Request->Header, @@ -132,7 +132,7 @@ OldProcess = PsGetCurrentProcess(); if (CsrProcess != OldProcess) { - KeAttachProcess(EPROCESS_TO_KPROCESS(CsrProcess)); + KeAttachProcess(&CsrProcess->Pcb); } Status = ZwClose(Handle); _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -30,19 +30,6 @@ /* INCLUDES ******************************************************************/ #include <w32k.h> -#if 0 -/* not yet defined in w32api... */ -NTSTATUS STDCALL -ObFindHandleForObject(IN PEPROCESS Process, - IN PVOID Object, - IN POBJECT_TYPE ObjectType, - IN POBJECT_HANDLE_INFORMATION HandleInformation, - OUT PHANDLE Handle); -#else -#define ObFindHandleForObject(Process, Object, ObjectType, HandleInformation, Handle) \ - (STATUS_UNSUCCESSFUL) -#endif - /* GLOBALS *******************************************************************/ /* Currently active desktop */ @@ -1359,7 +1346,7 @@ may be a bit safer (e.g. when the desktop is being destroyed */ /* switch into the context of the thread we're trying to get the desktop from, so we can use the handle */ - KeAttachProcess(EPROCESS_TO_KPROCESS(Thread->ThreadsProcess)); + KeAttachProcess(&Thread->ThreadsProcess->Pcb); Status = ObReferenceObjectByHandle(hThreadDesktop, GENERIC_ALL, ExDesktopObjectType, _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -1250,7 +1250,7 @@ CurrentProcess = PsGetCurrentProcess(); if (CurrentProcess != Process) { - KeAttachProcess(EPROCESS_TO_KPROCESS(Process)); + KeAttachProcess(&Process->Pcb); } IntLockProcessMenus(Win32Process); _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-25 20:05:56 UTC (rev 16271) @@ -22,27 +22,10 @@ * $Id$ */ #include <w32k.h> -#include <ddk/ntddk.h> #define NDEBUG #include <debug.h> -#include <pseh.h> - -#ifdef __USE_W32API -/* F*(&#$ header mess!!!! */ -HANDLE -STDCALL PsGetProcessId( - PEPROCESS Process - ); -/* ditto */ -ULONG STDCALL -KeRosGetStackFrames ( PULONG Frames, ULONG FrameCount ); -#endif /* __USE_W32API */ - - - - #define GDI_ENTRY_TO_INDEX(ht, e) \ (((ULONG_PTR)(e) - (ULONG_PTR)&((ht)->Entries[0])) / sizeof(GDI_TABLE_ENTRY)) #define GDI_HANDLE_GET_ENTRY(HandleTable, h) \ @@ -656,7 +639,7 @@ CurrentProcess = PsGetCurrentProcess(); if (CurrentProcess != Process) { - KeAttachProcess(EPROCESS_TO_KPROCESS(Process)); + KeAttachProcess(&Process->Pcb); } W32Process = (PW32PROCESS)Process->Win32Process; ASSERT(W32Process); _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-25 18:18:01 UTC (rev 16270) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-25 20:05:56 UTC (rev 16271) @@ -1,92 +1,56 @@ /* - * Precompiled headers for win32k.sys + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Graphics Subsystem + * FILE: subsys/win32k/w32k.h + * PURPOSE: Main Win32K Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ +/* INCLUDES ******************************************************************/ + +/* We are Win32K */ #define __WIN32K__ -#define NTOS_MODE_KERNEL -#include <malloc.h> -#include <pseh.h> - +/* ReactOS Config */ #include <roscfg.h> -#include <roskrnl.h> -#include <ddk/winddi.h> +/* DDK/NDK/SDK Headers */ #include <ddk/ntddk.h> +#include <ddk/ntifs.h> +#include <ddk/winddi.h> #include <ddk/ntddmou.h> +#include <windows.h> /* FIXME ? */ +#include <windowsx.h> /* FIXME ? */ +#include <ndk/ntndk.h> +#include <napi/win32.h> /* FIXME */ -#include <win32k/win32k.h> -#include <win32k/callback.h> -#include <win32k/caret.h> -#include <csrss/csrss.h> +/* FIXME: ReactOS will be R-Rated if I really write what I'm about to */ +NTSTATUS +STDCALL +MmCopyFromCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes); +NTSTATUS +STDCALL +MmCopyToCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes); -#include <internal/ntoskrnl.h> -#include <internal/mm.h> -#include <internal/ke.h> -#include <internal/ob.h> -#include <internal/safe.h> -#include <internal/ps.h> +/* SEH Support with PSEH */ +#include <pseh.h> -#include <napi/win32.h> -#include <ntos.h> -#include <math.h> -#include <float.h> -#include <windows.h> -#include <windowsx.h> +/* CSRSS Header */ +#include <csrss/csrss.h> +/* FIXME: ROSRTL */ #include <rosrtl/string.h> -#include <include/ssec.h> -#include <include/accelerator.h> -#include <include/callback.h> -#include <include/caret.h> -#include <include/class.h> -#include <include/cleanup.h> -#include <include/clipboard.h> [truncated at 1000 lines; 94 more skipped]

19 years, 2 months

[ion] 16270: fix most parts of the build except win32k

by ion＠svn.reactos.com

fix most parts of the build except win32k Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/pstypes.h _____ Modified: trunk/reactos/include/ndk/mmtypes.h --- trunk/reactos/include/ndk/mmtypes.h 2005-06-25 18:08:47 UTC (rev 16269) +++ trunk/reactos/include/ndk/mmtypes.h 2005-06-25 18:18:01 UTC (rev 16270) @@ -31,6 +31,7 @@ /* TYPES *********************************************************************/ /* FIXME: Forced to do this for now, because of EPROCESS, will go away before 0.3.0 */ +#ifndef __NTOSKRNL__ typedef struct _MADDRESS_SPACE { PVOID MemoryAreaRoot; @@ -40,6 +41,7 @@ PUSHORT PageTableRefCountTable; ULONG PageTableRefCountTableSize; } MADDRESS_SPACE, *PMADDRESS_SPACE; +#endif typedef struct _PP_LOOKASIDE_LIST { _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-06-25 18:08:47 UTC (rev 16269) +++ trunk/reactos/include/ndk/pstypes.h 2005-06-25 18:18:01 UTC (rev 16270) @@ -262,6 +262,11 @@ #include "extypes.h" #include "setypes.h" +/* FIXME: see note in mmtypes.h */ +#ifdef _NTOSKRNL_ +#include <internal/mm.h> +#endif + typedef struct _EPROCESS_QUOTA_ENTRY { ULONG Usage;

19 years, 2 months

[ion] 16269: Add many more structures to NDK which were incorrectly in the w32api IFS

by ion＠svn.reactos.com

Add many more structures to NDK which were incorrectly in the w32api IFS Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/setypes.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-06-25 17:01:17 UTC (rev 16268) +++ trunk/reactos/include/ndk/extypes.h 2005-06-25 18:08:47 UTC (rev 16269) @@ -19,7 +19,11 @@ extern NTOSAPI POBJECT_TYPE ExTimerType; /* CONSTANTS *****************************************************************/ + +/* FIXME: Win32k uses windows.h! */ +#ifndef __WIN32K__ #define INVALID_HANDLE_VALUE (HANDLE)-1 +#endif /* Callback Object Access Rights */ #define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) @@ -31,6 +35,11 @@ /* TYPES *********************************************************************/ +/* You'll need the IFS for this, so use an equivalent version */ +#ifndef _NTIFS_ +typedef PVOID EX_RUNDOWN_REF; +#endif + /* You'll need the IFS for these, so let's not force everyone to have it */ #ifdef _NTIFS_ typedef struct _EX_QUEUE_WORKER_INFO @@ -52,6 +61,31 @@ } EX_WORK_QUEUE, *PEX_WORK_QUEUE; #endif +typedef struct _EX_FAST_REF +{ + union + { + PVOID Object; + ULONG RefCnt:3; + ULONG Value; + }; +} EX_FAST_REF, *PEX_FAST_REF; + +typedef struct _EX_PUSH_LOCK +{ + union + { + struct + { + ULONG Waiting:1; + ULONG Exclusive:1; + ULONG Shared:30; + }; + ULONG Value; + PVOID Ptr; + }; +} EX_PUSH_LOCK, *PEX_PUSH_LOCK; + typedef struct _HANDLE_TABLE_ENTRY_INFO { ULONG AuditMask; _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-06-25 17:01:17 UTC (rev 16268) +++ trunk/reactos/include/ndk/ketypes.h 2005-06-25 18:08:47 UTC (rev 16269) @@ -63,6 +63,18 @@ ULONG DpcCount; } KDPC_DATA, *PKDPC_DATA; +/* We don't want to force NTIFS usage only for a single structure */ +#ifndef _NTIFS_ +typedef struct _KAPC_STATE +{ + LIST_ENTRY ApcListHead[2]; + PKPROCESS Process; + BOOLEAN KernelApcInProgress; + BOOLEAN KernelApcPending; + BOOLEAN UserApcPending; +} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; +#endif + /* FIXME: Most of these should go to i386 directory */ typedef struct _FNSAVE_FORMAT { @@ -153,6 +165,8 @@ USHORT Reserved9; } KTRAP_FRAME, *PKTRAP_FRAME; +/* FIXME: Win32k uses windows.h! */ +#ifndef __WIN32K__ typedef struct _LDT_ENTRY { WORD LimitLow; WORD BaseLow; @@ -177,6 +191,7 @@ } Bits; } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; +#endif typedef struct _KGDTENTRY { @@ -661,7 +676,7 @@ UCHAR NpxIrql; /* DA */ UCHAR Pad[1]; /* DB */ PVOID ServiceTable; /* DC */ - PKQUEUE Queue; /* E0 */ + struct _KQUEUE *Queue; /* E0 */ KSPIN_LOCK ApcQueueLock; /* E4 */ KTIMER Timer; /* E8 */ LIST_ENTRY QueueListEntry; /* 110 */ _____ Modified: trunk/reactos/include/ndk/mmtypes.h --- trunk/reactos/include/ndk/mmtypes.h 2005-06-25 17:01:17 UTC (rev 16268) +++ trunk/reactos/include/ndk/mmtypes.h 2005-06-25 18:08:47 UTC (rev 16269) @@ -30,6 +30,17 @@ /* TYPES *********************************************************************/ +/* FIXME: Forced to do this for now, because of EPROCESS, will go away before 0.3.0 */ +typedef struct _MADDRESS_SPACE +{ + PVOID MemoryAreaRoot; + FAST_MUTEX Lock; + PVOID LowestAddress; + struct _EPROCESS* Process; + PUSHORT PageTableRefCountTable; + ULONG PageTableRefCountTableSize; +} MADDRESS_SPACE, *PMADDRESS_SPACE; + typedef struct _PP_LOOKASIDE_LIST { struct _GENERAL_LOOKASIDE *P; @@ -68,4 +79,83 @@ PVOID NodeFreeHint; } MM_AVL_TABLE, *PMM_AVL_TABLE; +typedef struct _MMWSLENTRY +{ + ULONG Valid:1; + ULONG LockedInWs:1; + ULONG LockedInMemory:1; + ULONG Protection:5; + ULONG Hashed:1; + ULONG Direct:1; + ULONG Age:2; + ULONG VirtualPageNumber:14; +} MMWSLENTRY, *PMMWSLENTRY; + +typedef struct _MMWSLE +{ + union + { + PVOID VirtualAddress; + ULONG Long; + MMWSLENTRY e1; + }; +} MMWSLE, *PMMWSLE; + +typedef struct _MMWSLE_HASH +{ + PVOID Key; + ULONG Index; +} MMWSLE_HASH, *PMMWSLE_HASH; + +typedef struct _MMWSL +{ + ULONG FirstFree; + ULONG FirstDynamic; + ULONG LastEntry; + ULONG NextSlot; + PMMWSLE Wsle; + ULONG LastInitializedWsle; + ULONG NonDirectcout; + PMMWSLE_HASH HashTable; + ULONG HashTableSize; + ULONG NumberOfCommittedPageTables; + PVOID HashTableStart; + PVOID HighestPermittedHashAddress; + ULONG NumberOfImageWaiters; + ULONG VadBitMapHint; + USHORT UsedPageTableEntries[768]; + ULONG CommittedPageTables[24]; +} MMWSL, *PMMWSL; + +typedef struct _MMSUPPORT_FLAGS +{ + ULONG SessionSpace:1; + ULONG BeingTrimmed:1; + ULONG SessionLeader:1; + ULONG TrimHard:1; + ULONG WorkingSetHard:1; + ULONG AddressSpaceBeingDeleted :1; + ULONG Available:10; + ULONG AllowWorkingSetAdjustment:8; + ULONG MemoryPriority:8; +} MMSUPPORT_FLAGS, *PMMSUPPORT_FLAGS; + +typedef struct _MMSUPPORT +{ + LARGE_INTEGER LastTrimTime; + MMSUPPORT_FLAGS Flags; + ULONG PageFaultCount; + ULONG PeakWorkingSetSize; + ULONG WorkingSetSize; + ULONG MinimumWorkingSetSize; + ULONG MaximumWorkingSetSize; + PMMWSL MmWorkingSetList; + LIST_ENTRY WorkingSetExpansionLinks; + ULONG Claim; + ULONG NextEstimationSlot; + ULONG NextAgingSlot; + ULONG EstimatedAvailable; + ULONG GrowthSinceLastEstimate; +} MMSUPPORT, *PMMSUPPORT; + #endif _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-06-25 17:01:17 UTC (rev 16268) +++ trunk/reactos/include/ndk/pstypes.h 2005-06-25 18:08:47 UTC (rev 16269) @@ -95,8 +95,6 @@ /* TYPES *********************************************************************/ struct _ETHREAD; -typedef struct _W32PROCESS *PW32PROCESS; -typedef struct _W32THREAD *PW32THREAD; typedef struct _CURDIR { @@ -261,7 +259,42 @@ #ifndef NTOS_MODE_USER #include "mmtypes.h" -#include <internal/mm.h> /* FIXME: Forced to do this for now */ +#include "extypes.h" +#include "setypes.h" + +typedef struct _EPROCESS_QUOTA_ENTRY +{ + ULONG Usage; + ULONG Limit; + ULONG Peak; + ULONG Return; +} EPROCESS_QUOTA_ENTRY, *PEPROCESS_QUOTA_ENTRY; + +typedef struct _EPROCESS_QUOTA_BLOCK +{ + EPROCESS_QUOTA_ENTRY QuotaEntry[3]; + LIST_ENTRY QuotaList; + ULONG ReferenceCount; + ULONG ProcessCount; +} EPROCESS_QUOTA_BLOCK, *PEPROCESS_QUOTA_BLOCK; + +typedef struct _PAGEFAULT_HISTORY +{ + ULONG CurrentIndex; + ULONG MapIndex; + KSPIN_LOCK SpinLock; + PVOID Reserved; + PROCESS_WS_WATCH_INFORMATION WatchInfo[1]; +} PAGEFAULT_HISTORY, *PPAGEFAULT_HISTORY; + +typedef struct _PS_IMPERSONATION_INFORMATION +{ + PACCESS_TOKEN Token; + BOOLEAN CopyOnOpen; + BOOLEAN EffectiveOnly; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; +} PS_IMPERSONATION_INFORMATION, *PPS_IMPERSONATION_INFORMATION; + #include <pshpack4.h> /* * NAME: ETHREAD _____ Modified: trunk/reactos/include/ndk/setypes.h --- trunk/reactos/include/ndk/setypes.h 2005-06-25 17:01:17 UTC (rev 16268) +++ trunk/reactos/include/ndk/setypes.h 2005-06-25 18:08:47 UTC (rev 16269) @@ -88,4 +88,10 @@ GENERIC_MAPPING GenericMapping; ULONG Reserved; } AUX_DATA, *PAUX_DATA; + +typedef struct _SE_AUDIT_PROCESS_CREATION_INFO +{ + POBJECT_NAME_INFORMATION ImageFileName; +} SE_AUDIT_PROCESS_CREATION_INFO, *PSE_AUDIT_PROCESS_CREATION_INFO; + #endif _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-25 17:01:17 UTC (rev 16268) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-25 18:08:47 UTC (rev 16269) @@ -521,16 +521,12 @@ typedef PVOID OPLOCK, *POPLOCK; typedef struct _CACHE_MANAGER_CALLBACKS *PCACHE_MANAGER_CALLBACKS; -typedef struct _EPROCESS_QUOTA_BLOCK *PEPROCESS_QUOTA_BLOCK; typedef struct _FILE_GET_QUOTA_INFORMATION *PFILE_GET_QUOTA_INFORMATION; typedef struct _HANDLE_TABLE *PHANDLE_TABLE; typedef struct _KPROCESS *PKPROCESS; typedef struct _KQUEUE *PKQUEUE; typedef struct _KTRAP_FRAME *PKTRAP_FRAME; -typedef struct _MMWSL *PMMWSL; typedef struct _OBJECT_DIRECTORY *POBJECT_DIRECTORY; -typedef struct _PAGEFAULT_HISTORY *PPAGEFAULT_HISTORY; -typedef struct _PS_IMPERSONATION_INFORMATION *PPS_IMPERSONATION_INFORMATION; typedef struct _SECTION_OBJECT *PSECTION_OBJECT; typedef struct _SHARED_CACHE_MAP *PSHARED_CACHE_MAP; typedef struct _VACB *PVACB; @@ -590,89 +586,6 @@ BOOLEAN UserApcPending; } KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; -#if (VER_PRODUCTBUILD >= 2600) - -typedef struct _MMSUPPORT_FLAGS { - ULONG SessionSpace : 1; - ULONG BeingTrimmed : 1; - ULONG SessionLeader : 1; - ULONG TrimHard : 1; - ULONG WorkingSetHard : 1; - ULONG AddressSpaceBeingDeleted : 1; - ULONG Available : 10; - ULONG AllowWorkingSetAdjustment : 8; - ULONG MemoryPriority : 8; -} MMSUPPORT_FLAGS, *PMMSUPPORT_FLAGS; - -#else - -typedef struct _MMSUPPORT_FLAGS { - ULONG SessionSpace : 1; - ULONG BeingTrimmed : 1; - ULONG ProcessInSession : 1; - ULONG SessionLeader : 1; - ULONG TrimHard : 1; - ULONG WorkingSetHard : 1; - ULONG WriteWatch : 1; - ULONG Filler : 25; -} MMSUPPORT_FLAGS, *PMMSUPPORT_FLAGS; - -#endif - -#if (VER_PRODUCTBUILD >= 2600) - -typedef struct _MMSUPPORT { - LARGE_INTEGER LastTrimTime; - MMSUPPORT_FLAGS Flags; - ULONG PageFaultCount; - ULONG PeakWorkingSetSize; - ULONG WorkingSetSize; - ULONG MinimumWorkingSetSize; - ULONG MaximumWorkingSetSize; - PMMWSL VmWorkingSetList; - LIST_ENTRY WorkingSetExpansionLinks; - ULONG Claim; - ULONG NextEstimationSlot; - ULONG NextAgingSlot; - ULONG EstimatedAvailable; - ULONG GrowthSinceLastEstimate; -} MMSUPPORT, *PMMSUPPORT; - -#else - -typedef struct _MMSUPPORT { - LARGE_INTEGER LastTrimTime; - ULONG LastTrimFaultCount; - ULONG PageFaultCount; - ULONG PeakWorkingSetSize; - ULONG WorkingSetSize; - ULONG MinimumWorkingSetSize; - ULONG MaximumWorkingSetSize; - PMMWSL VmWorkingSetList; - LIST_ENTRY WorkingSetExpansionLinks; - BOOLEAN AllowWorkingSetAdjustment; - BOOLEAN AddressSpaceBeingDeleted; - UCHAR ForegroundSwitchCount; - UCHAR MemoryPriority; -#if (VER_PRODUCTBUILD >= 2195) - union { - ULONG LongFlags; - MMSUPPORT_FLAGS Flags; - } u; - ULONG Claim; - ULONG NextEstimationSlot; - ULONG NextAgingSlot; - ULONG EstimatedAvailable; - ULONG GrowthSinceLastEstimate; -#endif /* (VER_PRODUCTBUILD >= 2195) */ -} MMSUPPORT, *PMMSUPPORT; - -#endif - -typedef struct _SE_AUDIT_PROCESS_CREATION_INFO { - POBJECT_NAME_INFORMATION ImageFileName; -} SE_AUDIT_PROCESS_CREATION_INFO, *PSE_AUDIT_PROCESS_CREATION_INFO; - typedef struct _BITMAP_RANGE { LIST_ENTRY Links; LARGE_INTEGER BasePage; @@ -703,28 +616,6 @@ ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; -#if (VER_PRODUCTBUILD >= 2600) - -typedef struct _EX_FAST_REF { - _ANONYMOUS_UNION union { - PVOID Object; - ULONG RefCnt : 3; - ULONG Value; - } DUMMYUNIONNAME; -} EX_FAST_REF, *PEX_FAST_REF; - -typedef struct _EX_PUSH_LOCK { - _ANONYMOUS_UNION union { - _ANONYMOUS_STRUCT struct { - ULONG Waiting : 1; - ULONG Exclusive : 1; - ULONG Shared : 30; - } DUMMYSTRUCTNAME; - ULONG Value; - PVOID Ptr; - } DUMMYUNIONNAME; -} EX_PUSH_LOCK, *PEX_PUSH_LOCK; - #define EX_RUNDOWN_ACTIVE 0x1 #define EX_RUNDOWN_COUNT_SHIFT 0x1 #define EX_RUNDOWN_COUNT_INC (1 << EX_RUNDOWN_COUNT_SHIFT) @@ -736,22 +627,6 @@ } DUMMYUNIONNAME; } EX_RUNDOWN_REF, *PEX_RUNDOWN_REF; -#endif - -typedef struct _EPROCESS_QUOTA_ENTRY { - ULONG Usage; - ULONG Limit; - ULONG Peak; - ULONG Return; -} EPROCESS_QUOTA_ENTRY, *PEPROCESS_QUOTA_ENTRY; - -typedef struct _EPROCESS_QUOTA_BLOCK { - EPROCESS_QUOTA_ENTRY QuotaEntry[3]; - LIST_ENTRY QuotaList; - ULONG ReferenceCount; - ULONG ProcessCount; -} EPROCESS_QUOTA_BLOCK, *PEPROCESS_QUOTA_BLOCK; - typedef struct _FILE_ACCESS_INFORMATION { ACCESS_MASK AccessFlags; } FILE_ACCESS_INFORMATION, *PFILE_ACCESS_INFORMATION; @@ -1391,13 +1266,6 @@ #endif -typedef struct _PS_IMPERSONATION_INFORMATION { - PACCESS_TOKEN Token; - BOOLEAN CopyOnOpen; - BOOLEAN EffectiveOnly; - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; -} PS_IMPERSONATION_INFORMATION, *PPS_IMPERSONATION_INFORMATION; - typedef struct _PUBLIC_BCB { CSHORT NodeTypeCode; CSHORT NodeByteSize; @@ -1490,54 +1358,6 @@ } SE_EXPORTS, *PSE_EXPORTS; -#if (VER_PRODUCTBUILD >= 2600) - -typedef struct _SHARED_CACHE_MAP { - CSHORT NodeTypeCode; - CSHORT NodeByteSize; - ULONG OpenCount; - LARGE_INTEGER FileSize; - LIST_ENTRY BcbList; - LARGE_INTEGER SectionSize; - LARGE_INTEGER ValidDataLength; - LARGE_INTEGER ValidDataGoal; - PVACB InitialVacbs[4]; - PVACB *Vacbs; - PFILE_OBJECT FileObject; - PVACB ActiveVacb; - PVOID NeedToZero; - ULONG ActivePage; - ULONG NeedToZeroPage; - KSPIN_LOCK ActiveVacbSpinLock; - ULONG VacbActiveCount; - ULONG DirtyPages; - LIST_ENTRY SharedCacheMapLinks; - ULONG Flags; - NTSTATUS Status; - PMBCB Mbcb; - PVOID Section; - PKEVENT CreateEvent; - PKEVENT WaitOnActiveCount; - ULONG PagesToWrite; - LONGLONG BeyondLastFlush; - PCACHE_MANAGER_CALLBACKS Callbacks; - PVOID LazyWriteContext; - LIST_ENTRY PrivateList; - PVOID LogHandle; - PVOID FlushToLsnRoutine; - ULONG DirtyPageThreshold; - ULONG LazyWritePassCount; - PCACHE_UNINITIALIZE_EVENT UninitializeEvent; - PVACB NeedToZeroVacb; - KSPIN_LOCK BcbSpinLock; - PVOID Reserved; - KEVENT Event; - EX_PUSH_LOCK VacbPushLock; - PRIVATE_CACHE_MAP PrivateCacheMap; -} SHARED_CACHE_MAP, *PSHARED_CACHE_MAP; - -#endif - typedef struct _STARTING_VCN_INPUT_BUFFER { LARGE_INTEGER StartingVcn; } STARTING_VCN_INPUT_BUFFER, *PSTARTING_VCN_INPUT_BUFFER;

19 years, 2 months

← Newer
1
...
6
7
8
9
10
11
12
...
65
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 June 2005