Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 73293 invoked from network); 18 Apr 2009 09:25:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Apr 2009 09:25:10 -0000 Received: (qmail 69489 invoked by uid 500); 18 Apr 2009 09:25:09 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 69394 invoked by uid 500); 18 Apr 2009 09:25:09 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 69385 invoked by uid 99); 18 Apr 2009 09:25:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Apr 2009 09:25:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Apr 2009 09:24:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BA7CD2388A04; Sat, 18 Apr 2009 09:24:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r766277 - /commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h Date: Sat, 18 Apr 2009 09:24:38 -0000 To: commits@commons.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090418092438.BA7CD2388A04@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mturk Date: Sat Apr 18 09:24:38 2009 New Revision: 766277 URL: http://svn.apache.org/viewvc?rev=766277&view=rev Log: Prefix PEB and RTL structs with ACR Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h?rev=766277&r1=766276&r2=766277&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h (original) +++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h Sat Apr 18 09:24:38 2009 @@ -50,38 +50,51 @@ #endif /* NTDDI_VISTA */ -/* Missing POSIX declarations */ +/* + * --------------------------------------------------------------------- + * begin of POSIX utilities + * --------------------------------------------------------------------- + */ struct iovec { void *iov_base; /* Starting address */ size_t iov_len; /* Number of bytes */ }; +/* + * --------------------------------------------------------------------- + * end of POSIX utilities + * --------------------------------------------------------------------- + */ -/* End of POSIX */ - -/* Copied from http://source.winehq.org/source/include/winternl.h */ +/* + * --------------------------------------------------------------------- + * begin of PEB declarations + * Copied from http://source.winehq.org + * and renamed RTL with ACR + * --------------------------------------------------------------------- + */ -typedef struct _CURDIR +typedef struct _ACR_CURDIR { UNICODE_STRING DosPath; PVOID Handle; -} CURDIR, *PCURDIR; +} ACR_CURDIR, *PACR_CURDIR; -typedef struct RTL_DRIVE_LETTER_CURDIR +typedef struct ACR_DRIVE_LETTER_CURDIR { USHORT Flags; USHORT Length; ULONG TimeStamp; UNICODE_STRING DosPath; -} RTL_DRIVE_LETTER_CURDIR, *PRTL_DRIVE_LETTER_CURDIR; +} ACR_DRIVE_LETTER_CURDIR, *PACR_DRIVE_LETTER_CURDIR; -typedef struct tagRTL_BITMAP { +typedef struct tagACR_BITMAP { ULONG SizeOfBitMap; /* Number of bits in the bitmap */ PULONG Buffer; /* Bitmap data, assumed sized to a DWORD boundary */ -} RTL_BITMAP, *PRTL_BITMAP; +} ACR_BITMAP, *PACR_BITMAP; -typedef struct _RTL_USER_PROCESS_PARAMETERS +typedef struct _ACR_USER_PROCESS_PARAMETERS { ULONG AllocationSize; ULONG Size; @@ -92,7 +105,7 @@ HANDLE hStdInput; HANDLE hStdOutput; HANDLE hStdError; - CURDIR CurrentDirectory; + ACR_CURDIR CurrentDirectory; UNICODE_STRING DllPath; UNICODE_STRING ImagePathName; UNICODE_STRING CommandLine; @@ -110,10 +123,10 @@ UNICODE_STRING Desktop; UNICODE_STRING ShellInfo; UNICODE_STRING RuntimeInfo; - RTL_DRIVE_LETTER_CURDIR DLCurrentDirectory[0x20]; -} RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; + ACR_DRIVE_LETTER_CURDIR DLCurrentDirectory[0x20]; +} ACR_USER_PROCESS_PARAMETERS, *PACR_USER_PROCESS_PARAMETERS; -typedef struct _PEB_LDR_DATA +typedef struct _APEB_LDR_DATA { ULONG Length; BOOLEAN Initialized; @@ -121,70 +134,89 @@ LIST_ENTRY InLoadOrderModuleList; LIST_ENTRY InMemoryOrderModuleList; LIST_ENTRY InInitializationOrderModuleList; -} PEB_LDR_DATA, *PPEB_LDR_DATA; +} APEB_LDR_DATA, *PAPEB_LDR_DATA; /*********************************************************************** - * PEB data structure (472 bytes) + * PEB data structure */ typedef struct _ACR_PEB -{ - BOOLEAN InheritedAddressSpace; /* 00 */ - BOOLEAN ReadImageFileExecOptions; /* 01 */ - BOOLEAN BeingDebugged; /* 02 */ - BOOLEAN SpareBool; /* 03 */ - HANDLE Mutant; /* 04 */ - HMODULE ImageBaseAddress; /* 08 */ - PPEB_LDR_DATA LdrData; /* 0c */ - RTL_USER_PROCESS_PARAMETERS *ProcessParameters; /* 10 */ - PVOID SubSystemData; /* 14 */ - HANDLE ProcessHeap; /* 18 */ - PRTL_CRITICAL_SECTION FastPebLock; /* 1c */ - PVOID /*PPEBLOCKROUTINE*/ FastPebLockRoutine; /* 20 */ - PVOID /*PPEBLOCKROUTINE*/ FastPebUnlockRoutine; /* 24 */ - ULONG EnvironmentUpdateCount; /* 28 */ - PVOID KernelCallbackTable; /* 2c */ - PVOID EventLogSection; /* 30 */ - PVOID EventLog; /* 34 */ - PVOID /*PPEB_FREE_BLOCK*/ FreeList; /* 38 */ - ULONG TlsExpansionCounter; /* 3c */ - PRTL_BITMAP TlsBitmap; /* 40 */ - ULONG TlsBitmapBits[2]; /* 44 */ - PVOID ReadOnlySharedMemoryBase; /* 4c */ - PVOID ReadOnlySharedMemoryHeap; /* 50 */ - PVOID *ReadOnlyStaticServerData; /* 54 */ - PVOID AnsiCodePageData; /* 58 */ - PVOID OemCodePageData; /* 5c */ - PVOID UnicodeCaseTableData; /* 60 */ - ULONG NumberOfProcessors; /* 64 */ - ULONG NtGlobalFlag; /* 68 */ - BYTE Spare2[4]; /* 6c */ - LARGE_INTEGER CriticalSectionTimeout; /* 70 */ - ULONG HeapSegmentReserve; /* 78 */ - ULONG HeapSegmentCommit; /* 7c */ - ULONG HeapDeCommitTotalFreeThreshold; /* 80 */ - ULONG HeapDeCommitFreeBlockThreshold; /* 84 */ - ULONG NumberOfHeaps; /* 88 */ - ULONG MaximumNumberOfHeaps; /* 8c */ - PVOID *ProcessHeaps; /* 90 */ - PVOID GdiSharedHandleTable; /* 94 */ - PVOID ProcessStarterHelper; /* 98 */ - PVOID GdiDCAttributeList; /* 9c */ - PVOID LoaderLock; /* a0 */ - ULONG OSMajorVersion; /* a4 */ - ULONG OSMinorVersion; /* a8 */ - ULONG OSBuildNumber; /* ac */ - ULONG OSPlatformId; /* b0 */ - ULONG ImageSubSystem; /* b4 */ - ULONG ImageSubSystemMajorVersion; /* b8 */ - ULONG ImageSubSystemMinorVersion; /* bc */ - ULONG ImageProcessAffinityMask; /* c0 */ - ULONG GdiHandleBuffer[34]; /* c4 */ - ULONG PostProcessInitRoutine; /* 14c */ - PRTL_BITMAP TlsExpansionBitmap; /* 150 */ - ULONG TlsExpansionBitmapBits[32]; /* 154 */ - ULONG SessionId; /* 1d4 */ +{ /* win32/win64 */ + BOOLEAN InheritedAddressSpace; /* 000/000 */ + BOOLEAN ReadImageFileExecOptions; /* 001/001 */ + BOOLEAN BeingDebugged; /* 002/002 */ + BOOLEAN SpareBool; /* 003/003 */ + HANDLE Mutant; /* 004/008 */ + HMODULE ImageBaseAddress; /* 008/010 */ + PAPEB_LDR_DATA LdrData; /* 00c/018 */ + ACR_USER_PROCESS_PARAMETERS *ProcessParameters; /* 010/020 */ + PVOID SubSystemData; /* 014/028 */ + HANDLE ProcessHeap; /* 018/030 */ + PRTL_CRITICAL_SECTION FastPebLock; /* 01c/038 */ + PVOID /*PPEBLOCKROUTINE*/ FastPebLockRoutine; /* 020/040 */ + PVOID /*PPEBLOCKROUTINE*/ FastPebUnlockRoutine; /* 024/048 */ + ULONG EnvironmentUpdateCount; /* 028/050 */ + PVOID KernelCallbackTable; /* 02c/058 */ + ULONG Reserved[2]; /* 030/060 */ + PVOID /*PPEB_FREE_BLOCK*/ FreeList; /* 038/068 */ + ULONG TlsExpansionCounter; /* 03c/070 */ + PACR_BITMAP TlsBitmap; /* 040/078 */ + ULONG TlsBitmapBits[2]; /* 044/080 */ + PVOID ReadOnlySharedMemoryBase; /* 04c/088 */ + PVOID ReadOnlySharedMemoryHeap; /* 050/090 */ + PVOID *ReadOnlyStaticServerData; /* 054/098 */ + PVOID AnsiCodePageData; /* 058/0a0 */ + PVOID OemCodePageData; /* 05c/0a8 */ + PVOID UnicodeCaseTableData; /* 060/0b0 */ + ULONG NumberOfProcessors; /* 064/0b8 */ + ULONG NtGlobalFlag; /* 068/0bc */ + LARGE_INTEGER CriticalSectionTimeout; /* 070/0c0 */ + SIZE_T HeapSegmentReserve; /* 078/0c8 */ + SIZE_T HeapSegmentCommit; /* 07c/0d0 */ + SIZE_T HeapDeCommitTotalFreeThreshold; /* 080/0d8 */ + SIZE_T HeapDeCommitFreeBlockThreshold; /* 084/0e0 */ + ULONG NumberOfHeaps; /* 088/0e8 */ + ULONG MaximumNumberOfHeaps; /* 08c/0ec */ + PVOID *ProcessHeaps; /* 090/0f0 */ + PVOID GdiSharedHandleTable; /* 094/0f8 */ + PVOID ProcessStarterHelper; /* 098/100 */ + PVOID GdiDCAttributeList; /* 09c/108 */ + PVOID LoaderLock; /* 0a0/110 */ + ULONG OSMajorVersion; /* 0a4/118 */ + ULONG OSMinorVersion; /* 0a8/11c */ + ULONG OSBuildNumber; /* 0ac/120 */ + ULONG OSPlatformId; /* 0b0/124 */ + ULONG ImageSubSystem; /* 0b4/128 */ + ULONG ImageSubSystemMajorVersion; /* 0b8/12c */ + ULONG ImageSubSystemMinorVersion; /* 0bc/130 */ + ULONG ImageProcessAffinityMask; /* 0c0/134 */ + HANDLE GdiHandleBuffer[28]; /* 0c4/138 */ + ULONG unknown[6]; /* 134/218 */ + PVOID PostProcessInitRoutine; /* 14c/230 */ + PACR_BITMAP TlsExpansionBitmap; /* 150/238 */ + ULONG TlsExpansionBitmapBits[32]; /* 154/240 */ + ULONG SessionId; /* 1d4/2c0 */ + ULARGE_INTEGER AppCompatFlags; /* 1d8/2c8 */ + ULARGE_INTEGER AppCompatFlagsUser; /* 1e0/2d0 */ + PVOID ShimData; /* 1e8/2d8 */ + PVOID AppCompatInfo; /* 1ec/2e0 */ + UNICODE_STRING CSDVersion; /* 1f0/2e8 */ + PVOID ActivationContextData; /* 1f8/2f8 */ + PVOID ProcessAssemblyStorageMap; /* 1fc/300 */ + PVOID SystemDefaultActivationData; /* 200/308 */ + PVOID SystemAssemblyStorageMap; /* 204/310 */ + SIZE_T MinimumStackCommit; /* 208/318 */ + PVOID *FlsCallback; /* 20c/320 */ + LIST_ENTRY FlsListHead; /* 210/328 */ + PACR_BITMAP FlsBitmap; /* 218/338 */ + ULONG FlsBitmapBits[4]; /* 21c/340 */ } ACR_PEB, *PACR_PEB; +/* + * --------------------------------------------------------------------- + * end of PEB declarations + * --------------------------------------------------------------------- + */ + #ifdef __cplusplus extern "C" { #endif