marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Basic implementation of AtlModuleUpdateRegistryFromResourceD.

oldstable
Stefan Leichter 2005-08-08 11:06:42 +00:00 committed by Alexandre Julliard
parent 7257b70718
commit 4663d5d129
2 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/atl/atl_main.c
View File

@ -165,27 +165,6 @@ HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* p
return rc;
}
/***********************************************************************
* AtlModuleUpdateRegistryFromResourceD [ATL.@]
*
*/
HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes,
BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg)
{
HINSTANCE hInst = pM->m_hInst;
/* everything inside this function below this point
* should go into atl71.AtlUpdateRegistryFromResourceD
*/
WCHAR module_name[MAX_PATH];
GetModuleFileNameW(hInst, module_name, MAX_PATH);
FIXME("stub %p (%s), %s, %d, %p, %p\n", hInst, debugstr_w(module_name),
debugstr_w(lpszRes), bRegister, pMapEntries, pReg);
return S_OK;
}
/***********************************************************************
* AtlModuleRegisterServer [ATL.@]
*

45
dlls/atl/registrar.c
View File

@ -31,6 +31,7 @@
#define ATL_INITGUID
#include "atliface.h"
#include "atlbase.h"
#include "wine/debug.h"
#include "wine/unicode.h"
@ -753,14 +754,13 @@ HRESULT WINAPI ATL_DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObj
extern HINSTANCE hInst;
static HRESULT do_register_server(BOOL do_register)
static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, BOOL do_register)
{
WCHAR buf[MAX_PATH];
HRESULT hres;
IRegistrar *pRegistrar;
static const WCHAR wszModule[] = {'M','O','D','U','L','E',0};
static const WCHAR wszDll[] = {'a','t','l','.','d','l','l',0};
static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0};
static const WCHAR wszCLSID_ATLRegistrar[] =
{'C','L','S','I','D','_','A','T','L','R','e','g','i','s','t','r','a','r',0};
@ -772,14 +772,51 @@ static HRESULT do_register_server(BOOL do_register)
IRegistrar_AddReplacement(pRegistrar, wszCLSID_ATLRegistrar, buf);
if(do_register)
hres = IRegistrar_ResourceRegister(pRegistrar, wszDll, 1, wszRegistry);
hres = IRegistrar_ResourceRegisterSz(pRegistrar, wszDll, wszId, wszRegistry);
else
hres = IRegistrar_ResourceUnregister(pRegistrar, wszDll, 1, wszRegistry);
hres = IRegistrar_ResourceUnregisterSz(pRegistrar, wszDll, wszId, wszRegistry);
IRegistrar_Release(pRegistrar);
return hres;
}
static HRESULT do_register_server(BOOL do_register)
{
static const WCHAR wszDll[] = {'a','t','l','.','d','l','l',0};
UINT nID = 1;
return do_register_dll_server(wszDll, (LPCOLESTR) nID, do_register);
}
/***********************************************************************
* AtlModuleUpdateRegistryFromResourceD [ATL.@]
*
*/
HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes,
BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg)
{
HINSTANCE lhInst = pM->m_hInst;
/* everything inside this function below this point
* should go into atl71.AtlUpdateRegistryFromResourceD
*/
WCHAR module_name[MAX_PATH];
TRACE("stub %p (%s), %s, %d, %p, %p\n", hInst, debugstr_w(module_name),
debugstr_w(lpszRes), bRegister, pMapEntries, pReg);
if(pMapEntries || pReg) {
FIXME("MapEntries and Registrar parameter not supported\n");
return E_FAIL;
}
if(!GetModuleFileNameW(lhInst, module_name, MAX_PATH)) {
FIXME("%p (%s) did not get module name\n",
lhInst, debugstr_w(module_name));
return E_FAIL;
}
return do_register_dll_server(module_name, lpszRes, bRegister);
}
/***********************************************************************
* DllRegisterServer (ATL.@)
*/