[ros-diffs] [sir_richard] 47865: - There's no such thing as PRTL_MESSAGE_RESOURCE_ENTRY, use PMESSAGE_RESOURCE_ENTRY instead.

Author: sir_richard
Date: Sun Jun 27 19:56:57 2010
New Revision: 47865

URL: http://svn.reactos.org/svn/reactos?rev=47865&view=rev
Log:
- There's no such thing as PRTL_MESSAGE_RESOURCE_ENTRY, use PMESSAGE_RESOURCE_ENTRY
instead.

Modified:
    trunk/reactos/include/ndk/rtlfuncs.h
    trunk/reactos/include/ndk/rtltypes.h
    trunk/reactos/lib/rtl/message.c
    trunk/reactos/ntoskrnl/ke/bug.c

Modified: trunk/reactos/include/ndk/rtlfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jun 27 19:56:57 2010
@@ -2796,7 +2796,7 @@
     IN ULONG Type,
     IN ULONG Language,
     IN ULONG MessageId,
-    OUT PRTL_MESSAGE_RESOURCE_ENTRY *MessageResourceEntry
+    OUT PMESSAGE_RESOURCE_ENTRY *MessageResourceEntry
 );
 
 NTSYSAPI

Modified: trunk/reactos/include/ndk/rtltypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sun Jun 27 19:56:57 2010
@@ -1083,29 +1083,6 @@
     ULONG TimeoutBoost;
     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

Modified: trunk/reactos/lib/rtl/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/message.c?rev=4786…
==============================================================================
--- trunk/reactos/lib/rtl/message.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/message.c [iso-8859-1] Sun Jun 27 19:56:57 2010
@@ -24,14 +24,14 @@
     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 @@
         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 @@
     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);
     }
 

Modified: trunk/reactos/ntoskrnl/ke/bug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4786…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Jun 27 19:56:57 2010
@@ -23,7 +23,7 @@
 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 @@
 NTAPI
 KiInitializeBugCheck(VOID)
 {
-    PRTL_MESSAGE_RESOURCE_DATA BugCheckData;
+    PMESSAGE_RESOURCE_DATA BugCheckData;
     LDR_RESOURCE_INFO ResourceInfo;
     PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry;
     NTSTATUS Status;