Implemented ntdll resource functions.

dlls/kernel/locale.c

@@ -1002,6 +1002,9 @@ void LOCALE_Init(void)
     UINT ansi = 1252, oem = 437, mac = 10000;
     LCID lcid = init_default_lcid();
 
+    NtSetDefaultLocale( FALSE, lcid );
+    NtSetDefaultLocale( TRUE, lcid );
+
     GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER,
                     (LPWSTR)&ansi, sizeof(ansi)/sizeof(WCHAR) );
     GetLocaleInfoW( lcid, LOCALE_IDEFAULTMACCODEPAGE | LOCALE_RETURN_NUMBER,

dlls/ntdll/Makefile.in

@@ -84,6 +84,7 @@ C_SRCS = \
 	om.c \
 	path.c \
 	reg.c \
+	resource.c \
 	rtl.c \
 	rtlbitmap.c \
 	rtlstr.c \

dlls/ntdll/ntdll.spec

@@ -33,12 +33,12 @@
 @ stub KiUserApcDispatcher
 @ stub KiUserCallbackDispatcher
 @ stub KiUserExceptionDispatcher
-@ stub LdrAccessResource
+@ stdcall LdrAccessResource(long ptr ptr ptr)
 @ stdcall LdrDisableThreadCalloutsForDll(long)
 @ stub LdrEnumResources
 @ stdcall LdrFindEntryForAddress(ptr ptr)
-@ stub LdrFindResourceDirectory_U
-@ stub LdrFindResource_U
+@ stdcall LdrFindResourceDirectory_U(long ptr long ptr)
+@ stdcall LdrFindResource_U(long ptr long ptr)
 @ stdcall LdrGetDllHandle(long long ptr ptr)
 @ stdcall LdrGetProcedureAddress(ptr ptr long ptr)
 @ stub LdrInitializeThunk
@@ -152,7 +152,7 @@
 @ stdcall NtProtectVirtualMemory(long ptr ptr long ptr)
 @ stdcall NtPulseEvent(long ptr)
 @ stub NtQueryAttributesFile
-@ stub NtQueryDefaultLocale
+@ stdcall NtQueryDefaultLocale(long ptr)
 @ stdcall NtQueryDirectoryFile(long long  ptr ptr ptr ptr long long long ptr long)
 @ stdcall NtQueryDirectoryObject(long long long long long long long)
 @ stub NtQueryEaFile
@@ -207,7 +207,7 @@
 @ stub NtSecureConnectPort
 @ stdcall NtSetContextThread(long ptr)
 @ stub NtSetDefaultHardErrorPort
-@ stub NtSetDefaultLocale
+@ stdcall NtSetDefaultLocale(long long)
 @ stub NtSetEaFile
 @ stdcall NtSetEvent(long long)
 @ stub NtSetHighEventPair
@@ -384,7 +384,7 @@
 @ stdcall RtlFindLeastSignificantBit(long long)
 @ stdcall RtlFindLongestRunClear(ptr long)
 @ stdcall RtlFindLongestRunSet(ptr long)
-@ stub RtlFindMessage
+@ stdcall RtlFindMessage(long long long long ptr)
 @ stdcall RtlFindMostSignificantBit(long long)
 @ stdcall RtlFindNextForwardRunClear(ptr long ptr)
 @ stdcall RtlFindNextForwardRunSet(ptr long ptr)
@@ -679,7 +679,7 @@
 @ stdcall ZwProtectVirtualMemory(long ptr ptr long ptr) NtProtectVirtualMemory
 @ stdcall ZwPulseEvent(long ptr) NtPulseEvent
 @ stub ZwQueryAttributesFile
-@ stub ZwQueryDefaultLocale
+@ stdcall ZwQueryDefaultLocale(long ptr) NtQueryDefaultLocale
 @ stdcall ZwQueryDirectoryFile(long long  ptr ptr ptr ptr long long long ptr long)NtQueryDirectoryFile
 @ stdcall ZwQueryDirectoryObject(long long long long long long long) NtQueryDirectoryObject
 @ stub ZwQueryEaFile
@@ -731,7 +731,7 @@
 @ stdcall ZwSaveKey(long long) NtSaveKey
 @ stdcall ZwSetContextThread(long ptr) NtSetContextThread
 @ stub ZwSetDefaultHardErrorPort
-@ stub ZwSetDefaultLocale
+@ stdcall ZwSetDefaultLocale(long long) NtSetDefaultLocale
 @ stub ZwSetEaFile
 @ stdcall ZwSetEvent(long long) NtSetEvent
 @ stub ZwSetHighEventPair

dlls/ntdll/resource.c

+/*
+ * PE file resources
+ *
+ * Copyright 1995 Thomas Sandford
+ * Copyright 1996 Martin von Loewis
+ * Copyright 2003 Alexandre Julliard
+ *
+ * Based on the Win16 resource handling code in loader/resource.c
+ * Copyright 1993 Robert J. Amstadt
+ * Copyright 1995 Alexandre Julliard
+ * Copyright 1997 Marcus Meissner
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <sys/types.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winnls.h"
+#include "winnt.h"
+#include "winternl.h"
+#include "winerror.h"
+#include "thread.h"
+#include "excpt.h"
+#include "wine/exception.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(resource);
+
+static LCID user_lcid, system_lcid;
+
+static WINE_EXCEPTION_FILTER(page_fault)
+{
+    if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ||
+        GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION)
+        return EXCEPTION_EXECUTE_HANDLER;
+    return EXCEPTION_CONTINUE_SEARCH;
+}
+
+/**********************************************************************
+ *  is_data_file_module
+ *
+ * Check if a module handle is for a LOAD_LIBRARY_AS_DATAFILE module.
+ */
+inline static int is_data_file_module( HMODULE hmod )
+{
+    return (ULONG_PTR)hmod & 1;
+}
+
+
+/**********************************************************************
+ *  push_language
+ *
+ * push a language in the list of languages to try
+ */
+static inline int push_language( WORD *list, int pos, WORD lang )
+{
+    int i;
+    for (i = 0; i < pos; i++) if (list[i] == lang) return;
+    list[pos++] = lang;
+    return pos;
+}
+
+
+/**********************************************************************
+ *  find_first_entry
+ *
+ * Find the first suitable entry in a resource directory
+ */
+static const IMAGE_RESOURCE_DIRECTORY *find_first_entry( const IMAGE_RESOURCE_DIRECTORY *dir,
+                                                         const void *root, int want_dir )
+{
+    const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1);
+    int pos;
+
+    for (pos = 0; pos < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; pos++)
+    {
+        if (!entry[pos].u2.s3.DataIsDirectory == !want_dir)
+            return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].u2.s3.OffsetToDirectory);
+    }
+    return NULL;
+}
+
+
+/**********************************************************************
+ *  find_entry_by_id
+ *
+ * Find an entry by id in a resource directory
+ */
+static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DIRECTORY *dir,
+                                                         WORD id, const void *root, int want_dir )
+{
+    const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry;
+    int min, max, pos;
+
+    entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1);
+    min = dir->NumberOfNamedEntries;
+    max = min + dir->NumberOfIdEntries - 1;
+    while (min <= max)
+    {
+        pos = (min + max) / 2;
+        if (entry[pos].u1.s2.Id == id)
+        {
+            if (!entry[pos].u2.s3.DataIsDirectory == !want_dir)
+            {
+                TRACE("root %p dir %p id %04x ret %p\n",
+                      root, dir, id, (char *)root + entry[pos].u2.s3.OffsetToDirectory);
+                return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].u2.s3.OffsetToDirectory);
+            }
+            break;
+        }
+        if (entry[pos].u1.s2.Id > id) max = pos - 1;
+        else min = pos + 1;
+    }
+    TRACE("root %p dir %p id %04x not found\n", root, dir, id );
+    return NULL;
+}
+
+
+/**********************************************************************
+ *  find_entry_by_name
+ *
+ * Find an entry by name in a resource directory
+ */
+static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_DIRECTORY *dir,
+                                                           LPCWSTR name, const void *root,
+                                                           int want_dir )
+{
+    const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry;
+    const IMAGE_RESOURCE_DIR_STRING_U *str;
+    int min, max, res, pos, namelen;
+
+    if (!HIWORD(name)) return find_entry_by_id( dir, LOWORD(name), root, want_dir );
+    entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1);
+    namelen = strlenW(name);
+    min = 0;
+    max = dir->NumberOfNamedEntries - 1;
+    while (min <= max)
+    {
+        pos = (min + max) / 2;
+        str = (IMAGE_RESOURCE_DIR_STRING_U *)((char *)root + entry[pos].u1.s1.NameOffset);
+        res = strncmpW( name, str->NameString, str->Length );
+        if (!res && namelen == str->Length)
+        {
+            if (!entry[pos].u2.s3.DataIsDirectory == !want_dir)
+            {
+                TRACE("root %p dir %p name %s ret %p\n",
+                      root, dir, debugstr_w(name), (char *)root + entry[pos].u2.s3.OffsetToDirectory);
+                return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].u2.s3.OffsetToDirectory);
+            }
+            break;
+        }
+        if (res < 0) max = pos - 1;
+        else min = pos + 1;
+    }
+    TRACE("root %p dir %p name %s not found\n", root, dir, debugstr_w(name) );
+    return NULL;
+}
+
+
+/**********************************************************************
+ *  find_entry
+ *
+ * Find a resource entry
+ */
+static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info,
+                            ULONG level, const void **ret, int want_dir )
+{
+    ULONG size;
+    const void *root;
+    const IMAGE_RESOURCE_DIRECTORY *resdirptr;
+    WORD list[9];  /* list of languages to try */
+    int i, pos = 0;
+
+    root = RtlImageDirectoryEntryToData( hmod, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size );
+    if (!root) return STATUS_RESOURCE_DATA_NOT_FOUND;
+    resdirptr = root;
+
+    if (!level--) goto done;
+    if (!(*ret = find_entry_by_name( resdirptr, (LPCWSTR)info->Type, root, want_dir || level )))
+        return STATUS_RESOURCE_TYPE_NOT_FOUND;
+    if (!level--) return STATUS_SUCCESS;
+
+    resdirptr = *ret;
+    if (!(*ret = find_entry_by_name( resdirptr, (LPCWSTR)info->Name, root, want_dir || level )))
+        return STATUS_RESOURCE_NAME_NOT_FOUND;
+    if (!level--) return STATUS_SUCCESS;
+    if (level) return STATUS_INVALID_PARAMETER;  /* level > 3 */
+
+    /* 1. specified language */
+    pos = push_language( list, pos, info->Language );
+
+    /* 2. specified language with neutral sublanguage */
+    pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(info->Language), SUBLANG_NEUTRAL ) );
+
+    /* 3. neutral language with neutral sublanguage */
+    pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) );
+
+    /* if no explicitly specified language, try some defaults */
+    if (PRIMARYLANGID(info->Language) == LANG_NEUTRAL)
+    {
+        /* user defaults, unless SYS_DEFAULT sublanguage specified  */
+        if (SUBLANGID(info->Language) != SUBLANG_SYS_DEFAULT)
+        {
+            /* 4. current thread locale language */
+            pos = push_language( list, pos, LANGIDFROMLCID(NtCurrentTeb()->CurrentLocale) );
+
+            /* 5. user locale language */
+            pos = push_language( list, pos, LANGIDFROMLCID(user_lcid) );
+
+            /* 6. user locale language with neutral sublanguage  */
+            pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(user_lcid), SUBLANG_NEUTRAL ) );
+        }
+
+        /* now system defaults */
+
+        /* 7. system locale language */
+        pos = push_language( list, pos, LANGIDFROMLCID( system_lcid ) );
+
+        /* 8. system locale language with neutral sublanguage */
+        pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(system_lcid), SUBLANG_NEUTRAL ) );
+
+        /* 9. English */
+        pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) );
+    }
+
+    resdirptr = *ret;
+    for (i = 0; i < pos; i++)
+        if ((*ret = find_entry_by_id( resdirptr, list[i], root, want_dir ))) return STATUS_SUCCESS;
+
+    /* if no explicitly specified language, return the first entry */
+    if (PRIMARYLANGID(info->Language) == LANG_NEUTRAL)
+    {
+        if ((*ret = find_first_entry( resdirptr, root, want_dir ))) return STATUS_SUCCESS;
+    }
+    return STATUS_RESOURCE_LANG_NOT_FOUND;
+
+done:
+    *ret = resdirptr;
+    return STATUS_SUCCESS;
+}
+
+
+/**********************************************************************
+ *	LdrFindResourceDirectory_U  (NTDLL.@)
+ */
+NTSTATUS WINAPI LdrFindResourceDirectory_U( HMODULE hmod, const LDR_RESOURCE_INFO *info,
+                                            ULONG level, const IMAGE_RESOURCE_DIRECTORY_ENTRY **entry )
+{
+    const void *res;
+    NTSTATUS status;
+
+    TRACE( "module %p type %s name %s lang %04lx level %ld\n",
+           hmod, debugstr_w((LPCWSTR)info->Type),
+           debugstr_w((LPCWSTR)info->Name), info->Language, level );
+
+    __TRY
+    {
+        status = find_entry( hmod, info, level, &res, TRUE );
+        if (status == STATUS_SUCCESS) *entry = res;
+    }
+    __EXCEPT(page_fault)
+    {
+        return GetExceptionCode();
+    }
+    __ENDTRY;
+    return status;
+}
+
+
+/**********************************************************************
+ *	LdrFindResource_U  (NTDLL.@)
+ */
+NTSTATUS WINAPI LdrFindResource_U( HMODULE hmod, const LDR_RESOURCE_INFO *info,
+                                   ULONG level, const IMAGE_RESOURCE_DATA_ENTRY **entry )
+{
+    const void *res;
+    NTSTATUS status;
+
+    TRACE( "module %p type %s name %s lang %04lx level %ld\n",
+           hmod, debugstr_w((LPCWSTR)info->Type),
+           debugstr_w((LPCWSTR)info->Name), info->Language, level );
+
+    __TRY
+    {
+        status = find_entry( hmod, info, level, &res, FALSE );
+        if (status == STATUS_SUCCESS) *entry = res;
+    }
+    __EXCEPT(page_fault)
+    {
+        return GetExceptionCode();
+    }
+    __ENDTRY;
+    return status;
+}
+
+
+/**********************************************************************
+ *	LdrAccessResource  (NTDLL.@)
+ */
+NTSTATUS WINAPI LdrAccessResource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry,
+                                   void **ptr, ULONG *size )
+{
+    NTSTATUS status;
+
+    __TRY
+    {
+        ULONG dirsize;
+
+        if (!RtlImageDirectoryEntryToData( hmod, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &dirsize ))
+            status = STATUS_RESOURCE_DATA_NOT_FOUND;
+        else
+        {
+            if (ptr)
+            {
+                if (is_data_file_module(hmod))
+                {
+                    HMODULE mod = (HMODULE)((ULONG_PTR)hmod & ~1);
+                    *ptr = RtlImageRvaToVa( RtlImageNtHeader(mod), mod, entry->OffsetToData, NULL );
+                }
+                else *ptr = (char *)hmod + entry->OffsetToData;
+            }
+            if (size) *size = entry->Size;
+            status = STATUS_SUCCESS;
+        }
+    }
+    __EXCEPT(page_fault)
+    {
+        return GetExceptionCode();
+    }
+    __ENDTRY;
+    return status;
+}
+
+
+/**********************************************************************
+ *	RtlFindMessage  (NTDLL.@)
+ */
+NTSTATUS WINAPI RtlFindMessage( HMODULE hmod, ULONG type, ULONG lang,
+                                ULONG msg_id, const MESSAGE_RESOURCE_ENTRY **ret )
+{
+    const MESSAGE_RESOURCE_DATA *data;
+    const MESSAGE_RESOURCE_BLOCK *block;
+    const IMAGE_RESOURCE_DATA_ENTRY *rsrc;
+    LDR_RESOURCE_INFO info;
+    NTSTATUS status;
+    void *ptr;
+    int i;
+
+    info.Type     = type;
+    info.Name     = 1;
+    info.Language = lang;
+
+    if ((status = LdrFindResource_U( hmod, &info, 3, &rsrc )) != STATUS_SUCCESS)
+        return status;
+    if ((status = LdrAccessResource( hmod, rsrc, &ptr, NULL )) != STATUS_SUCCESS)
+        return status;
+
+    data = ptr;
+    block = data->Blocks;
+    for (i = 0; i < data->NumberOfBlocks; i++, block++)
+    {
+        if (msg_id >= block->LowId && msg_id <= block->HighId)
+        {
+            const MESSAGE_RESOURCE_ENTRY *entry;
+
+            entry = (MESSAGE_RESOURCE_ENTRY *)((char *)data + block->OffsetToEntries);
+            for (i = msg_id - block->LowId; i > 0; i--)
+                entry = (MESSAGE_RESOURCE_ENTRY *)((char *)entry + entry->Length);
+            *ret = entry;
+            return STATUS_SUCCESS;
+        }
+    }
+    return STATUS_MESSAGE_NOT_FOUND;
+}
+
+
+/**********************************************************************
+ *	NtQueryDefaultLocale  (NTDLL.@)
+ */
+NTSTATUS WINAPI NtQueryDefaultLocale( BOOLEAN user, LCID *lcid )
+{
+    *lcid = user ? user_lcid : system_lcid;
+    return STATUS_SUCCESS;
+}
+
+
+/**********************************************************************
+ *	NtSetDefaultLocale  (NTDLL.@)
+ */
+NTSTATUS WINAPI NtSetDefaultLocale( BOOLEAN user, LCID lcid )
+{
+    if (user) user_lcid = lcid;
+    else system_lcid = lcid;
+    return STATUS_SUCCESS;
+}

