mirror of
https://github.com/reactos/reactos.git
synced 2025-06-10 20:34:59 +00:00
Build kernel32, ntdll, csrss fully with NDK and remove ntdll header usage
svn path=/trunk/; revision=16205
This commit is contained in:
parent
e3cfe86657
commit
3596d2a339
7 changed files with 20 additions and 23 deletions
|
@ -25,9 +25,6 @@
|
||||||
#ifndef __EPSAPI_H_INCLUDED__
|
#ifndef __EPSAPI_H_INCLUDED__
|
||||||
#define __EPSAPI_H_INCLUDED__
|
#define __EPSAPI_H_INCLUDED__
|
||||||
|
|
||||||
/* Remove soon */
|
|
||||||
#include <ntdll/ldr.h>
|
|
||||||
|
|
||||||
/* TYPES */
|
/* TYPES */
|
||||||
typedef NTSTATUS (NTAPI *PPROC_ENUM_ROUTINE)(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess,
|
typedef NTSTATUS (NTAPI *PPROC_ENUM_ROUTINE)(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess,
|
||||||
IN OUT PVOID CallbackContext);
|
IN OUT PVOID CallbackContext);
|
||||||
|
|
|
@ -43,7 +43,6 @@ typedef struct _PEB_LDR_DATA
|
||||||
PVOID EntryInProgress;
|
PVOID EntryInProgress;
|
||||||
} PEB_LDR_DATA, *PPEB_LDR_DATA;
|
} PEB_LDR_DATA, *PPEB_LDR_DATA;
|
||||||
|
|
||||||
#if 0
|
|
||||||
typedef struct _LDR_DATA_TABLE_ENTRY
|
typedef struct _LDR_DATA_TABLE_ENTRY
|
||||||
{
|
{
|
||||||
LIST_ENTRY InLoadOrderModuleList;
|
LIST_ENTRY InLoadOrderModuleList;
|
||||||
|
@ -55,16 +54,20 @@ typedef struct _LDR_DATA_TABLE_ENTRY
|
||||||
UNICODE_STRING FullDllName;
|
UNICODE_STRING FullDllName;
|
||||||
UNICODE_STRING BaseDllName;
|
UNICODE_STRING BaseDllName;
|
||||||
ULONG Flags;
|
ULONG Flags;
|
||||||
SHORT LoadCount; /* FIXME: HACK!!! FIX ASAP */
|
USHORT LoadCount; /* FIXME: HACK!!! FIX ASAP */
|
||||||
SHORT TlsIndex; /* FIXME: HACK!!! FIX ASAP */
|
USHORT TlsIndex; /* FIXME: HACK!!! FIX ASAP */
|
||||||
LIST_ENTRY HashLinks;
|
LIST_ENTRY HashLinks;
|
||||||
PVOID SectionPointer;
|
PVOID SectionPointer;
|
||||||
ULONG CheckSum;
|
ULONG CheckSum;
|
||||||
ULONG TimeDateStamp;
|
ULONG TimeDateStamp;
|
||||||
PVOID LoadedImports;
|
PVOID LoadedImports;
|
||||||
PVOID EntryPointActivationContext;
|
PVOID EntryPointActivationContext;
|
||||||
|
PVOID PatchInformation;
|
||||||
|
#if defined(DBG) || defined(KDBG)
|
||||||
|
/* FIXME: THIS _REALLY_ NEEDS TO GO SOMEWHERE ELSE */
|
||||||
|
PVOID RosSymInfo;
|
||||||
|
#endif /* KDBG */
|
||||||
} LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY;
|
} LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY;
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct _LDR_RESOURCE_INFO
|
typedef struct _LDR_RESOURCE_INFO
|
||||||
{
|
{
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
/* DEPENDENCIES **************************************************************/
|
/* DEPENDENCIES **************************************************************/
|
||||||
#include "ldrtypes.h"
|
#include "ldrtypes.h"
|
||||||
#include "lpctypes.h"
|
#include "lpctypes.h"
|
||||||
|
#include "rtltypes.h"
|
||||||
#include <csrss/csrss.h> /* FIXME: Temporary */
|
#include <csrss/csrss.h> /* FIXME: Temporary */
|
||||||
|
|
||||||
/* PROTOTYPES ****************************************************************/
|
/* PROTOTYPES ****************************************************************/
|
||||||
|
@ -193,6 +194,14 @@ LdrQueryImageFileExecutionOptions(
|
||||||
OUT PULONG RetunedLength OPTIONAL
|
OUT PULONG RetunedLength OPTIONAL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
NTSTATUS
|
||||||
|
STDCALL
|
||||||
|
LdrQueryProcessModuleInformation(
|
||||||
|
IN PMODULE_INFORMATION ModuleInformation OPTIONAL,
|
||||||
|
IN ULONG Size OPTIONAL,
|
||||||
|
OUT PULONG ReturnedSize
|
||||||
|
);
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
STDCALL
|
STDCALL
|
||||||
LdrShutdownProcess(VOID);
|
LdrShutdownProcess(VOID);
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
/* PSDK/NDK Headers */
|
/* PSDK/NDK Headers */
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#define NTOS_MODE_USER
|
#define NTOS_MODE_USER
|
||||||
|
#define READY_FOR_NEW_NTDLL
|
||||||
#include <ndk/ntndk.h>
|
#include <ndk/ntndk.h>
|
||||||
|
|
||||||
/* C Headers */
|
/* C Headers */
|
||||||
|
@ -21,12 +22,6 @@
|
||||||
#include <ddk/ntddser.h>
|
#include <ddk/ntddser.h>
|
||||||
#include <ddk/ntddtape.h>
|
#include <ddk/ntddtape.h>
|
||||||
|
|
||||||
/* FIXME: Clean this sh*t up */
|
|
||||||
#include <ntdll/base.h>
|
|
||||||
#include <ntdll/dbg.h>
|
|
||||||
#include <ntdll/csr.h>
|
|
||||||
#include <ntdll/ldr.h>
|
|
||||||
|
|
||||||
/* Internal Kernel32 Header */
|
/* Internal Kernel32 Header */
|
||||||
#include "include/kernel32.h"
|
#include "include/kernel32.h"
|
||||||
|
|
||||||
|
|
|
@ -11,13 +11,9 @@
|
||||||
/* SDK/DDK/NDK Headers. */
|
/* SDK/DDK/NDK Headers. */
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#define NTOS_MODE_USER
|
#define NTOS_MODE_USER
|
||||||
|
#define READY_FOR_NEW_NTDLL
|
||||||
#include <ndk/ntndk.h>
|
#include <ndk/ntndk.h>
|
||||||
|
|
||||||
/* NTDLL Headers FIXME: These will be gone imminently */
|
|
||||||
#include <ntdll/ntdll.h>
|
|
||||||
#include <ntdll/ldr.h>
|
|
||||||
#include <ntdll/csr.h>
|
|
||||||
|
|
||||||
/* Internal NTDLL */
|
/* Internal NTDLL */
|
||||||
#include "ntdllp.h"
|
#include "ntdllp.h"
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
/* FIXME: Cleanup this mess */
|
/* FIXME: Cleanup this mess */
|
||||||
//typedef NTSTATUS (STDCALL *PEPFUNC)(PPEB);
|
typedef NTSTATUS (STDCALL *PEPFUNC)(PPEB);
|
||||||
NTSTATUS LdrMapSections(HANDLE ProcessHandle,
|
NTSTATUS LdrMapSections(HANDLE ProcessHandle,
|
||||||
PVOID ImageBase,
|
PVOID ImageBase,
|
||||||
HANDLE SectionHandle,
|
HANDLE SectionHandle,
|
||||||
|
@ -23,12 +23,10 @@ PEPFUNC LdrPEStartup (PVOID ImageBase,
|
||||||
HANDLE SectionHandle,
|
HANDLE SectionHandle,
|
||||||
PLDR_DATA_TABLE_ENTRY* Module,
|
PLDR_DATA_TABLE_ENTRY* Module,
|
||||||
PWSTR FullDosName);
|
PWSTR FullDosName);
|
||||||
#if 0
|
|
||||||
typedef BOOL
|
typedef BOOL
|
||||||
(STDCALL *PDLLMAIN_FUNC)(HANDLE hInst,
|
(STDCALL *PDLLMAIN_FUNC)(HANDLE hInst,
|
||||||
ULONG ul_reason_for_call,
|
ULONG ul_reason_for_call,
|
||||||
LPVOID lpReserved);
|
LPVOID lpReserved);
|
||||||
#endif
|
|
||||||
VOID
|
VOID
|
||||||
STDCALL
|
STDCALL
|
||||||
RtlpInitDeferedCriticalSection(
|
RtlpInitDeferedCriticalSection(
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#define NTOS_MODE_USER
|
#define NTOS_MODE_USER
|
||||||
|
#define READY_FOR_NEW_NTDLL
|
||||||
#include <ndk/ntndk.h>
|
#include <ndk/ntndk.h>
|
||||||
#include <ntdll/csr.h>
|
|
||||||
#include <ntdll/ldr.h>
|
|
||||||
#include <rosrtl/string.h>
|
#include <rosrtl/string.h>
|
||||||
#include <sm/helper.h>
|
#include <sm/helper.h>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue