Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[cgutman] 53291: [NTOSKRNL] - Print the status returned when an IRP_MN_START_DEVICE request fails
by cgutman＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: cgutman Date: Thu Aug 18 00:25:38 2011 New Revision: 53291 URL: http://svn.reactos.org/svn/reactos?rev=53291&view=rev Log: [NTOSKRNL] - Print the status returned when an IRP_MN_START_DEVICE request fails Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu Aug 18 00:25:38 2011 @@ -311,7 +311,7 @@ /* Set the appropriate flag */ DeviceNode->Flags |= DNF_START_FAILED; - DPRINT1("Warning: PnP Start failed (%wZ)\n", &DeviceNode->InstancePath); + DPRINT1("Warning: PnP Start failed (%wZ) [Status: 0x%x]\n", &DeviceNode->InstancePath, Status); return; }

1 0

[cgutman] 53290: [NTOSKRNL] - Uncomment a device node traversal check
by cgutman＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: cgutman Date: Thu Aug 18 00:04:49 2011 New Revision: 53290 URL: http://svn.reactos.org/svn/reactos?rev=53290&view=rev Log: [NTOSKRNL] - Uncomment a device node traversal check Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu Aug 18 00:04:49 2011 @@ -2118,7 +2118,7 @@ * Make sure this device node is a direct child of the parent device node * that is given as an argument */ -#if 0 + if (DeviceNode->Parent != ParentDeviceNode) { /* @@ -2127,7 +2127,7 @@ DPRINT("Stop\n"); return STATUS_UNSUCCESSFUL; } -#endif + if (IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED) || IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) || IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED))

1 0

[cgutman] 53289: [NTOSKRNL] - Prevent duplicate processing of device objects when bus relations are invalidated multiple times for the bus PDO
by cgutman＠svn.reactos.org 17 Aug '11

17 Aug '11

Author: cgutman Date: Wed Aug 17 23:56:40 2011 New Revision: 53289 URL: http://svn.reactos.org/svn/reactos?rev=53289&view=rev Log: [NTOSKRNL] - Prevent duplicate processing of device objects when bus relations are invalidated multiple times for the bus PDO Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Aug 17 23:56:40 2011 @@ -1392,6 +1392,13 @@ return STATUS_UNSUCCESSFUL; } + /* Skip processing if it was already completed before */ + if (DeviceNode->Flags & DNF_PROCESSED) + { + /* Nothing to do */ + return STATUS_SUCCESS; + } + /* Get Locale ID */ Status = ZwQueryDefaultLocale(FALSE, &LocaleId); if (!NT_SUCCESS(Status)) @@ -1988,7 +1995,7 @@ return STATUS_UNSUCCESSFUL; } - if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) + if (!(DeviceNode->Flags & (DNF_DISABLED | DNF_STARTED | DNF_ADDED))) { WCHAR RegKeyBuffer[MAX_PATH]; UNICODE_STRING RegKey;

1 0

[akhaldi] 53288: [CSRSRV] * Missed this. Sorry.
by akhaldi＠svn.reactos.org 17 Aug '11

17 Aug '11

Author: akhaldi Date: Wed Aug 17 14:29:39 2011 New Revision: 53288 URL: http://svn.reactos.org/svn/reactos?rev=53288&view=rev Log: [CSRSRV] * Missed this. Sorry. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] Wed Aug 17 14:29:39 2011 @@ -4,7 +4,16 @@ #define WIN32_NO_STATUS #include <windows.h> #include <winnt.h> -#include <ndk/lpctypes.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/ldrfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/setypes.h> +#include <ndk/sefuncs.h> +#include <ndk/umfuncs.h> /* CSR Header */ //#include <csr/server.h>

1 0

[cgutman] 53287: [HAL] - Don't use a hard-coded constant instead of PAGE_SHIFT
by cgutman＠svn.reactos.org 17 Aug '11

17 Aug '11

Author: cgutman Date: Wed Aug 17 14:24:36 2011 New Revision: 53287 URL: http://svn.reactos.org/svn/reactos?rev=53287&view=rev Log: [HAL] - Don't use a hard-coded constant instead of PAGE_SHIFT Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] Wed Aug 17 14:24:36 2011 @@ -422,7 +422,7 @@ else { /* Phase 1, use Mm */ - MmUnmapIoSpace(TableAddress, PageCount << 12); + MmUnmapIoSpace(TableAddress, PageCount << PAGE_SHIFT); } /* Cache the bios copy */

