mlang: Give the CLSIDs their proper names.
Move CLSID_CMultiLanguage and CLSID_CMLangConvertCharset to mlang.idl. Leave CLSID_CMLangString in regsvr.c as MSDN claims it is not supported anymore.
This commit is contained in:
parent
ebd9c84ea0
commit
a050bebd80
|
@ -30,15 +30,15 @@
|
||||||
#include "winerror.h"
|
#include "winerror.h"
|
||||||
|
|
||||||
#include "objbase.h"
|
#include "objbase.h"
|
||||||
#include "initguid.h"
|
#include "mlang.h"
|
||||||
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
#include "initguid.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(mlang);
|
WINE_DEFAULT_DEBUG_CHANNEL(mlang);
|
||||||
|
|
||||||
DEFINE_GUID( CLSID_MLANGSupport, 0x275c23e2,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46 );
|
/* This one should probably be defined in mlang.idl but MSDN claims it is no longer supported */
|
||||||
DEFINE_GUID( CLSID_MLANGString, 0xc04d65cf, 0xb70d, 0x11d0, 0xb1,0x88, 0x00,0xaa,0x00,0x38,0xc9,0x69);
|
DEFINE_GUID(CLSID_CMLangString, 0xc04d65cf, 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
|
* Near the bottom of this file are the exported DllRegisterServer and
|
||||||
|
@ -509,21 +509,21 @@ static LONG recursive_delete_keyW(HKEY base, WCHAR const *name)
|
||||||
*/
|
*/
|
||||||
static struct regsvr_coclass const coclass_list[] = {
|
static struct regsvr_coclass const coclass_list[] = {
|
||||||
{
|
{
|
||||||
&CLSID_MLANGSupport,
|
&CLSID_CMultiLanguage,
|
||||||
"Multi Language Support",
|
"Multi Language Support",
|
||||||
NULL,
|
NULL,
|
||||||
"mlang.dll",
|
"mlang.dll",
|
||||||
"Both"
|
"Both"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
&CLSID_MLANGString,
|
&CLSID_CMLangString,
|
||||||
"Multi Language String",
|
"Multi Language String",
|
||||||
NULL,
|
NULL,
|
||||||
"mlang.dll",
|
"mlang.dll",
|
||||||
"Both"
|
"Both"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
&CLSID_MLANGCharSet,
|
&CLSID_CMLangConvertCharset,
|
||||||
"Multi Language ConvertCharset",
|
"Multi Language ConvertCharset",
|
||||||
NULL,
|
NULL,
|
||||||
"mlang.dll",
|
"mlang.dll",
|
||||||
|
|
|
@ -235,6 +235,7 @@ interface IEnumCodePage : IUnknown
|
||||||
|
|
||||||
[
|
[
|
||||||
object,
|
object,
|
||||||
|
uuid(d66d6f98-cdaa-11d0-b822-00c04fc9b31f),
|
||||||
pointer_default(unique)
|
pointer_default(unique)
|
||||||
]
|
]
|
||||||
interface IMLangConvertCharset : IUnknown
|
interface IMLangConvertCharset : IUnknown
|
||||||
|
@ -272,6 +273,14 @@ interface IMLangConvertCharset : IUnknown
|
||||||
[in,out] UINT *pcDstSize);
|
[in,out] UINT *pcDstSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[
|
||||||
|
uuid(d66d6f99-cdaa-11d0-b822-00c04fc9b31f)
|
||||||
|
]
|
||||||
|
coclass CMLangConvertCharset
|
||||||
|
{
|
||||||
|
[default] interface IMLangConvertCharset;
|
||||||
|
};
|
||||||
|
|
||||||
[
|
[
|
||||||
object,
|
object,
|
||||||
uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f),
|
uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f),
|
||||||
|
|
Loading…
Reference in New Issue