system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 03:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

atl: Fix the name of the Registrar class id.

Browse source
This commit is contained in:
Alexandre Julliard 2010-11-12 11:49:44 +01:00
parent 32ad286d06
commit 9c4432f69d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/atl/atl.rgs
View file

@ -2,10 +2,10 @@ HKCR
{ {
ATL.Registrar = s 'Registrar Class' ATL.Registrar = s 'Registrar Class'
{ {
CLSID = s '%CLSID_ATLRegistrar%' CLSID = s '%CLSID_Registrar%'
} }
NoRemove CLSID { NoRemove CLSID {
ForceRemove '%CLSID_ATLRegistrar%' = s 'Registrar Class' ForceRemove '%CLSID_Registrar%' = s 'Registrar Class'
{ {
ProgID = s 'ATL.Registrar' ProgID = s 'ATL.Registrar'
InprocServer32 = s '%MODULE%' InprocServer32 = s '%MODULE%'

10
dlls/atl/registrar.c
View file

@ -743,7 +743,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject)
{ {
TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject);
if(IsEqualGUID(&CLSID_ATLRegistrar, clsid)) { if(IsEqualGUID(&CLSID_Registrar, clsid)) {
*ppvObject = &RegistrarCF; *ppvObject = &RegistrarCF;
return S_OK; return S_OK;
} }
@ -787,14 +787,14 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll,
static HRESULT do_register_server(BOOL do_register) static HRESULT do_register_server(BOOL do_register)
{ {
static const WCHAR CLSID_ATLRegistrarW[] = static const WCHAR CLSID_RegistrarW[] =
{'C','L','S','I','D','_','A','T','L','R','e','g','i','s','t','r','a','r',0}; {'C','L','S','I','D','_','R','e','g','i','s','t','r','a','r',0};
static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0}; static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0};
WCHAR clsid_str[40]; WCHAR clsid_str[40];
const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_ATLRegistrarW, clsid_str}, {NULL,NULL}}; const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_RegistrarW, clsid_str}, {NULL,NULL}};
StringFromGUID2(&CLSID_ATLRegistrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR));
return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map);
} }

2
include/atliface.idl
View file

@ -68,7 +68,7 @@ interface IRegistrar : IUnknown
[in] LPCOLESTR szType); [in] LPCOLESTR szType);
} }
cpp_quote("DEFINE_GUID(CLSID_ATLRegistrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);") cpp_quote("DEFINE_GUID(CLSID_Registrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);")
cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);") cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);")
cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);") cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);")