include/winternl.h

@@ -777,6 +777,13 @@ typedef struct _VM_COUNTERS_ {
 
 typedef BOOLEAN (WINAPI * PWINSTATIONQUERYINFORMATIONW)(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG);
 
+typedef struct _LDR_RESOURCE_INFO
+{
+    ULONG Type;
+    ULONG Name;
+    ULONG Language;
+} LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;
+
 /***********************************************************************
  * Defines
  */
@@ -834,6 +841,9 @@ void WINAPI DbgUserBreakPoint(void);
 #endif  /* __i386__ && __GNUC__ */
 void WINAPIV DbgPrint(LPCSTR fmt, ...);
 
+NTSTATUS  WINAPI LdrAccessResource(HMODULE,const IMAGE_RESOURCE_DATA_ENTRY*,void**,PULONG);
+NTSTATUS  WINAPI LdrFindResourceDirectory_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DIRECTORY_ENTRY**);
+NTSTATUS  WINAPI LdrFindResource_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DATA_ENTRY**);
 NTSTATUS  WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,PBOOLEAN);
 NTSTATUS  WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
 NTSTATUS  WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,PVOID,ULONG*,ULONG,ULONG);
@@ -869,6 +879,7 @@ NTSTATUS  WINAPI NtOpenThreadToken(HANDLE,DWORD,BOOLEAN,HANDLE *);
 NTSTATUS  WINAPI NtProtectVirtualMemory(HANDLE,PVOID*,ULONG*,ULONG,ULONG*);
 NTSTATUS  WINAPI NtPulseEvent(HANDLE,PULONG);
 NTSTATUS  WINAPI NtQueueApcThread(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR);