1 0

[akhaldi] 53286: [VFATLIB] * Include NDK headers on-demand. * Improve the PCH use.
by akhaldi＠svn.reactos.org 17 Aug '11

17 Aug '11

Author: akhaldi Date: Wed Aug 17 14:06:16 2011 New Revision: 53286 URL: http://svn.reactos.org/svn/reactos?rev=53286&view=rev Log: [VFATLIB] * Include NDK headers on-demand. * Improve the PCH use. Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c trunk/reactos/lib/fslib/vfatlib/check/lfn.c trunk/reactos/lib/fslib/vfatlib/vfatlib.h Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] Wed Aug 17 14:06:16 2011 @@ -5,14 +5,10 @@ /* FAT32, VFAT, Atari format support, and various fixes additions May 1998 * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ - #include "vfatlib.h" -#include <time.h> #define NDEBUG #include <debug.h> - - static DOS_FILE *root; Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] Wed Aug 17 14:06:16 2011 @@ -3,8 +3,6 @@ /* Written 1998 by Roman Hodek */ #include "vfatlib.h" - -#include <limits.h> // for INT_MAX definition #define NDEBUG #include <debug.h> Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] Wed Aug 17 14:06:16 2011 @@ -4,11 +4,19 @@ * FILE: vfatlib.h */ +#include <stdio.h> + #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <fmifs/fmifs.h> + +#include <time.h> +#include <limits.h> // for INT_MAX definition #include "check/dosfsck.h" #include "check/common.h"

1 0

[akhaldi] 53285: [EXT2LIB] * Include NDK headers on-demand. * Set Mke2fs.h as a PCH.
by akhaldi＠svn.reactos.org 17 Aug '11

17 Aug '11

Author: akhaldi Date: Wed Aug 17 14:05:30 2011 New Revision: 53285 URL: http://svn.reactos.org/svn/reactos?rev=53285&view=rev Log: [EXT2LIB] * Include NDK headers on-demand. * Set Mke2fs.h as a PCH. Modified: trunk/reactos/lib/fslib/ext2lib/CMakeLists.txt trunk/reactos/lib/fslib/ext2lib/Mke2fs.h trunk/reactos/lib/fslib/ext2lib/Uuid.c Modified: trunk/reactos/lib/fslib/ext2lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/CMakeLis… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] Wed Aug 17 14:05:30 2011 @@ -10,4 +10,5 @@ Super.c Uuid.c) add_library(ext2lib ${SOURCE}) +add_pch(ext2lib Mke2fs.h) add_dependencies(ext2lib psdk) Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.h… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.h [iso-8859-1] Wed Aug 17 14:05:30 2011 @@ -5,15 +5,15 @@ * HOMEPAGE: http://ext2.yeah.net */ -#pragma once - /* INCLUDES **************************************************************/ - #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <fmifs/fmifs.h> #include "string.h" Modified: trunk/reactos/lib/fslib/ext2lib/Uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Uuid.c?r… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Uuid.c [iso-8859-1] Wed Aug 17 14:05:30 2011 @@ -7,8 +7,7 @@ /* INCLUDES **************************************************************/ -#include "windows.h" -#include "types.h" +#include "Mke2fs.h" /* DEFINITIONS ***********************************************************/

1 0

[akhaldi] 53284: * Include NDK headers on-demand.
by akhaldi＠svn.reactos.org 17 Aug '11

17 Aug '11

