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

explorerframe: Convert dll registration to the IRegistrar mechanism.

Browse source
This commit is contained in:
Alexandre Julliard 2010-12-10 15:02:43 +01:00
parent ba709a1d45
commit a967d985c2
4 changed files with 13 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/explorerframe/Makefile.in
View file

@ -6,8 +6,9 @@ C_SRCS = \
explorerframe_main.c \
nstc.c
IDL_R_SRCS = explorerframe.idl
RC_SRCS = \
eframe.rc \
version.rc
@MAKE_DLL_RULES@

12
dlls/explorerframe/eframe.rc → dlls/explorerframe/explorerframe.idl
View file

@ -1,7 +1,7 @@
/*
* ExplorerFrame main resource file
* COM Classes for explorerframe
*
* Copyright 2010 David Hedberg
* 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
@ -18,5 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* @makedep: explorerframe.inf */
REGINST REGINST explorerframe.inf
[
helpstring("Shell Name Space ListView"),
threading(apartment),
uuid(ae054212-3535-4430-83ed-d501aa6680e6)
]
coclass NamespaceTreeControl { interface INameSpaceTreeControl2; }

17
dlls/explorerframe/explorerframe.inf
View file

@ -1,17 +0,0 @@
[version]
Signature="$CHICAGO$"
[RegisterDll]
AddReg=Classes.Reg
[UnregisterDll]
DelReg=Classes.Reg
[Classes.Reg]
; For some reason called "ListView" in the registry.
HKCR,"CLSID\%CLSID_NamespaceTreeControl%",,,"Shell Name Space ListView"
HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32",,,"%MODULE%"
HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32","ThreadingModel",,"Apartment"
[Strings]
MODULE="explorerframe.dll"

67
dlls/explorerframe/explorerframe_main.c
View file

@ -30,8 +30,8 @@
#include "winuser.h"
#include "winreg.h"
#include "shlwapi.h"
#include "advpub.h"
#include "shobjidl.h"
#include "rpcproxy.h"
#include "wine/debug.h"
@ -208,73 +208,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
return CLASS_E_CLASSNOTAVAILABLE;
}
/*************************************************************************
* Register/Unregister DLL, based on shdocvw/factory.c
*/
static HRESULT reg_install(LPCSTR section, const STRTABLEA *strtable)
{
HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable);
HMODULE hadvpack;
HRESULT hres;
static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
hadvpack = LoadLibraryW(advpackW);
pRegInstall = (void *)GetProcAddress(hadvpack, "RegInstall");
hres = pRegInstall(explorerframe_hinstance, section, strtable);
FreeLibrary(hadvpack);
return hres;
}
#define INF_SET_CLSID(clsid) \
do \
{ \
static CHAR name[] = "CLSID_" #clsid; \
\
pse[i].pszName = name; \
clsids[i++] = &CLSID_ ## clsid; \
} while (0)
static HRESULT register_server(BOOL doregister)
{
STRTABLEA strtable;
STRENTRYA pse[1];
static CLSID const *clsids[1];
unsigned int i = 0;
HRESULT hres;
INF_SET_CLSID(NamespaceTreeControl);
for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++)
{
pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39);
sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0],
clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4],
clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]);
}
strtable.cEntries = sizeof(pse)/sizeof(pse[0]);
strtable.pse = pse;
hres = reg_install(doregister ? "RegisterDll" : "UnregisterDll", &strtable);
for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++)
HeapFree(GetProcessHeap(), 0, pse[i].pszValue);
return hres;
}
#undef INF_SET_CLSID
/*************************************************************************
* DllRegisterServer (ExplorerFrame.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return register_server(TRUE);
return __wine_register_resources( explorerframe_hinstance, NULL );
}
/*************************************************************************
@ -282,5 +221,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return register_server(FALSE);
return __wine_unregister_resources( explorerframe_hinstance, NULL );
}