[ros-diffs] [hbelusca] 60532: [NTDLL]: Stubplement and export LdrFlushAlternateResourceModules needed for Windows 2k3 user32.dll and winsrv.dll . [RTL]: Stubplement and export RtlConsoleMultiByteToUnicodeN (an...

Author: hbelusca
Date: Sat Oct  5 12:06:59 2013
New Revision: 60532

URL: http://svn.reactos.org/svn/reactos?rev=60532&view=rev
Log:
[NTDLL]: Stubplement and export LdrFlushAlternateResourceModules needed for Windows 2k3 user32.dll and winsrv.dll .
[RTL]: Stubplement and export RtlConsoleMultiByteToUnicodeN (and fallback to RtlMultiByteToUnicodeN) needed for WIndows 2k3 winsrv.dll

CORE-7481 #comment LdrFlushAlternateResourceModules and RtlConsoleMultiByteToUnicodeN stubplemented in revision 60532.

Modified:
    trunk/reactos/dll/ntdll/def/ntdll.spec
    trunk/reactos/dll/ntdll/ldr/ldrapi.c
    trunk/reactos/lib/rtl/nls.c

Modified: trunk/reactos/dll/ntdll/def/ntdll.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?re...
==============================================================================
--- trunk/reactos/dll/ntdll/def/ntdll.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/def/ntdll.spec	[iso-8859-1] Sat Oct  5 12:06:59 2013
@@ -56,7 +56,7 @@
 @ stdcall LdrFindResourceDirectory_U(long ptr long ptr)
 ;@ stdcall LdrFindResourceEx_U ; 5.1 and higher
 @ stdcall LdrFindResource_U(long ptr long ptr)
-;@ stdcall LdrFlushAlternateResourceModules
+@ stdcall LdrFlushAlternateResourceModules()
 @ stdcall LdrGetDllHandle(wstr long ptr ptr)
 @ stdcall LdrGetDllHandleEx(long wstr long ptr ptr)
 @ stdcall LdrGetProcedureAddress(ptr ptr long ptr)
@@ -451,7 +451,7 @@
 @ stdcall RtlComputeCrc32(long ptr long)
 @ stdcall RtlComputeImportTableHash(ptr ptr long)
 @ stdcall RtlComputePrivatizedDllName_U(ptr ptr ptr)
-;@ stdcall RtlConsoleMultiByteToUnicodeN
+@ stdcall RtlConsoleMultiByteToUnicodeN(ptr long ptr ptr long ptr)
 @ stdcall RtlConvertExclusiveToShared(ptr)
 @ stdcall -arch=win32 -ret64 RtlConvertLongToLargeInteger(long)
 ;@ stdcall RtlConvertPropertyToVariant

Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev=...
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrapi.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrapi.c	[iso-8859-1] Sat Oct  5 12:06:59 2013
@@ -1582,6 +1582,24 @@
     return LdrProcessRelocationBlockLongLong(Address, Count, TypeOffset, Delta);
 }

+/* FIXME: Add to ntstatus.mc */
+#define STATUS_MUI_FILE_NOT_FOUND        ((NTSTATUS)0xC00B0001L)
+
+/*
+ * @implemented
+ */
+NTSTATUS
+NTAPI
+LdrLoadAlternateResourceModule(IN PVOID Module,
+                               IN PWSTR Buffer)
+{
+    /* Is MUI Support enabled? */
+    if (!LdrAlternateResourcesEnabled()) return STATUS_SUCCESS;
+
+    UNIMPLEMENTED;
+    return STATUS_MUI_FILE_NOT_FOUND;
+}
+
 /*
  * @implemented
  */
@@ -1607,22 +1625,15 @@
     return TRUE;
 }

-/* FIXME: Add to ntstatus.mc */
-#define STATUS_MUI_FILE_NOT_FOUND        ((NTSTATUS)0xC00B0001L)
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-LdrLoadAlternateResourceModule(IN PVOID Module,
-                               IN PWSTR Buffer)
-{
-    /* Is MUI Support enabled? */
-    if (!LdrAlternateResourcesEnabled()) return STATUS_SUCCESS;
-
+/*
+ * @unimplemented
+ */
+BOOLEAN
+NTAPI
+LdrFlushAlternateResourceModules(VOID)
+{
     UNIMPLEMENTED;
-    return STATUS_MUI_FILE_NOT_FOUND;
+    return FALSE;
 }

/* EOF */

Modified: trunk/reactos/lib/rtl/nls.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=60532&...
==============================================================================
--- trunk/reactos/lib/rtl/nls.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/nls.c	[iso-8859-1] Sat Oct  5 12:06:59 2013
@@ -285,6 +285,32 @@
    }

return STATUS_SUCCESS;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+NTAPI
+RtlConsoleMultiByteToUnicodeN(
+    OUT PWCHAR UnicodeString,
+    IN ULONG UnicodeSize,
+    OUT PULONG ResultSize,
+    IN PCSTR MbString,
+    IN ULONG MbSize,
+    OUT PULONG Unknown)
+{
+    PAGED_CODE_RTL();
+
+    UNIMPLEMENTED;
+    DPRINT1("RtlConsoleMultiByteToUnicodeN calling RtlMultiByteToUnicodeN\n");
+    *Unknown = 1;
+    return RtlMultiByteToUnicodeN(UnicodeString,
+                                  UnicodeSize,
+                                  ResultSize,
+                                  MbString,
+                                  MbSize);
 }