Author: akhaldi Date: Wed Aug 17 14:04:33 2011 New Revision: 53284 URL: http://svn.reactos.org/svn/reactos?rev=53284&view=rev Log: * Include NDK headers on-demand. Modified: trunk/reactos/base/system/lsass/lsass.c trunk/reactos/dll/directx/ksuser/ksuser.h trunk/reactos/drivers/directx/dxapi/dxapi_driver.h trunk/reactos/drivers/ksfilter/ks/priv.h trunk/reactos/drivers/video/videoprt/videoprt.h trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c trunk/reactos/hal/halx86/include/hal.h trunk/reactos/lib/epsapi/enum/precomp.h trunk/reactos/lib/fslib/ntfslib/ntfslib.h trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h trunk/reactos/lib/lsalib/lsa.c trunk/reactos/lib/newinflib/builddep.h trunk/reactos/lib/rtl/rtl.h trunk/reactos/lib/sdk/crt/precomp.h trunk/reactos/lib/sdk/nt/entry_point.c trunk/reactos/lib/smlib/precomp.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h trunk/reactos/subsystems/win32/csrss/csrss.c trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -27,7 +27,7 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/psfuncs.h> #include <lsass/lsasrv.h> //#include <samsrv.h> Modified: trunk/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -4,7 +4,6 @@ #define WIN32_NO_STATUS #include <windows.h> -//#include <ndk/ntndk.h> #include <ndk/iofuncs.h> #include <ndk/obtypes.h> #include <ndk/rtlfuncs.h> Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxap… ============================================================================== --- trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -1,20 +1,10 @@ +#include <wdm.h> -/* DDK/NDK/SDK Headers */ -#include <ntddk.h> -#include <ntddmou.h> -#include <ntifs.h> -#include <tvout.h> -#include <ntndk.h> - -#include <stdarg.h> #include <windef.h> #include <winerror.h> #include <wingdi.h> #define NT_BUILD_ENVIRONMENT #include <winddi.h> -#include <prntfont.h> -#include <dde.h> - #include <ddkmapi.h> @@ -123,7 +113,6 @@ sizeof(DWORD) }; - /* Internal driver function */ DRVFN gDxApiEntryPoint [] = { @@ -150,6 +139,3 @@ {DD_DXAPI_ADDVPCAPTUREBUFFER - DD_FIRST_DXAPI, (PFN) DxAddVpCaptureBuffer}, {DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI, (PFN) DxFlushVpCaptureBuffs} }; - - - Modified: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -1,24 +1,21 @@ #define _KSDDK_ +#include <stdio.h> + #include <ntifs.h> -#include <ntddk.h> #define NDEBUG //#define YDEBUG #include <debug.h> #include <portcls.h> -#include <ks.h> #include <kcom.h> #include <pseh/pseh2.h> -#include <ntndk.h> + +#include <ntimage.h> +#include <ndk/ldrfuncs.h> #include "ksfunc.h" -#include "kstypes.h" -#include "ksiface.h" - -#include "ksmedia.h" #include "bdamedia.h" #include <swenum.h> - #define TAG_DEVICE_HEADER 'KSDH' #define REG_PINFLAG_B_MANY 0x4 /* strmif.h */ @@ -49,7 +46,6 @@ DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING_EX(PropAllocatorFraming)\ } - #define DEFINE_KSPROPERTY_STREAMSET(PinSet,\ PropStreamAllocator, PropMasterClock, PropPipeId)\ DEFINE_KSPROPERTY_TABLE(PinSet) {\ @@ -57,7 +53,3 @@ DEFINE_KSPROPERTY_ITEM_STREAM_MASTERCLOCK(PropMasterClock, PropMasterClock),\ DEFINE_KSPROPERTY_ITEM_STREAM_PIPE_ID(PropPipeId, PropPipeId)\ } - - - - Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -23,17 +23,20 @@ #define VIDEOPRT_H #include <stdio.h> -#include <ntddk.h> + +#include <ntifs.h> +#include <ndk/exfuncs.h> +#include <ndk/halfuncs.h> +#include <ndk/inbvfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/rtlfuncs.h> + #define __BROKEN__ #include <miniport.h> #include <video.h> -#include <ntddvdeo.h> #include <ntagp.h> -#include <ntifs.h> -#include <ndk/ntndk.h> #include <dderror.h> #include <windef.h> - #include <initguid.h> #include <wdmguid.h> Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -4,25 +4,16 @@ #define _KSDDK_ #include <windows.h> -#include <mmsystem.h> #include <stdio.h> #include <math.h> #include <setupapi.h> -#include <ndk/ntndk.h> -#include <ks.h> +#include <ndk/umtypes.h> #include <ksmedia.h> #include "interface.h" - #define _2pi 6.283185307179586476925286766559 - - -#include <ks.h> - - GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO}; - const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; @@ -33,7 +24,6 @@ const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; - VOID TestKs() Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -27,7 +27,13 @@ #include <bugcodes.h> #include <ntdddisk.h> #include <arc/arc.h> -#include <ntndk.h> + +#include <ndk/asm.h> +#include <ndk/halfuncs.h> +#include <ndk/inbvfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/rtlfuncs.h> /* Internal shared PCI and ACPI header */ #include <drivers/pci/pci.h> Modified: trunk/reactos/lib/epsapi/enum/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/epsapi/enum/precomp.h?… ============================================================================== --- trunk/reactos/lib/epsapi/enum/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/epsapi/enum/precomp.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -1,6 +1,9 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/exfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> #include <epsapi/epsapi.h> Modified: trunk/reactos/lib/fslib/ntfslib/ntfslib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ntfslib/ntfslib.… ============================================================================== --- trunk/reactos/lib/fslib/ntfslib/ntfslib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ntfslib/ntfslib.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -6,5 +6,5 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/umtypes.h> #include <fmifs/fmifs.h> Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/vfatxli… ============================================================================== --- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -6,7 +6,10 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <fmifs/fmifs.h> #include <pshpack1.h> Modified: trunk/reactos/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/lsa.c?rev=53284… ============================================================================== --- trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] (original) +++ trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -9,7 +9,9 @@ /* INCLUDES ******************************************************************/ -#include <ndk/ntndk.h> +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <ndk/rtlfuncs.h> #include <psdk/ntsecapi.h> #include <lsass/lsass.h> Modified: trunk/reactos/lib/newinflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/builddep.h?r… ============================================================================== --- trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -61,7 +61,9 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> extern PVOID InfpHeap; Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=53284&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -22,7 +22,19 @@ /* PSDK/NDK Headers */ #include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/ldrfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> +#include <ndk/sefuncs.h> +#include <ndk/umfuncs.h> /* Internal RTL header */ #include "rtlp.h" Modified: trunk/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -27,7 +27,7 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS #include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> #if !defined(_MSC_VER) #include <stdint.h> Modified: trunk/reactos/lib/sdk/nt/entry_point.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/nt/entry_point.c?r… ============================================================================== --- trunk/reactos/lib/sdk/nt/entry_point.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/nt/entry_point.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -13,7 +13,8 @@ #include <stdio.h> #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> NTSTATUS __cdecl Modified: trunk/reactos/lib/smlib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/precomp.h?rev=53… ============================================================================== --- trunk/reactos/lib/smlib/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/precomp.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -12,7 +12,11 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <sm/helper.h> Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -33,7 +33,25 @@ #include <arc/arc.h> #undef NTHALAPI #define NTHALAPI __declspec(dllimport) -#include <ntndk.h> +#include <ndk/asm.h> +#include <ndk/cctypes.h> +#include <ndk/cmfuncs.h> +#include <ndk/dbgkfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/halfuncs.h> +#include <ndk/inbvfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/ldrfuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/pofuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/sefuncs.h> +#include <ndk/vftypes.h> #undef TEXT #define TEXT(s) L##s #include <regstr.h> Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -13,11 +13,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <stdio.h> -#include <wchar.h> #include "resource.h" - -#define NTOS_MODE_USER -#include <ndk/ntndk.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -4,7 +4,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <winnt.h> -#include <ndk/ntndk.h> +#include <ndk/lpctypes.h> /* CSR Header */ //#include <csr/server.h> Modified: trunk/reactos/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -11,7 +11,6 @@ #define WIN32_NO_STATUS #include <windows.h> -#include <ndk/ntndk.h> #include <api.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -9,7 +9,8 @@ #pragma once #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> #include <csrss/csrss.h> Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -2,35 +2,24 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/mmtypes.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> -#include <accctrl.h> #include <psapi.h> - -/* Our own BLUE.SYS Driver for Console Output */ -#include <blue/ntddblue.h> /* External Winlogon Header */ #include <winlogon.h> /* Internal CSRSS Headers */ -#include <api.h> #include <conio.h> #include <csrplugin.h> #include <desktopbg.h> -#include "file.h" #include "guiconsole.h" #include "tuiconsole.h" -#include <win32csr.h> /* Public Win32K Headers */ -#include <win32k/ntusrtyp.h> #include <win32k/ntuser.h> -#include <win32k/callback.h> - -#include <tchar.h> -#include <wchar.h> -#include <cpl.h> #include "resource.h" Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -19,7 +19,14 @@ #include <ntddmou.h> #include <ntifs.h> #include <tvout.h> -#include <ntndk.h> +#include <ndk/exfuncs.h> +#include <ndk/kdfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> #include <ntstrsafe.h> /* Win32 Headers */

1 0

[akhaldi] 53283: [DXG] * Include NDK headers on-demand. * Set dxg_int.h as a PCH.
by akhaldi＠svn.reactos.org 17 Aug '11

17 Aug '11

Author: akhaldi Date: Wed Aug 17 14:01:29 2011 New Revision: 53283 URL: http://svn.reactos.org/svn/reactos?rev=53283&view=rev Log: [DXG] * Include NDK headers on-demand. * Set dxg_int.h as a PCH. Modified: trunk/reactos/drivers/directx/dxg/CMakeLists.txt trunk/reactos/drivers/directx/dxg/dxg_driver.h trunk/reactos/drivers/directx/dxg/dxg_int.h trunk/reactos/drivers/directx/dxg/eng.c trunk/reactos/drivers/directx/dxg/main.c trunk/reactos/drivers/directx/dxg/tags.h Modified: trunk/reactos/drivers/directx/dxg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/CMakeL… ============================================================================== --- trunk/reactos/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] Wed Aug 17 14:01:29 2011 @@ -11,5 +11,5 @@ set_module_type(dxg kernelmodedriver) add_importlibs(dxg dxgthk ntoskrnl) - -add_cd_file(TARGET dxg DESTINATION reactos/system32/drivers FOR all) +add_pch(dxg dxg_int.h) +add_cd_file(TARGET dxg DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/directx/dxg/dxg_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_dr… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_driver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg_driver.h [iso-8859-1] Wed Aug 17 14:01:29 2011 @@ -1,4 +1,3 @@ - DRVFN gaDxgFuncs [] = { Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] Wed Aug 17 14:01:29 2011 @@ -1,9 +1,4 @@ -/* DDK/NDK/SDK Headers */ -#include <ntddk.h> -#include <ntddmou.h> #include <ntifs.h> -#include <tvout.h> -#include <ntndk.h> /* Win32 Headers */ #define WINBASEAPI @@ -12,13 +7,10 @@ #define INTERNAL_CALL NTAPI #define NT_BUILD_ENVIRONMENT -#include <stdarg.h> #include <windef.h> #include <winerror.h> #include <wingdi.h> #include <winddi.h> -#include <prntfont.h> -#include <dde.h> /* DXG treats this as opaque */ typedef PVOID PDC; @@ -109,4 +101,3 @@ #define drvDxEngUnlockDC gpEngFuncs[DXENG_INDEX_DxEngUnlockDC] #define drvDxEngUnlockHdev gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev] #define drvDxEngLockHdev gpEngFuncs[DXENG_INDEX_DxEngLockHdev] - Modified: trunk/reactos/drivers/directx/dxg/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/eng.c?… ============================================================================== --- trunk/reactos/drivers/directx/dxg/eng.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/eng.c [iso-8859-1] Wed Aug 17 14:01:29 2011 @@ -8,9 +8,7 @@ * 30/12-2007 Magnus Olsen */ - #include <dxg_int.h> - PDD_SURFACE_LOCAL NTAPI @@ -44,11 +42,3 @@ return retVal; } - - - - - - - - Modified: trunk/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/main.c… ============================================================================== --- trunk/reactos/drivers/directx/dxg/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/main.c [iso-8859-1] Wed Aug 17 14:01:29 2011 @@ -8,7 +8,6 @@ * 15/10-2007 Magnus Olsen */ - #include <dxg_int.h> #include "dxg_driver.h" @@ -18,10 +17,8 @@ PEPROCESS gpepSession = NULL; PLARGE_INTEGER gpLockShortDelay = NULL; - PDRVFN gpEngFuncs; const ULONG gcDxgFuncs = DXG_INDEX_DxDdIoctl + 1; - NTSTATUS NTAPI @@ -112,9 +109,6 @@ return STATUS_NO_MEMORY; } - - - NTSTATUS APIENTRY DxDdCleanupDxGraphics(VOID) @@ -135,4 +129,3 @@ return 0; } - Modified: trunk/reactos/drivers/directx/dxg/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/tags.h… ============================================================================== --- trunk/reactos/drivers/directx/dxg/tags.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/tags.h [iso-8859-1] Wed Aug 17 14:01:29 2011 @@ -1,8 +1,2 @@ - - - #define TAG_THDD 'ddht' #define TAG_GINI 'iniG' - - -

1 0

[akhaldi] 53282: [USETUP] * Include NDK headers on-demand. * Set usetup.h as a PCH.
by akhaldi＠svn.reactos.org 17 Aug '11

17 Aug '11

Author: akhaldi Date: Wed Aug 17 13:59:47 2011 New Revision: 53282 URL: http://svn.reactos.org/svn/reactos?rev=53282&view=rev Log: [USETUP] * Include NDK headers on-demand. * Set usetup.h as a PCH. Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt trunk/reactos/base/setup/usetup/cabinet.c trunk/reactos/base/setup/usetup/inffile.c trunk/reactos/base/setup/usetup/interface/devinst.c trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/native/fslist.c trunk/reactos/base/setup/usetup/native/host_native.h trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Wed Aug 17 13:59:47 2011 @@ -1,5 +1,6 @@ include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} ${REACTOS_SOURCE_DIR}/lib/newinflib ${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib ${REACTOS_SOURCE_DIR}/include/reactos/drivers) @@ -38,4 +39,5 @@ set_module_type(usetup nativecui) add_importlibs(usetup ntdll) +add_pch(usetup usetup.h) add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest) Modified: trunk/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Wed Aug 17 13:59:47 2011 @@ -9,7 +9,6 @@ */ #include "usetup.h" -#include <zlib.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.… ============================================================================== --- trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] Wed Aug 17 13:59:47 2011 @@ -28,10 +28,6 @@ #include "usetup.h" -#ifdef __REACTOS__ -#include <infros.h> -#endif - #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] Wed Aug 17 13:59:47 2011 @@ -10,10 +10,6 @@ #define NDEBUG #include <debug.h> - -#define INITGUID -#include <guiddef.h> -#include <libs/umpnpmgr/sysguid.h> BOOLEAN ResetDevice( Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Wed Aug 17 13:59:47 2011 @@ -25,9 +25,6 @@ */ #include "usetup.h" -#include "interface/consup.h" -#include "errorcode.h" -#include "mui.h" #include "muifonts.h" #include "muilanguages.h" Modified: trunk/reactos/base/setup/usetup/native/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/f… ============================================================================== --- trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] Wed Aug 17 13:59:47 2011 @@ -1,9 +1,4 @@ #include "usetup.h" - -/* Filesystem headers */ -#include <fslib/ext2lib.h> -#include <fslib/vfatlib.h> -#include <fslib/vfatxlib.h> BOOLEAN NATIVE_CreateFileSystemList( Modified: trunk/reactos/base/setup/usetup/native/host_native.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/h… ============================================================================== --- trunk/reactos/base/setup/usetup/native/host_native.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/host_native.h [iso-8859-1] Wed Aug 17 13:59:47 2011 @@ -2,12 +2,6 @@ #include "usetup.h" -typedef struct -{ - PWCHAR Source; - PWCHAR Target; -} *PFILEPATHS_W; - #define SetupInitDefaultQueueCallback(a) NULL #define SetupDefaultQueueCallbackW(a, b, c, d) TRUE #define SetupTermDefaultQueueCallback(a) Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Wed Aug 17 13:59:47 2011 @@ -24,8 +24,6 @@ * PROGRAMMER: Eric Kohl */ -#pragma once - /* C Headers */ #include <ctype.h> #include <stdio.h> @@ -35,11 +33,21 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/mmtypes.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> #include <fmifs/fmifs.h> -/* VFAT */ +/* Filesystem headers */ +#include <fslib/ext2lib.h> #include <fslib/vfatlib.h> +#include <fslib/vfatxlib.h> /* DDK Disk Headers */ #include <ntddscsi.h> @@ -50,11 +58,11 @@ /* Internal Headers */ #include "interface/consup.h" #include "partlist.h" -#include "infros.h" #include "inffile.h" #include "inicache.h" #include "progress.h" #ifdef __REACTOS__ +#include "infros.h" #include "filequeue.h" #endif #include "bootsup.h" @@ -70,6 +78,12 @@ #include "host.h" #include "mui.h" #include "errorcode.h" + +#define INITGUID +#include <guiddef.h> +#include <libs/umpnpmgr/sysguid.h> + +#include <zlib.h> extern HANDLE ProcessHeap; extern UNICODE_STRING SourceRootPath; @@ -108,6 +122,8 @@ #endif /* __REACTOS__ */ +#ifndef _PAGE_NUMBER_DEFINED +#define _PAGE_NUMBER_DEFINED typedef enum _PAGE_NUMBER { START_PAGE, @@ -148,6 +164,7 @@ FLUSH_PAGE, REBOOT_PAGE, /* virtual page */ } PAGE_NUMBER, *PPAGE_NUMBER; +#endif #define POPUP_WAIT_NONE 0 #define POPUP_WAIT_ANY_KEY 1

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011