* Sync to Wine 1.3.37.

svn path=/trunk/; revision=55273
This commit is contained in:
Amine Khaldi 2012-01-28 17:11:55 +00:00
parent 1b4f459fcc
commit 97dfbce665
10 changed files with 139 additions and 559 deletions

View file

@ -1,21 +1,24 @@
add_definitions(-D__WINESRC__)
add_definitions(
-D__WINESRC__
-DCOM_NO_WINDOWS_H)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler()
spec2def(mlang.dll mlang.spec)
list(APPEND SOURCE
mlang.c
regsvr.c
mlang.rc
${CMAKE_CURRENT_BINARY_DIR}/mlang_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mlang.def)
add_library(mlang SHARED ${SOURCE})
set_module_type(mlang win32dll ENTRYPOINT 0 )
set_module_type(mlang win32dll ENTRYPOINT 0)
target_link_libraries(mlang uuid wine)
add_delay_importlibs(mlang oleaut32)

View file

@ -33,6 +33,8 @@
#include "wingdi.h"
#include "winuser.h"
#include "ole2.h"
#include "objbase.h"
#include "rpcproxy.h"
#include "mlang.h"
#include "wine/unicode.h"
@ -47,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang);
static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj);
static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum);
static HINSTANCE instance;
static DWORD MLANG_tls_index; /* to store various per thead data */
/* FIXME:
@ -879,6 +882,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
{
switch(fdwReason) {
case DLL_PROCESS_ATTACH:
instance = hInstDLL;
MLANG_tls_index = TlsAlloc();
DisableThreadLibraryCalls(hInstDLL);
break;
@ -1417,11 +1421,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
typedef struct tagMLang_impl
{
const IMLangFontLinkVtbl *vtbl_IMLangFontLink;
const IMultiLanguageVtbl *vtbl_IMultiLanguage;
const IMultiLanguage3Vtbl *vtbl_IMultiLanguage3;
const IMLangFontLink2Vtbl *vtbl_IMLangFontLink2;
const IMLangLineBreakConsoleVtbl *vtbl_IMLangLineBreakConsole;
IMLangFontLink IMLangFontLink_iface;
IMultiLanguage IMultiLanguage_iface;
IMultiLanguage3 IMultiLanguage3_iface;
IMLangFontLink2 IMLangFontLink2_iface;
IMLangLineBreakConsole IMLangLineBreakConsole_iface;
LONG ref;
DWORD total_cp, total_scripts;
} MLang_impl;
@ -1459,7 +1463,7 @@ static HRESULT MLang_QueryInterface(
{
MLang_AddRef(This);
TRACE("Returning IID_IMLangFontLink %p ref = %d\n", This, This->ref);
*ppvObject = &(This->vtbl_IMLangFontLink);
*ppvObject = &This->IMLangFontLink_iface;
return S_OK;
}
@ -1467,7 +1471,7 @@ static HRESULT MLang_QueryInterface(
{
MLang_AddRef(This);
TRACE("Returning IID_IMLangFontLink2 %p ref = %d\n", This, This->ref);
*ppvObject = &(This->vtbl_IMLangFontLink2);
*ppvObject = &This->IMLangFontLink2_iface;
return S_OK;
}
@ -1475,14 +1479,14 @@ static HRESULT MLang_QueryInterface(
{
MLang_AddRef(This);
TRACE("Returning IID_IMultiLanguage %p ref = %d\n", This, This->ref);
*ppvObject = &(This->vtbl_IMultiLanguage);
*ppvObject = &This->IMultiLanguage_iface;
return S_OK;
}
if (IsEqualGUID(riid, &IID_IMultiLanguage2) )
{
MLang_AddRef(This);
*ppvObject = &(This->vtbl_IMultiLanguage3);
*ppvObject = &This->IMultiLanguage3_iface;
TRACE("Returning IID_IMultiLanguage2 %p ref = %d\n", This, This->ref);
return S_OK;
}
@ -1490,7 +1494,7 @@ static HRESULT MLang_QueryInterface(
if (IsEqualGUID(riid, &IID_IMultiLanguage3) )
{
MLang_AddRef(This);
*ppvObject = &(This->vtbl_IMultiLanguage3);
*ppvObject = &This->IMultiLanguage3_iface;
TRACE("Returning IID_IMultiLanguage3 %p ref = %d\n", This, This->ref);
return S_OK;
}
@ -1499,7 +1503,7 @@ static HRESULT MLang_QueryInterface(
{
MLang_AddRef(This);
TRACE("Returning IID_IMLangLineBreakConsole %p ref = %d\n", This, This->ref);
*ppvObject = &(This->vtbl_IMLangLineBreakConsole);
*ppvObject = &This->IMLangLineBreakConsole_iface;
return S_OK;
}
@ -1512,7 +1516,7 @@ static HRESULT MLang_QueryInterface(
typedef struct tagEnumCodePage_impl
{
const IEnumCodePageVtbl *vtbl_IEnumCodePage;
IEnumCodePage IEnumCodePage_iface;
LONG ref;
MIMECPINFO *cpinfo;
DWORD total, pos;
@ -1520,7 +1524,7 @@ typedef struct tagEnumCodePage_impl
static inline EnumCodePage_impl *impl_from_IEnumCodePage( IEnumCodePage *iface )
{
return CONTAINING_RECORD( iface, EnumCodePage_impl, vtbl_IEnumCodePage );
return CONTAINING_RECORD( iface, EnumCodePage_impl, IEnumCodePage_iface );
}
static HRESULT WINAPI fnIEnumCodePage_QueryInterface(
@ -1537,7 +1541,7 @@ static HRESULT WINAPI fnIEnumCodePage_QueryInterface(
{
IEnumCodePage_AddRef(iface);
TRACE("Returning IID_IEnumCodePage %p ref = %d\n", This, This->ref);
*ppvObject = &(This->vtbl_IEnumCodePage);
*ppvObject = &This->IEnumCodePage_iface;
return S_OK;
}
@ -1668,7 +1672,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags,
grfFlags = MIMECONTF_MIME_LATEST;
ecp = HeapAlloc( GetProcessHeap(), 0, sizeof (EnumCodePage_impl) );
ecp->vtbl_IEnumCodePage = &IEnumCodePage_vtbl;
ecp->IEnumCodePage_iface.lpVtbl = &IEnumCodePage_vtbl;
ecp->ref = 1;
ecp->pos = 0;
ecp->total = 0;
@ -1696,7 +1700,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags,
TRACE("enumerated %d codepages with flags %08x\n", ecp->total, grfFlags);
*ppEnumCodePage = (IEnumCodePage*) ecp;
*ppEnumCodePage = &ecp->IEnumCodePage_iface;
return S_OK;
}
@ -1705,7 +1709,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags,
typedef struct tagEnumScript_impl
{
const IEnumScriptVtbl *vtbl_IEnumScript;
IEnumScript IEnumScript_iface;
LONG ref;
SCRIPTINFO *script_info;
DWORD total, pos;
@ -1713,7 +1717,7 @@ typedef struct tagEnumScript_impl
static inline EnumScript_impl *impl_from_IEnumScript( IEnumScript *iface )
{
return CONTAINING_RECORD( iface, EnumScript_impl, vtbl_IEnumScript );
return CONTAINING_RECORD( iface, EnumScript_impl, IEnumScript_iface );
}
static HRESULT WINAPI fnIEnumScript_QueryInterface(
@ -1730,7 +1734,7 @@ static HRESULT WINAPI fnIEnumScript_QueryInterface(
{
IEnumScript_AddRef(iface);
TRACE("Returning IID_IEnumScript %p ref = %d\n", This, This->ref);
*ppvObject = &(This->vtbl_IEnumScript);
*ppvObject = &This->IEnumScript_iface;
return S_OK;
}
@ -1845,7 +1849,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags,
dwFlags = SCRIPTCONTF_SCRIPT_USER | SCRIPTCONTF_SCRIPT_HIDE | SCRIPTCONTF_SCRIPT_SYSTEM;
es = HeapAlloc( GetProcessHeap(), 0, sizeof (EnumScript_impl) );
es->vtbl_IEnumScript = &IEnumScript_vtbl;
es->IEnumScript_iface.lpVtbl = &IEnumScript_vtbl;
es->ref = 1;
es->pos = 0;
/* do not enumerate unicode flavours */
@ -1866,7 +1870,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags,
TRACE("enumerated %d scripts with flags %08x\n", es->total, dwFlags);
*ppEnumScript = (IEnumScript *)es;
*ppEnumScript = &es->IEnumScript_iface;
return S_OK;
}
@ -1875,7 +1879,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags,
static inline MLang_impl *impl_from_IMLangFontLink( IMLangFontLink *iface )
{
return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangFontLink );
return CONTAINING_RECORD( iface, MLang_impl, IMLangFontLink_iface );
}
static HRESULT WINAPI fnIMLangFontLink_QueryInterface(
@ -2113,7 +2117,7 @@ static const IMLangFontLinkVtbl IMLangFontLink_vtbl =
static inline MLang_impl *impl_from_IMultiLanguage( IMultiLanguage *iface )
{
return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMultiLanguage );
return CONTAINING_RECORD( iface, MLang_impl, IMultiLanguage_iface );
}
static HRESULT WINAPI fnIMultiLanguage_QueryInterface(
@ -2128,13 +2132,13 @@ static HRESULT WINAPI fnIMultiLanguage_QueryInterface(
static ULONG WINAPI fnIMultiLanguage_AddRef( IMultiLanguage* iface )
{
MLang_impl *This = impl_from_IMultiLanguage( iface );
return IMLangFontLink_AddRef( ((IMLangFontLink*)This) );
return IMLangFontLink_AddRef( &This->IMLangFontLink_iface );
}
static ULONG WINAPI fnIMultiLanguage_Release( IMultiLanguage* iface )
{
MLang_impl *This = impl_from_IMultiLanguage( iface );
return IMLangFontLink_Release( ((IMLangFontLink*)This) );
return IMLangFontLink_Release( &This->IMLangFontLink_iface );
}
static HRESULT WINAPI fnIMultiLanguage_GetNumberOfCodePageInfo(
@ -2202,7 +2206,7 @@ static HRESULT WINAPI fnIMultiLanguage_GetCharsetInfo(
PMIMECSETINFO pCharsetInfo)
{
MLang_impl *This = impl_from_IMultiLanguage( iface );
return IMultiLanguage3_GetCharsetInfo((IMultiLanguage3*)&This->vtbl_IMultiLanguage3, Charset, pCharsetInfo);
return IMultiLanguage3_GetCharsetInfo( &This->IMultiLanguage3_iface, Charset, pCharsetInfo );
}
static HRESULT WINAPI fnIMultiLanguage_IsConvertible(
@ -2306,7 +2310,7 @@ static HRESULT WINAPI fnIMultiLanguage_GetLcidFromRfc1766(
typedef struct tagEnumRfc1766_impl
{
const IEnumRfc1766Vtbl *vtbl_IEnumRfc1766;
IEnumRfc1766 IEnumRfc1766_iface;
LONG ref;
RFC1766INFO *info;
DWORD total, pos;
@ -2314,7 +2318,7 @@ typedef struct tagEnumRfc1766_impl
static inline EnumRfc1766_impl *impl_from_IEnumRfc1766( IEnumRfc1766 *iface )
{
return CONTAINING_RECORD( iface, EnumRfc1766_impl, vtbl_IEnumRfc1766 );
return CONTAINING_RECORD( iface, EnumRfc1766_impl, IEnumRfc1766_iface );
}
static HRESULT WINAPI fnIEnumRfc1766_QueryInterface(
@ -2331,7 +2335,7 @@ static HRESULT WINAPI fnIEnumRfc1766_QueryInterface(
{
IEnumRfc1766_AddRef(iface);
TRACE("Returning IID_IEnumRfc1766 %p ref = %d\n", This, This->ref);
*ppvObject = &(This->vtbl_IEnumRfc1766);
*ppvObject = &This->IEnumRfc1766_iface;
return S_OK;
}
@ -2490,7 +2494,7 @@ static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum)
TRACE("%04x, %p\n", LangId, ppEnum);
rfc = HeapAlloc( GetProcessHeap(), 0, sizeof(EnumRfc1766_impl) );
rfc->vtbl_IEnumRfc1766 = &IEnumRfc1766_vtbl;
rfc->IEnumRfc1766_iface.lpVtbl = &IEnumRfc1766_vtbl;
rfc->ref = 1;
rfc->pos = 0;
rfc->total = 0;
@ -2520,7 +2524,7 @@ static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum)
rfc->info = data.info;
rfc->total = data.total;
*ppEnum = (IEnumRfc1766 *)rfc;
*ppEnum = &rfc->IEnumRfc1766_iface;
return S_OK;
}
@ -2614,7 +2618,7 @@ static const IMultiLanguageVtbl IMultiLanguage_vtbl =
static inline MLang_impl *impl_from_IMultiLanguage3( IMultiLanguage3 *iface )
{
return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMultiLanguage3 );
return CONTAINING_RECORD( iface, MLang_impl, IMultiLanguage3_iface );
}
static HRESULT WINAPI fnIMultiLanguage2_QueryInterface(
@ -2936,7 +2940,7 @@ static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766Info(
if ((PRIMARYLANGID(LangId) != LANG_ENGLISH) &&
(last_lang != LangId)) {
FIXME("Only english names supported (requested: 0x%04x)\n", LangId);
FIXME("Only English names supported (requested: 0x%04x)\n", LangId);
last_lang = LangId;
}
@ -3275,7 +3279,7 @@ static const IMultiLanguage3Vtbl IMultiLanguage3_vtbl =
static inline MLang_impl *impl_from_IMLangFontLink2( IMLangFontLink2 *iface )
{
return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangFontLink2 );
return CONTAINING_RECORD( iface, MLang_impl, IMLangFontLink2_iface );
}
static HRESULT WINAPI fnIMLangFontLink2_QueryInterface(
@ -3464,7 +3468,7 @@ static const IMLangFontLink2Vtbl IMLangFontLink2_vtbl =
static inline MLang_impl *impl_from_IMLangLineBreakConsole( IMLangLineBreakConsole *iface )
{
return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangLineBreakConsole );
return CONTAINING_RECORD( iface, MLang_impl, IMLangLineBreakConsole_iface );
}
static HRESULT WINAPI fnIMLangLineBreakConsole_QueryInterface(
@ -3558,11 +3562,11 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj)
return CLASS_E_NOAGGREGATION;
mlang = HeapAlloc( GetProcessHeap(), 0, sizeof (MLang_impl) );
mlang->vtbl_IMLangFontLink = &IMLangFontLink_vtbl;
mlang->vtbl_IMultiLanguage = &IMultiLanguage_vtbl;
mlang->vtbl_IMultiLanguage3 = &IMultiLanguage3_vtbl;
mlang->vtbl_IMLangFontLink2 = &IMLangFontLink2_vtbl;
mlang->vtbl_IMLangLineBreakConsole = &IMLangLineBreakConsole_vtbl;
mlang->IMLangFontLink_iface.lpVtbl = &IMLangFontLink_vtbl;
mlang->IMultiLanguage_iface.lpVtbl = &IMultiLanguage_vtbl;
mlang->IMultiLanguage3_iface.lpVtbl = &IMultiLanguage3_vtbl;
mlang->IMLangFontLink2_iface.lpVtbl = &IMLangFontLink2_vtbl;
mlang->IMLangLineBreakConsole_iface.lpVtbl = &IMLangLineBreakConsole_vtbl;
mlang->total_cp = 0;
for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++)
@ -3587,8 +3591,28 @@ HRESULT WINAPI DllCanUnloadNow(void)
return dll_count == 0 ? S_OK : S_FALSE;
}
HRESULT WINAPI GetGlobalFontLinkObject(void)
/***********************************************************************
* DllRegisterServer (MLANG.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
FIXME("\n");
return __wine_register_resources( instance );
}
/***********************************************************************
* DllUnregisterServer (MLANG.@)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance );
}
HRESULT WINAPI GetGlobalFontLinkObject(void **unknown)
{
if (!unknown) return E_INVALIDARG;
FIXME("%p: stub\n", unknown);
return S_FALSE;
}

View file

@ -7,9 +7,10 @@
<include base="mlang">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<define name="COM_NO_WINDOWS_H" />
<redefine name="_WIN32_WINNT">0x600</redefine>
<file>mlang.c</file>
<file>regsvr.c</file>
<file>mlang.rc</file>
<library>wine</library>
<library>ole32</library>
<library>user32</library>

View file

@ -0,0 +1 @@
1 WINE_REGISTRY mlang.rgs

View file

@ -0,0 +1,21 @@
HKCR
{
NoRemove Interface
{
}
NoRemove CLSID
{
'{275C23E2-3747-11D0-9FEA-00AA003F8646}' = s 'Multi Language Support'
{
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
}
'{C04D65CF-B70D-11D0-B188-00AA0038C969}' = s 'Multi Language String'
{
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
}
'{D66D6F99-CDAA-11D0-B822-00C04FC9B31F}' = s 'Multi Language ConvertCharset'
{
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
}
}
}

View file

@ -12,4 +12,4 @@
@ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer()
@ stdcall GetGlobalFontLinkObject()
@ stdcall GetGlobalFontLinkObject(ptr)

View file

@ -0,0 +1,40 @@
/*
* COM Classes for mlang
*
* Copyright 2010 Alexandre Julliard
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
[
helpstring("Multi Language Support"),
threading(both),
uuid(275c23e2-3747-11d0-9fea-00aa003f8646)
]
coclass CMultiLanguage { interface IMultiLanguage; }
[
helpstring("Multi Language String"),
threading(both),
uuid(c04d65cf-b70d-11d0-b188-00aa0038c969)
]
coclass CMLangString { interface IMultiLanguage; }
[
helpstring("Multi Language ConvertCharset"),
threading(both),
uuid(d66d6f99-cdaa-11d0-b822-00c04fc9b31f)
]
coclass CMLangConvertCharset { interface IMultiLanguage; }

View file

@ -1,510 +0,0 @@
/*
* 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
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
#include "winreg.h"
#include "winerror.h"
#include "objbase.h"
#include "mlang.h"
#include "wine/debug.h"
#include "wine/unicode.h"
#include "initguid.h"
WINE_DEFAULT_DEBUG_CHANNEL(mlang);
/* This one should probably be defined in mlang.idl but MSDN claims it is no longer supported */
DEFINE_GUID(CLSID_CMLangString, 0xc04d65cf, 0xb70d, 0x11d0, 0xb1,0x88, 0x00,0xaa,0x00,0x38,0xc9,0x69);
/*
* Near the bottom of this file are the exported DllRegisterServer and
* DllUnregisterServer, which make all this worthwhile.
*/
/***********************************************************************
* interface for self-registering
*/
struct regsvr_interface
{
IID const *iid; /* NULL for end of list */
LPCSTR name; /* can be NULL to omit */
IID const *base_iid; /* can be NULL to omit */
int num_methods; /* can be <0 to omit */
CLSID const *ps_clsid; /* can be NULL to omit */
CLSID const *ps_clsid32; /* can be NULL to omit */
};
static HRESULT register_interfaces(struct regsvr_interface const *list);
static HRESULT unregister_interfaces(struct regsvr_interface const *list);
struct regsvr_coclass
{
CLSID const *clsid; /* NULL for end of list */
LPCSTR name; /* can be NULL to omit */
LPCSTR ips; /* can be NULL to omit */
LPCSTR ips32; /* can be NULL to omit */
LPCSTR ips32_tmodel; /* can be NULL to omit */
LPCSTR progid; /* can be NULL to omit */
LPCSTR viprogid; /* can be NULL to omit */
LPCSTR progid_extra; /* can be NULL to omit */
};
static HRESULT register_coclasses(struct regsvr_coclass const *list);
static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
/***********************************************************************
* static string constants
*/
static WCHAR const interface_keyname[10] = {
'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 };
static WCHAR const base_ifa_keyname[14] = {
'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c',
'e', 0 };
static WCHAR const num_methods_keyname[11] = {
'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 };
static WCHAR const ps_clsid_keyname[15] = {
'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
'i', 'd', 0 };
static WCHAR const ps_clsid32_keyname[17] = {
'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
'i', 'd', '3', '2', 0 };
static WCHAR const clsid_keyname[6] = {
'C', 'L', 'S', 'I', 'D', 0 };
static WCHAR const curver_keyname[7] = {
'C', 'u', 'r', 'V', 'e', 'r', 0 };
static WCHAR const ips_keyname[13] = {
'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
0 };
static WCHAR const ips32_keyname[15] = {
'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
'3', '2', 0 };
static WCHAR const progid_keyname[7] = {
'P', 'r', 'o', 'g', 'I', 'D', 0 };
static WCHAR const viprogid_keyname[25] = {
'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p',
'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D',
0 };
static char const tmodel_valuename[] = "ThreadingModel";
/***********************************************************************
* static helper functions
*/
static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid);
static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
WCHAR const *value);
static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
char const *value);
static LONG register_progid(WCHAR const *clsid,
char const *progid, char const *curver_progid,
char const *name, char const *extra);
/***********************************************************************
* register_interfaces
*/
static HRESULT register_interfaces(struct regsvr_interface const *list)
{
LONG res = ERROR_SUCCESS;
HKEY interface_key;
res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &interface_key, NULL);
if (res != ERROR_SUCCESS) goto error_return;
for (; res == ERROR_SUCCESS && list->iid; ++list) {
WCHAR buf[39];
HKEY iid_key;
StringFromGUID2(list->iid, buf, 39);
res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &iid_key, NULL);
if (res != ERROR_SUCCESS) goto error_close_interface_key;
if (list->name) {
res = RegSetValueExA(iid_key, NULL, 0, REG_SZ,
(CONST BYTE*)(list->name),
strlen(list->name) + 1);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
if (list->base_iid) {
res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
if (0 <= list->num_methods) {
static WCHAR const fmt[3] = { '%', 'd', 0 };
HKEY key;
res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &key, NULL);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
sprintfW(buf, fmt, list->num_methods);
res = RegSetValueExW(key, NULL, 0, REG_SZ,
(CONST BYTE*)buf,
(lstrlenW(buf) + 1) * sizeof(WCHAR));
RegCloseKey(key);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
if (list->ps_clsid) {
res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
if (list->ps_clsid32) {
res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
error_close_iid_key:
RegCloseKey(iid_key);
}
error_close_interface_key:
RegCloseKey(interface_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
/***********************************************************************
* unregister_interfaces
*/
static HRESULT unregister_interfaces(struct regsvr_interface const *list)
{
LONG res = ERROR_SUCCESS;
HKEY interface_key;
res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0,
KEY_READ | KEY_WRITE, &interface_key);
if (res == ERROR_FILE_NOT_FOUND) return S_OK;
if (res != ERROR_SUCCESS) goto error_return;
for (; res == ERROR_SUCCESS && list->iid; ++list) {
WCHAR buf[39];
StringFromGUID2(list->iid, buf, 39);
res = RegDeleteTreeW(interface_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
}
RegCloseKey(interface_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
/***********************************************************************
* register_coclasses
*/
static HRESULT register_coclasses(struct regsvr_coclass const *list)
{
LONG res = ERROR_SUCCESS;
HKEY coclass_key;
res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL);
if (res != ERROR_SUCCESS) goto error_return;
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
WCHAR buf[39];
HKEY clsid_key;
StringFromGUID2(list->clsid, buf, 39);
res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
if (list->name) {
res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
(CONST BYTE*)(list->name),
strlen(list->name) + 1);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
if (list->ips) {
res = register_key_defvalueA(clsid_key, ips_keyname, list->ips);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
if (list->ips32) {
HKEY ips32_key;
res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL,
&ips32_key, NULL);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
(CONST BYTE*)list->ips32,
lstrlenA(list->ips32) + 1);
if (res == ERROR_SUCCESS && list->ips32_tmodel)
res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ,
(CONST BYTE*)list->ips32_tmodel,
strlen(list->ips32_tmodel) + 1);
RegCloseKey(ips32_key);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
if (list->progid) {
res = register_key_defvalueA(clsid_key, progid_keyname,
list->progid);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
res = register_progid(buf, list->progid, NULL,
list->name, list->progid_extra);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
if (list->viprogid) {
res = register_key_defvalueA(clsid_key, viprogid_keyname,
list->viprogid);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
res = register_progid(buf, list->viprogid, list->progid,
list->name, list->progid_extra);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
error_close_clsid_key:
RegCloseKey(clsid_key);
}
error_close_coclass_key:
RegCloseKey(coclass_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
/***********************************************************************
* unregister_coclasses
*/
static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
{
LONG res = ERROR_SUCCESS;
HKEY coclass_key;
res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
KEY_READ | KEY_WRITE, &coclass_key);
if (res == ERROR_FILE_NOT_FOUND) return S_OK;
if (res != ERROR_SUCCESS) goto error_return;
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
WCHAR buf[39];
StringFromGUID2(list->clsid, buf, 39);
res = RegDeleteTreeW(coclass_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
if (list->progid) {
res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
}
if (list->viprogid) {
res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
}
}
error_close_coclass_key:
RegCloseKey(coclass_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
/***********************************************************************
* regsvr_key_guid
*/
static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid)
{
WCHAR buf[39];
StringFromGUID2(guid, buf, 39);
return register_key_defvalueW(base, name, buf);
}
/***********************************************************************
* regsvr_key_defvalueW
*/
static LONG register_key_defvalueW(
HKEY base,
WCHAR const *name,
WCHAR const *value)
{
LONG res;
HKEY key;
res = RegCreateKeyExW(base, name, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &key, NULL);
if (res != ERROR_SUCCESS) return res;
res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
(lstrlenW(value) + 1) * sizeof(WCHAR));
RegCloseKey(key);
return res;
}
/***********************************************************************
* regsvr_key_defvalueA
*/
static LONG register_key_defvalueA(
HKEY base,
WCHAR const *name,
char const *value)
{
LONG res;
HKEY key;
res = RegCreateKeyExW(base, name, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &key, NULL);
if (res != ERROR_SUCCESS) return res;
res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
lstrlenA(value) + 1);
RegCloseKey(key);
return res;
}
/***********************************************************************
* regsvr_progid
*/
static LONG register_progid(
WCHAR const *clsid,
char const *progid,
char const *curver_progid,
char const *name,
char const *extra)
{
LONG res;
HKEY progid_key;
res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0,
NULL, 0, KEY_READ | KEY_WRITE, NULL,
&progid_key, NULL);
if (res != ERROR_SUCCESS) return res;
if (name) {
res = RegSetValueExA(progid_key, NULL, 0, REG_SZ,
(CONST BYTE*)name, strlen(name) + 1);
if (res != ERROR_SUCCESS) goto error_close_progid_key;
}
if (clsid) {
res = register_key_defvalueW(progid_key, clsid_keyname, clsid);
if (res != ERROR_SUCCESS) goto error_close_progid_key;
}
if (curver_progid) {
res = register_key_defvalueA(progid_key, curver_keyname,
curver_progid);
if (res != ERROR_SUCCESS) goto error_close_progid_key;
}
if (extra) {
HKEY extra_key;
res = RegCreateKeyExA(progid_key, extra, 0,
NULL, 0, KEY_READ | KEY_WRITE, NULL,
&extra_key, NULL);
if (res == ERROR_SUCCESS)
RegCloseKey(extra_key);
}
error_close_progid_key:
RegCloseKey(progid_key);
return res;
}
/***********************************************************************
* coclass list
*/
static struct regsvr_coclass const coclass_list[] = {
{
&CLSID_CMultiLanguage,
"Multi Language Support",
NULL,
"mlang.dll",
"Both"
},
{
&CLSID_CMLangString,
"Multi Language String",
NULL,
"mlang.dll",
"Both"
},
{
&CLSID_CMLangConvertCharset,
"Multi Language ConvertCharset",
NULL,
"mlang.dll",
"Both"
},
{ NULL } /* list terminator */
};
/***********************************************************************
* interface list
*/
static struct regsvr_interface const interface_list[] = {
{ NULL } /* list terminator */
};
/***********************************************************************
* DllRegisterServer (MLANG.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
HRESULT hr;
TRACE("\n");
hr = register_coclasses(coclass_list);
if (SUCCEEDED(hr))
hr = register_interfaces(interface_list);
return hr;
}
/***********************************************************************
* DllUnregisterServer (MLANG.@)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
HRESULT hr;
TRACE("\n");
hr = unregister_coclasses(coclass_list);
if (SUCCEEDED(hr))
hr = unregister_interfaces(interface_list);
return hr;
}

View file

@ -750,7 +750,7 @@ cpp_quote("STDAPI Rfc1766ToLcidA(LCID *, LPCSTR);")
cpp_quote("STDAPI Rfc1766ToLcidW(LCID *, LPCWSTR);")
cpp_quote("#define Rfc1766ToLcid WINELIB_NAME_AW(Rfc1766ToLcid)")
cpp_quote("STDAPI GetGlobalFontLinkObject(void);")
cpp_quote("STDAPI GetGlobalFontLinkObject(void **unknown);")
cpp_quote("STDAPI IsConvertINetStringAvailable(DWORD, DWORD);")
cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);")
cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);")

View file

@ -88,7 +88,7 @@ reactos/dll/win32/mcicda # Synced to Wine-1.3.37
reactos/dll/win32/mciqtz32 # Autosync
reactos/dll/win32/mciseq # Synced to Wine-1.3.37
reactos/dll/win32/mciwave # Synced to Wine-1.3.37
reactos/dll/win32/mlang # Autosync
reactos/dll/win32/mlang # Synced to Wine-1.3.37
reactos/dll/win32/mpr # Autosync
reactos/dll/win32/mprapi # Autosync
reactos/dll/win32/msacm32 # Autosync