Authors: Dmitry Timoshkov <dmitry@codeweavers.com>, Mike McCormack <mike@codeweavers.com>

configure.ac

@@ -1584,6 +1584,8 @@ dlls/kernel/tests/Makefile
 dlls/lzexpand/Makefile
 dlls/mapi32/Makefile
 dlls/mapi32/tests/Makefile
+dlls/mlang/Makefile
+dlls/mlang/tests/Makefile
 dlls/mmdevldr.vxd/Makefile
 dlls/monodebg.vxd/Makefile
 dlls/mpr/Makefile

dlls/Makefile.in

@@ -66,6 +66,7 @@ BASEDIRS = \
 	kernel \
 	lzexpand \
 	mapi32 \
+	mlang \
 	mmdevldr.vxd \
 	monodebg.vxd \
 	mpr \
@@ -299,6 +300,7 @@ SYMLINKS_SO = \
 	mciseq.drv.so \
 	mciwave.drv.so \
 	midimap.drv.so \
+	mlang.dll.so \
 	mmdevldr.vxd.so \
 	monodebg.vxd.so \
 	mpr.dll.so \
@@ -612,6 +614,9 @@ mciwave.drv.so: winmm/mciwave/mciwave.drv.so
 midimap.drv.so: winmm/midimap/midimap.drv.so
 	$(RM) $@ && $(LN_S) winmm/midimap/midimap.drv.so $@
 
+mlang.dll.so: mlang/mlang.dll.so
+	$(RM) $@ && $(LN_S) mlang/mlang.dll.so $@
+
 mmdevldr.vxd.so: mmdevldr.vxd/mmdevldr.vxd.so
 	$(RM) $@ && $(LN_S) mmdevldr.vxd/mmdevldr.vxd.so $@
 
@@ -1006,6 +1011,7 @@ IMPORT_LIBS = \
 	libkernel32 \
 	liblz32 \
 	libmapi32 \
+	libmlang \
 	libmpr \
 	libmsacm32 \
 	libmsdmo \
@@ -1354,6 +1360,11 @@ libmapi32.def: mapi32/mapi32.spec.def
 libmapi32.a: mapi32/mapi32.spec.def
 	$(DLLTOOL) -k -l $@ -d mapi32/mapi32.spec.def
 
+libmlang.def: mlang/mlang.spec.def
+	$(RM) $@ && $(LN_S) mlang/mlang.spec.def $@
+libmlang.a: mlang/mlang.spec.def
+	$(DLLTOOL) -k -l $@ -d mlang/mlang.spec.def
+
 libmpr.def: mpr/mpr.spec.def
 	$(RM) $@ && $(LN_S) mpr/mpr.spec.def $@
 libmpr.a: mpr/mpr.spec.def
@@ -1748,6 +1759,7 @@ iphlpapi/iphlpapi.spec.def: $(WINEBUILD)
 kernel/kernel32.spec.def: $(WINEBUILD)
 lzexpand/lz32.spec.def: $(WINEBUILD)
 mapi32/mapi32.spec.def: $(WINEBUILD)
+mlang/mlang.spec.def: $(WINEBUILD)
 mpr/mpr.spec.def: $(WINEBUILD)
 msacm/msacm32.spec.def: $(WINEBUILD)
 msdmo/msdmo.spec.def: $(WINEBUILD)
@@ -1886,6 +1898,7 @@ winmm/mcicda/mcicda.drv.so: winmm/mcicda
 winmm/mciseq/mciseq.drv.so: winmm/mciseq
 winmm/mciwave/mciwave.drv.so: winmm/mciwave
 winmm/midimap/midimap.drv.so: winmm/midimap
+mlang/mlang.dll.so: mlang
 mmdevldr.vxd/mmdevldr.vxd.so: mmdevldr.vxd
 monodebg.vxd/monodebg.vxd.so: monodebg.vxd
 mpr/mpr.dll.so: mpr

dlls/mlang/.cvsignore

+Makefile
+mlang.dll.dbg.c
+mlang.spec.def

dlls/mlang/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = mlang.dll
+IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll
+EXTRALIBS = $(LIBUNICODE) -luuid
+EXTRADEFS = -DCOM_NO_WINDOWS_H
+
+C_SRCS = \
+	mlang.c
+
+SUBDIRS = tests
+
+@MAKE_DLL_RULES@
+
+### Dependencies:

dlls/mlang/mlang.spec

+@ stub ConvertINetMultiByteToUnicode
+@ stub ConvertINetReset
+@ stub ConvertINetString
+@ stub ConvertINetUnicodeToMultiByte
+@ stdcall DllCanUnloadNow() MLANG_DllCanUnloadNow
+@ stdcall DllGetClassObject(ptr ptr ptr) MLANG_DllGetClassObject
+@ stdcall DllRegisterServer() MLANG_DllRegisterServer
+@ stdcall DllUnregisterServer() MLANG_DllUnregisterServer
+@ stub GetGlobalFontLinkObject
+@ stub IsConvertINetStringAvailable
+@ stub LcidToRfc1766A
+@ stub LcidToRfc1766W
+@ stub Rfc1766ToLcidA
+@ stub Rfc1766ToLcidW

dlls/mlang/tests/.cvsignore

+Makefile
+mlang.ok
+testlist.c

dlls/mlang/tests/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = mlang.dll
+IMPORTS   = ole32 gdi32 kernel32 ntdll
+EXTRALIBS = -luuid
+
+CTESTS = \
+	mlang.c
+
+@MAKE_TEST_RULES@
+
+### Dependencies: