From b1bb7220887ac3e2737639413f0a0fe749e89de2 Mon Sep 17 00:00:00 2001
From: Steven Edwards <steven_ed4153@yahoo.com>
Date: Mon, 30 Aug 2004 19:30:17 +0000
Subject: [PATCH] Add DllRegisterServer and friends for mlang.

---
 dlls/atl/regsvr.c            |  1 +
 dlls/mlang/Makefile.in       |  3 ++-
 dlls/mlang/mlang.c           | 12 ------------
 dlls/{atl => mlang}/regsvr.c | 44 ++++++++++++++++++++++++++++++--------------
 tools/wine.inf               |  1 +
 5 files changed, 34 insertions(+), 27 deletions(-)
 copy dlls/{atl => mlang}/regsvr.c (94%)

diff --git a/dlls/atl/regsvr.c b/dlls/atl/regsvr.c
index 0fd426df2ea..c253441b455 100644
--- a/dlls/atl/regsvr.c
+++ b/dlls/atl/regsvr.c
@@ -2,6 +2,7 @@
  *	self-registerable dll functions for atl.dll
  *
  * Copyright (C) 2003 John K. Hohm
+ * Copyright (C) 2004 Steven Edwards for ReactOS
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in
index 9d0b21eb6bd..3af44d5c28d 100644
--- a/dlls/mlang/Makefile.in
+++ b/dlls/mlang/Makefile.in
@@ -8,7 +8,8 @@ EXTRALIBS = $(LIBUNICODE) -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
-	mlang.c
+	mlang.c \
+	regsvr.c
 
 SUBDIRS = tests
 
diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index a031de8aa7d..871fd9a993e 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -1936,15 +1936,3 @@ HRESULT WINAPI MLANG_DllCanUnloadNow(void)
     FIXME("\n");
     return S_FALSE;
 }
-
-HRESULT WINAPI MLANG_DllRegisterServer(void)
-{
-    FIXME("\n");
-    return S_OK;
-}
-
-HRESULT WINAPI MLANG_DllUnregisterServer(void)
-{
-    FIXME("\n");
-    return S_OK;
-}
diff --git a/dlls/atl/regsvr.c b/dlls/mlang/regsvr.c
similarity index 94%
copy from dlls/atl/regsvr.c
copy to dlls/mlang/regsvr.c
index 0fd426df2ea..1e97583c840 100644
--- a/dlls/atl/regsvr.c
+++ b/dlls/mlang/regsvr.c
@@ -1,7 +1,8 @@
 /*
- *	self-registerable dll functions for atl.dll
+ *	self-registerable dll functions for mlang.dll
  *
  * Copyright (C) 2003 John K. Hohm
+ * Copyright (C) 2004 Steven Edwards for ReactOS
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,7 +19,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <string.h>
 
@@ -34,9 +34,11 @@
 
 #include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(atl);
+WINE_DEFAULT_DEBUG_CHANNEL(mlang);
 
-DEFINE_GUID( CLSID_ATLRegistrar, 0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3 );
+DEFINE_GUID( CLSID_MLANGSupport, 0x275c23e2,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46 );
+DEFINE_GUID( CLSID_MLANGString, 0x44ec053a,0xb70d,0x11d0,0xb1,0x88,0x00,0xaa,0x00,0x38,0xc9,0x69 );
+DEFINE_GUID( CLSID_MLANGCharSet, 0xd66d6f99,0xcdaa,0x11d0,0xb8,0x22,0x00,0xC0,0x4f,0xc9,0xb3,0x1f );
 
 /*
  * Near the bottom of this file are the exported DllRegisterServer and
@@ -507,13 +509,27 @@ static LONG recursive_delete_keyW(HKEY base, WCHAR const *name)
  */
 static struct regsvr_coclass const coclass_list[] = {
     {
-	&CLSID_ATLRegistrar,
-	"Registrar Class",
-	NULL,
-	"atl.dll",
-	"Both"
+        &CLSID_MLANGSupport,
+        "Multi Language Support",
+        NULL,
+        "mlang.dll",
+        "Both"
     },
-    { NULL }			/* list terminator */
+    {
+        &CLSID_MLANGString,
+        "Multi Language String",
+        NULL,
+        "mlang.dll",
+        "Both"
+    },
+    {
+        &CLSID_MLANGCharSet,
+        "Multi Language ConvertCharset",
+        NULL,
+        "mlang.dll",
+        "Both"
+    },
+    { NULL }    /* list terminator */
 };
 
 /***********************************************************************
@@ -525,9 +541,9 @@ static struct regsvr_interface const interface_list[] = {
 };
 
 /***********************************************************************
- *		DllRegisterServer (ATL.@)
+ *		DllRegisterServer (MLANG.@)
  */
-HRESULT WINAPI ATL_DllRegisterServer(void)
+HRESULT WINAPI MLANG_DllRegisterServer(void)
 {
     HRESULT hr;
 
@@ -540,9 +556,9 @@ HRESULT WINAPI ATL_DllRegisterServer(void)
 }
 
 /***********************************************************************
- *		DllUnregisterServer (ATL.@)
+ *		DllUnregisterServer (MLANG.@)
  */
-HRESULT WINAPI ATL_DllUnregisterServer(void)
+HRESULT WINAPI MLANG_DllUnregisterServer(void)
 {
     HRESULT hr;
 
diff --git a/tools/wine.inf b/tools/wine.inf
index 0a581deb003..1dd7ca9940a 100644
--- a/tools/wine.inf
+++ b/tools/wine.inf
@@ -2025,6 +2025,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 11,,dswave.dll,1
 11,,dxdiagn.dll,1
 11,,hhctrl.ocx,1
+11,,mlang.dll,1
 11,,msi.dll,1
 11,,ole32.dll,1
 11,,oleaut32.dll,1
-- 
2.11.4.GIT