- Remove RosSymInfo hack from LDR_DATA_TABLE_ENTRY and use PatchInformation instead...

[reactos.git] / reactos / include / ndk / ldrtypes.h

diff --git a/reactos/include/ndk/ldrtypes.h b/reactos/include/ndk/ldrtypes.h
index 260f83e..5f74d5d 100644 (file)
--- a/reactos/include/ndk/ldrtypes.h
+++ b/reactos/include/ndk/ldrtypes.h
@@ -19,19 +19,26 @@
 #define RESOURCE_LANGUAGE_LEVEL  2
 #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
+/* LDR_DATA_TABLE_ENTRY Flags */
+#define LDRP_STATIC_LINK                  0x00000002
+#define LDRP_IMAGE_DLL                    0x00000004
+#define LDRP_LOAD_IN_PROGRESS             0x00001000
+#define LDRP_UNLOAD_IN_PROGRESS           0x00002000
+#define LDRP_ENTRY_PROCESSED              0x00004000
+#define LDRP_ENTRY_INSERTED               0x00008000
+#define LDRP_CURRENT_LOAD                 0x00010000
+#define LDRP_FAILED_BUILTIN_LOAD          0x00020000
+#define LDRP_DONT_CALL_FOR_THREADS        0x00040000
+#define LDRP_PROCESS_ATTACH_CALLED        0x00080000
+#define LDRP_DEBUG_SYMBOLS_LOADED         0x00100000
+#define LDRP_IMAGE_NOT_AT_BASE            0x00200000
+#define LDRP_COR_IMAGE                    0x00400000
+#define LDR_COR_OWNS_UNMAP                0x00800000
+#define LDRP_REDIRECTED                   0x10000000
 
 /* ENUMERATIONS **************************************************************/
 
-/* TYPES *********************************************************************/             
-/* FIXME: Update with _LDR_DATA_TABLE_ENTRY and LDR_ flags */
+/* TYPES *********************************************************************/
 typedef struct _PEB_LDR_DATA
 {
     ULONG               Length;
@@ -54,22 +61,24 @@ typedef struct _LDR_DATA_TABLE_ENTRY
     UNICODE_STRING FullDllName;
     UNICODE_STRING BaseDllName;
     ULONG Flags;
-    USHORT LoadCount; /* FIXME: HACK!!! FIX ASAP */
-    USHORT TlsIndex;  /* FIXME: HACK!!! FIX ASAP */
-    LIST_ENTRY HashLinks;
-    PVOID SectionPointer;
+    USHORT LoadCount;
+    USHORT TlsIndex;
+    union
+    {
+        LIST_ENTRY HashLinks;
+        PVOID SectionPointer;
+    };
     ULONG CheckSum;
-    ULONG TimeDateStamp;
-    PVOID LoadedImports;
+    union
+    {
+        ULONG TimeDateStamp;
+        PVOID LoadedImports;
+    };
     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;
 
-typedef struct _LDR_RESOURCE_INFO 
+typedef struct _LDR_RESOURCE_INFO
 {
     ULONG Type;
     ULONG Name;