From: Sir Richard <sir_richard@svn.reactos.org>
Date: Sun, 27 Jun 2010 19:56:57 +0000 (+0000)
Subject: - There's no such thing as PRTL_MESSAGE_RESOURCE_ENTRY, use PMESSAGE_RESOURCE_ENTRY... 
X-Git-Tag: backups/Ash_Shell@48412~1^2~391
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=763a24d9d7084fda47e4228c9fce75b97e59e4e4

- There's no such thing as PRTL_MESSAGE_RESOURCE_ENTRY, use PMESSAGE_RESOURCE_ENTRY instead.

svn path=/trunk/; revision=47865
---

diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index c5d4a8413a4..39a9503bb3d 100644
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -2796,7 +2796,7 @@ RtlFindMessage(
     IN ULONG Type,
     IN ULONG Language,
     IN ULONG MessageId,
-    OUT PRTL_MESSAGE_RESOURCE_ENTRY *MessageResourceEntry
+    OUT PMESSAGE_RESOURCE_ENTRY *MessageResourceEntry
 );
 
 NTSYSAPI
diff --git a/reactos/include/ndk/rtltypes.h b/reactos/include/ndk/rtltypes.h
index b98d3b3966f..04aa9242624 100644
--- a/reactos/include/ndk/rtltypes.h
+++ b/reactos/include/ndk/rtltypes.h
@@ -1084,29 +1084,6 @@ typedef struct _RTL_RESOURCE
     PVOID DebugInfo;
 } RTL_RESOURCE, *PRTL_RESOURCE;
 
-//
-// RTL Message Structures for PE Resources
-//
-typedef struct _RTL_MESSAGE_RESOURCE_ENTRY
-{
-    USHORT Length;
-    USHORT Flags;
-    CHAR Text[1];
-} RTL_MESSAGE_RESOURCE_ENTRY, *PRTL_MESSAGE_RESOURCE_ENTRY;
-
-typedef struct _RTL_MESSAGE_RESOURCE_BLOCK
-{
-    ULONG LowId;
-    ULONG HighId;
-    ULONG OffsetToEntries;
-} RTL_MESSAGE_RESOURCE_BLOCK, *PRTL_MESSAGE_RESOURCE_BLOCK;
-
-typedef struct _RTL_MESSAGE_RESOURCE_DATA
-{
-    ULONG NumberOfBlocks;
-    RTL_MESSAGE_RESOURCE_BLOCK Blocks[1];
-} RTL_MESSAGE_RESOURCE_DATA, *PRTL_MESSAGE_RESOURCE_DATA;
-
 //
 // Structures for RtlCreateUserProcess
 //
diff --git a/reactos/lib/rtl/message.c b/reactos/lib/rtl/message.c
index 065e260bf0b..998cca34abf 100644
--- a/reactos/lib/rtl/message.c
+++ b/reactos/lib/rtl/message.c
@@ -24,14 +24,14 @@ RtlFindMessage(
     ULONG Type,
     ULONG Language,
     ULONG MessageId,
-    PRTL_MESSAGE_RESOURCE_ENTRY *MessageResourceEntry)
+    PMESSAGE_RESOURCE_ENTRY *MessageResourceEntry)
 {
     LDR_RESOURCE_INFO ResourceInfo;
     PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry;
-    PRTL_MESSAGE_RESOURCE_DATA MessageTable;
+    PMESSAGE_RESOURCE_DATA MessageTable;
     NTSTATUS Status;
     ULONG EntryOffset = 0, IdOffset = 0;
-    PRTL_MESSAGE_RESOURCE_ENTRY MessageEntry;
+    PMESSAGE_RESOURCE_ENTRY MessageEntry;
     ULONG i;
 
     DPRINT("RtlFindMessage()\n");
@@ -92,7 +92,7 @@ RtlFindMessage(
         return STATUS_MESSAGE_NOT_FOUND;
     }
 
-    MessageEntry = (PRTL_MESSAGE_RESOURCE_ENTRY)
+    MessageEntry = (PMESSAGE_RESOURCE_ENTRY)
         ((PUCHAR)MessageTable + MessageTable->Blocks[i].OffsetToEntries);
 
     DPRINT("EntryOffset 0x%08lx\n", EntryOffset);
@@ -101,7 +101,7 @@ RtlFindMessage(
     DPRINT("MessageEntry: %p\n", MessageEntry);
     for (i = 0; i < IdOffset; i++)
     {
-        MessageEntry = (PRTL_MESSAGE_RESOURCE_ENTRY)
+        MessageEntry = (PMESSAGE_RESOURCE_ENTRY)
             ((PUCHAR)MessageEntry + (ULONG)MessageEntry->Length);
     }
 
diff --git a/reactos/ntoskrnl/ke/bug.c b/reactos/ntoskrnl/ke/bug.c
index c40b13310d8..d1ca5a27ab1 100644
--- a/reactos/ntoskrnl/ke/bug.c
+++ b/reactos/ntoskrnl/ke/bug.c
@@ -23,7 +23,7 @@ LIST_ENTRY KeBugcheckReasonCallbackListHead;
 KSPIN_LOCK BugCheckCallbackLock;
 ULONG KeBugCheckActive, KeBugCheckOwner;
 LONG KeBugCheckOwnerRecursionCount;
-PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages;
+PMESSAGE_RESOURCE_DATA KiBugCodeMessages;
 ULONG KeBugCheckCount = 1;
 ULONG KiHardwareTrigger;
 PUNICODE_STRING KiBugCheckDriver;
@@ -394,7 +394,7 @@ INIT_FUNCTION
 NTAPI
 KiInitializeBugCheck(VOID)
 {
-    PRTL_MESSAGE_RESOURCE_DATA BugCheckData;
+    PMESSAGE_RESOURCE_DATA BugCheckData;
     LDR_RESOURCE_INFO ResourceInfo;
     PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry;
     NTSTATUS Status;