Remove some non-__USE_W32API guarded blocks. Modified: trunk/reactos/include/ddk/ddrawi.h Modified: trunk/reactos/include/napi/shared_data.h Modified: trunk/reactos/include/napi/teb.h Modified: trunk/reactos/include/napi/types.h Modified: trunk/reactos/include/ntdll/rtl.h Modified: trunk/reactos/include/win32k/dc.h _____
Modified: trunk/reactos/include/ddk/ddrawi.h --- trunk/reactos/include/ddk/ddrawi.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/ddk/ddrawi.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -616,9 +616,6 @@
/*********************************************************************** ****** * high-level ddraw implementation structures */ -#ifndef __USE_W32API -typedef DWORD IUnknown; /* FIXME: implement proper definition */ -#endif typedef struct _IUNKNOWN_LIST { struct _IUNKNOWN_LIST * lpLink; LPGUID lpGuid; _____
Modified: trunk/reactos/include/napi/shared_data.h --- trunk/reactos/include/napi/shared_data.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/napi/shared_data.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -13,69 +13,6 @@
#define PF_PAE_ENABLED 9 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
-#ifndef __USE_W32API - -#ifndef __ASM__ - -typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE -{ - StandardDesign, - NEC98x86, - EndAlternatives -} ALTERNATIVE_ARCHITECTURE_TYPE; - -typedef struct _KSYSTEM_TIME -{ - ULONG LowPart; - LONG High1Time; - LONG High2Time; -} KSYSTEM_TIME, *PKSYSTEM_TIME; - -#define PROCESSOR_FEATURE_MAX 64 -typedef struct _KUSER_SHARED_DATA { - ULONG TickCountLowDeprecated; - ULONG TickCountMultiplier; - volatile KSYSTEM_TIME InterruptTime; - volatile KSYSTEM_TIME SystemTime; - volatile KSYSTEM_TIME TimeZoneBias; - USHORT ImageNumberLow; - USHORT ImageNumberHigh; - WCHAR NtSystemRoot[260]; - ULONG MaxStackTraceDepth; - ULONG CryptoExponent; - ULONG TimeZoneId; - ULONG LargePageMinimum; - ULONG Reserved2[7]; - NT_PRODUCT_TYPE NtProductType; - BOOLEAN ProductTypeIsValid; - ULONG NtMajorVersion; - ULONG NtMinorVersion; - BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; - ULONG Reserved1; - ULONG Reserved3; - volatile ULONG TimeSlip; - ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; - LARGE_INTEGER SystemExpirationDate; - ULONG SuiteMask; - BOOLEAN KdDebuggerEnabled; - volatile ULONG ActiveConsoleId; - volatile ULONG DismountCount; - ULONG ComPlusPackage; - ULONG LastSystemRITEventTickCount; - ULONG NumberOfPhysicalPages; - BOOLEAN SafeBootMode; - ULONG TraceLogging; - ULONGLONG Fill0; - UCHAR SystemCall[16]; - union { - volatile KSYSTEM_TIME TickCount; - volatile ULONG64 TickCountQuad; - }; -} KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; - -#endif -#endif - /* Values for DosDeviceDriveType */ #define DOSDEVICE_DRIVE_UNKNOWN 0 #define DOSDEVICE_DRIVE_CALCULATE 1 @@ -85,21 +22,10 @@ #define DOSDEVICE_DRIVE_CDROM 5 #define DOSDEVICE_DRIVE_RAMDISK 6
-/* Values for TimeZoneId */ -#ifndef __USE_W32API -#define TIME_ZONE_ID_INVALID ((ULONG) -1) -#define TIME_ZONE_ID_UNKNOWN (0) -#define TIME_ZONE_ID_STANDARD (1) -#define TIME_ZONE_ID_DAYLIGHT (2) -#endif - #define KERNEL_SHARED_DATA (0xFFDF0000) #define USER_SHARED_DATA (0x7FFE0000)
#if defined(__NTOSKRNL__) || defined(__NTDRIVER__) || defined(__NTHAL__) -#ifndef __USE_W32API -#define KI_USER_SHARED_DATA (0xFFDF0000) -#endif #ifdef SharedUserData #undef SharedUserData #endif _____
Modified: trunk/reactos/include/napi/teb.h --- trunk/reactos/include/napi/teb.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/napi/teb.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -9,60 +9,6 @@
#include <ddk/ntapi.h> #endif /* !__USE_W32API */
-#ifndef __USE_W32API - -typedef struct _CLIENT_ID -{ - HANDLE UniqueProcess; - HANDLE UniqueThread; -} CLIENT_ID, *PCLIENT_ID; - -typedef struct _RTL_USER_PROCESS_PARAMETERS { - ULONG AllocationSize; - ULONG Size; - ULONG Flags; - ULONG DebugFlags; - HANDLE hConsole; - ULONG ProcessGroup; - HANDLE hStdInput; - HANDLE hStdOutput; - HANDLE hStdError; - UNICODE_STRING CurrentDirectoryName; - HANDLE CurrentDirectoryHandle; - UNICODE_STRING DllPath; - UNICODE_STRING ImagePathName; - UNICODE_STRING CommandLine; - PWSTR Environment; - ULONG dwX; - ULONG dwY; - ULONG dwXSize; - ULONG dwYSize; - ULONG dwXCountChars; - ULONG dwYCountChars; - ULONG dwFillAttribute; - ULONG dwFlags; - ULONG wShowWindow; - UNICODE_STRING WindowTitle; - UNICODE_STRING DesktopInfo; - UNICODE_STRING ShellInfo; - UNICODE_STRING RuntimeInfo; -} RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; - -typedef struct _NT_TIB { - struct _EXCEPTION_REGISTRATION_RECORD* ExceptionList; /* 00h */ - PVOID StackBase; /* 04h */ - PVOID StackLimit; /* 08h */ - PVOID SubSystemTib; /* 0Ch */ - union { - PVOID FiberData; /* 10h */ - ULONG Version; /* 10h */ - }; - PVOID ArbitraryUserPointer; /* 14h */ - struct _NT_TIB *Self; /* 18h */ -} NT_TIB, *PNT_TIB; - -#endif /* !__USE_W32API */ - typedef struct _CURDIR { UNICODE_STRING DosPath; @@ -162,12 +108,6 @@ UNICODE_STRING CSDVersion; /* 1DCh */ } PEB;
-#ifndef __USE_W32API - -typedef PEB *PPEB; - -#endif /* !__USE_W32API */ - typedef struct _GDI_TEB_BATCH { ULONG Offset; @@ -239,66 +179,6 @@ PVOID WineDebugInfo; /* Needed for WINE DLL's */ } TEB, *PTEB;
-#if (!defined(__USE_W32API) || __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5) - -/* FIXME: at least NtCurrentTeb should be defined in winnt.h */ - -#ifndef NtCurrentTeb - -#if defined(_M_IX86) -/* on the x86, the TEB is contained in the FS segment */ -static inline struct _TEB * NtCurrentTeb(void) -{ - struct _TEB * pTeb; - -#if defined(__GNUC__) - /* FIXME: instead of hardcoded offsets, use offsetof() - if possible */ - __asm__ __volatile__ - ( - "movl %%fs:0x18, %0\n" /* fs:18h == Teb->Tib.Self */ - : "=r" (pTeb) /* can't have two memory operands */ - : /* no inputs */ - ); -#elif defined(_MSC_VER) - __asm mov eax, fs:0x18 - __asm mov pTeb, eax -#else -#error Unknown compiler for inline assembler -#endif - - return pTeb; -} -#define NtCurrentTeb NtCurrentTeb - -#elif defined(_M_ALPHA) - -void * __rdteb(void); -#pragma intrinsic(__rdteb) - -/* on the Alpha AXP, we call the rdteb PAL to retrieve the address of the TEB */ -#define NtCurrentTeb() ((struct _TEB *)__rdteb()) - -#elif defined(_M_MIPS) - -/* on the MIPS R4000, the TEB is loaded at a fixed address */ -#define NtCurrentTeb() ((struct _TEB *)0x7FFFF4A8) - -#elif defined(_M_PPC) - -unsigned __gregister_get(unsigned const regnum); -#pragma intrinsic(__gregister_get) - -/* on the PowerPC, the TEB is pointed to by GPR 13 */ -#define NtCurrentTeb() ((struct _TEB *)__gregister_get(13)) - -#else -struct _TEB * NtCurrentTeb(void); -#endif - -#endif - -#endif /* !defined(__USE_W32API) || __W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5 */ - #ifdef _M_IX86
static inline struct _PEB * NtCurrentPeb(void) _____
Modified: trunk/reactos/include/napi/types.h --- trunk/reactos/include/napi/types.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/napi/types.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -3,17 +3,6 @@
/* these should be moved to a file like ntdef.h */
-#ifndef __USE_W32API -enum -{ - DIRECTORY_QUERY, - DIRECTORY_TRAVERSE, - DIRECTORY_CREATE_OBJECT, - DIRECTORY_CREATE_SUBDIRECTORY, - DIRECTORY_ALL_ACCESS, -}; - - /* * General type for status information */ @@ -27,63 +16,4 @@ #endif typedef ULARGE_INTEGER TIME, *PTIME;
-#ifndef __USE_W32API - -typedef const int CINT; -typedef LONG NTSTATUS, *PNTSTATUS; -typedef ULONG DEVICE_TYPE; - -/* File information for IRP_MJ_QUERY_INFORMATION (and SET) */ -typedef enum _FILE_INFORMATION_CLASS -{ - FileDirectoryInformation = 1, - FileFullDirectoryInformation, - FileBothDirectoryInformation, - FileBasicInformation, - FileStandardInformation, - FileInternalInformation, - FileEaInformation, - FileAccessInformation, - FileNameInformation, - FileRenameInformation, - FileLinkInformation, - FileNamesInformation, - FileDispositionInformation, - FilePositionInformation, - FileFullEaInformation, - FileModeInformation, - FileAlignmentInformation, - FileAllInformation, - FileAllocationInformation, - FileEndOfFileInformation, - FileAlternateNameInformation, - FileStreamInformation, - FilePipeInformation, - FilePipeLocalInformation, - FilePipeRemoteInformation, - FileMailslotQueryInformation, - FileMailslotSetInformation, - FileCompressionInformation, - FileObjectIdInformation, - FileCompletionInformation, - FileMoveClusterInformation, - FileQuotaInformation, - FileReparsePointInformation, - FileNetworkOpenInformation, - FileAttributeTagInformation, - FileTrackingInformation, - FileIdBothDirectoryInformation, - FileIdFullDirectoryInformation, - FileValidDataLengthInformation, - FileShortNameInformation, - FileMaximumInformation -} FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; - -typedef enum _SECTION_INHERIT { - ViewShare = 1, - ViewUnmap = 2 -} SECTION_INHERIT; - -#endif /* !__USE_W32API */ - #endif /* __INCLUDE_NAPI_TYPES_H */ _____
Modified: trunk/reactos/include/ntdll/rtl.h --- trunk/reactos/include/ntdll/rtl.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/ntdll/rtl.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -108,39 +108,6 @@
#endif
-#ifndef __USE_W32API -typedef struct _CRITICAL_SECTION_DEBUG -{ - USHORT Type; - USHORT CreatorBackTraceIndex; - struct _CRITICAL_SECTION *CriticalSection; - LIST_ENTRY ProcessLocksList; - ULONG EntryCount; - ULONG ContentionCount; - PVOID Spare[2]; -} CRITICAL_SECTION_DEBUG, *PCRITICAL_SECTION_DEBUG; - - -typedef struct _CRITICAL_SECTION -{ - PCRITICAL_SECTION_DEBUG DebugInfo; - LONG LockCount; - LONG RecursionCount; - HANDLE OwningThread; - HANDLE LockSemaphore; - ULONG_PTR SpinCount; -} CRITICAL_SECTION, *PCRITICAL_SECTION, *LPCRITICAL_SECTION; - -#define RTL_CRITSECT_TYPE 0 - -typedef CRITICAL_SECTION RTL_CRITICAL_SECTION; -typedef PCRITICAL_SECTION PRTL_CRITICAL_SECTION; -typedef LPCRITICAL_SECTION LPRTL_CRITICAL_SECTION; -typedef CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG; -typedef PCRITICAL_SECTION_DEBUG PRTL_CRITICAL_SECTION_DEBUG; - -#endif /* !__USE_W32API */ - #ifndef _NTNDK_ typedef struct _RTL_PROCESS_INFO { @@ -747,11 +714,7 @@
/* Timer Queue functions */
-#ifdef __USE_W32API #include <winnt.h> -#else /* __USE_W32API */ -typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); -#endif /* __USE_W32API */
NTSTATUS STDCALL _____
Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-06-20 22:19:18 UTC (rev 16193) +++ trunk/reactos/include/win32k/dc.h 2005-06-20 22:48:50 UTC (rev 16194) @@ -189,11 +189,6 @@
INT cbInput, LPCSTR lpszInData);
-#ifndef __USE_W32API -/* FIXME: this typedef should go somewhere else... */ -typedef VOID (*GOBJENUMPROC)(PVOID, LPARAM); -#endif - INT STDCALL NtGdiEnumObjects(HDC hDC, INT ObjectType, GOBJENUMPROC ObjectFunc,
-
navaraf＠svn.reactos.com