+NTSTATUS  WINAPI NtQueryDefaultLocale(BOOLEAN,LCID*);
 NTSTATUS  WINAPI NtQueryInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG);
 NTSTATUS  WINAPI NtQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG);
 NTSTATUS  WINAPI NtQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD);
@@ -888,6 +899,7 @@ NTSTATUS  WINAPI NtRestoreKey(HKEY,HANDLE,ULONG);
 NTSTATUS  WINAPI NtResumeThread(HANDLE,PULONG);
 NTSTATUS  WINAPI NtSaveKey(HKEY,HANDLE);
 NTSTATUS  WINAPI NtSetContextThread(HANDLE,const CONTEXT*);
+NTSTATUS  WINAPI NtSetDefaultLocale(BOOLEAN,LCID);
 NTSTATUS  WINAPI NtSetEvent(HANDLE,PULONG);
 NTSTATUS  WINAPI NtSetInformationKey(HKEY,const int,PVOID,ULONG);
 NTSTATUS  WINAPI NtSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
@@ -979,6 +991,7 @@ ULONG     WINAPI RtlFindLastBackwardRunClear(PCRTL_BITMAP,ULONG,PULONG);
 CCHAR     WINAPI RtlFindLeastSignificantBit(ULONGLONG);
 ULONG     WINAPI RtlFindLongestRunSet(PCRTL_BITMAP,PULONG);
 ULONG     WINAPI RtlFindLongestRunClear(PCRTL_BITMAP,PULONG);
