ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winecrt0: Use atl100.dll directly to create a registrar instance.

This commit is contained in:
Jacek Caban 2012-11-21 11:12:37 +01:00 committed by Alexandre Julliard
parent f63617efb3
commit eb51602304
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/winecrt0/register.c
View File

@ -30,7 +30,7 @@
#include "rpcproxy.h" #include "rpcproxy.h"
#include "atliface.h" #include "atliface.h"
static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0}; static const WCHAR atl100W[] = {'a','t','l','1','0','0','.','d','l','l',0};
static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0};
static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0};
@ -38,32 +38,25 @@ struct reg_info
{ {
IRegistrar *registrar; IRegistrar *registrar;
BOOL do_register; BOOL do_register;
BOOL uninit;
HRESULT result; HRESULT result;
}; };
static HMODULE ole32; static HMODULE atl100;
static HRESULT (WINAPI *pCoInitialize)(LPVOID); static HRESULT (WINAPI *pAtlCreateRegistrar)(IRegistrar**);
static void (WINAPI *pCoUninitialize)(void);
static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*);
static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info )
{ {
if (!pCoCreateInstance) if (!pAtlCreateRegistrar)
{ {
if (!(ole32 = LoadLibraryW( ole32W )) || if (!(atl100 = LoadLibraryW( atl100W )) ||
!(pCoInitialize = (void *)GetProcAddress( ole32, "CoInitialize" )) || !(pAtlCreateRegistrar = (void *)GetProcAddress( atl100, "AtlCreateRegistrar" )))
!(pCoUninitialize = (void *)GetProcAddress( ole32, "CoUninitialize" )) ||
!(pCoCreateInstance = (void *)GetProcAddress( ole32, "CoCreateInstance" )))
{ {
info->result = E_NOINTERFACE; info->result = E_NOINTERFACE;
return NULL; return NULL;
} }
} }
info->uninit = SUCCEEDED( pCoInitialize( NULL ));
info->result = pCoCreateInstance( &CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, info->result = pAtlCreateRegistrar( &info->registrar );
&IID_IRegistrar, (void **)&info->registrar );
if (SUCCEEDED( info->result )) if (SUCCEEDED( info->result ))
{ {
WCHAR str[MAX_PATH]; WCHAR str[MAX_PATH];
@ -108,11 +101,9 @@ HRESULT __wine_register_resources( HMODULE module )
info.registrar = NULL; info.registrar = NULL;
info.do_register = TRUE; info.do_register = TRUE;
info.uninit = FALSE;
info.result = S_OK; info.result = S_OK;
EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info );
if (info.registrar) IRegistrar_Release( info.registrar ); if (info.registrar) IRegistrar_Release( info.registrar );
if (info.uninit) pCoUninitialize();
return info.result; return info.result;
} }
@ -122,10 +113,8 @@ HRESULT __wine_unregister_resources( HMODULE module )
info.registrar = NULL; info.registrar = NULL;
info.do_register = FALSE; info.do_register = FALSE;
info.uninit = FALSE;
info.result = S_OK; info.result = S_OK;
EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info );
if (info.registrar) IRegistrar_Release( info.registrar ); if (info.registrar) IRegistrar_Release( info.registrar );
if (info.uninit) pCoUninitialize();
return info.result; return info.result;
} }