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

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*);