+NTSTATUS  WINAPI RtlFindMessage(HMODULE,ULONG,ULONG,ULONG,const MESSAGE_RESOURCE_ENTRY**);
 CCHAR     WINAPI RtlFindMostSignificantBit(ULONGLONG);
 ULONG     WINAPI RtlFindNextForwardRunSet(PCRTL_BITMAP,ULONG,PULONG);
 ULONG     WINAPI RtlFindNextForwardRunClear(PCRTL_BITMAP,ULONG,PULONG);
@@ -1251,20 +1264,8 @@ typedef struct _SYSTEM_MODULE_INFORMATION
     SYSTEM_MODULE       Modules[1]; /* FIXME: should be Modules[0] */
 } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION;
 
-typedef struct _LDR_RESOURCE_INFO
-{
-    ULONG               Type;
-    ULONG               Name;
-    ULONG               Language;
-} LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;
-
-NTSTATUS WINAPI LdrAccessResource(HMODULE, PIMAGE_RESOURCE_DATA_ENTRY, void**, PULONG);
 NTSTATUS WINAPI LdrDisableThreadCalloutsForDll(HMODULE);
 NTSTATUS WINAPI LdrFindEntryForAddress(const void*, PLDR_MODULE*);
-NTSTATUS WINAPI LdrFindResourceDirectory_U(HMODULE,PLDR_RESOURCE_INFO, DWORD,
-                                           PIMAGE_RESOURCE_DIRECTORY_ENTRY*);
-NTSTATUS WINAPI LdrFindResource_U(HMODULE, PLDR_RESOURCE_INFO, ULONG,
-                                  PIMAGE_RESOURCE_DATA_ENTRY*);
 NTSTATUS WINAPI LdrGetDllHandle(ULONG, ULONG, PUNICODE_STRING, HMODULE*);
 NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, PANSI_STRING, ULONG, void**);
 NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, PUNICODE_STRING, HMODULE*);