wiaservc: Convert coclasses registration to the IRegistrar mechanism.

This commit is contained in:
Alexandre Julliard 2010-12-18 14:43:33 +01:00
parent caf742bdcf
commit c09f188c98
4 changed files with 34 additions and 11 deletions

View file

@ -7,6 +7,8 @@ C_SRCS = \
wiadevmgr.c \
wiaservc_main.c
IDL_R_SRCS = wiaservc.idl
RC_SRCS = rsrc.rc
@MAKE_DLL_RULES@

View file

@ -0,0 +1,27 @@
/*
* COM Classes for wiaservc
*
* 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("WIA Device Manager"),
progid("WiaDevMgr.1"),
vi_progid("WiaDevMgr"),
uuid(a1f4e726-8cf1-11d1-bf92-0060081ed811)
]
coclass WiaDevMgr { interface IWiaDevMgr; }

View file

@ -10,18 +10,7 @@ DelReg = WiaServc.Reg
[WiaServc.Reg]
HKCR,"AppID\%CLSID_WiaDevMgr%",,,"WIA Device Manager"
HKCR,"AppID\%CLSID_WiaDevMgr%","LocalService",,"stisvc"
HKCR,"CLSID\%CLSID_WiaDevMgr%",,,"WIA Device Manager"
HKCR,"CLSID\%CLSID_WiaDevMgr%","AppID",,"%CLSID_WiaDevMgr%"
HKCR,"CLSID\%CLSID_WiaDevMgr%\ProgID",,,"WiaDevMgr.1"
HKCR,"CLSID\%CLSID_WiaDevMgr%\VersionIndependentProgID",,,"WiaDevMgr"
HKCR,"WiaDevMgr.1",,,"WIA Device Manager"
HKCR,"WiaDevMgr.1\CLSID",,,"%CLSID_WiaDevMgr%"
HKCR,"WiaDevMgr",,,"WIA Device Manager"
HKCR,"WiaDevMgr\CLSID",,,"%CLSID_WiaDevMgr%"
HKCR,"WiaDevMgr\CurVer",,,"WiaDevMgr.1"
HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","imgsvc",0x00010000,"StiSvc"

View file

@ -25,6 +25,7 @@
#include "winreg.h"
#include "advpub.h"
#include "olectl.h"
#include "rpcproxy.h"
#include "winsvc.h"
#include "wia_lh.h"
@ -164,10 +165,14 @@ static HRESULT register_server(BOOL do_register)
HRESULT WINAPI DllRegisterServer(void)
{
HRESULT hr = __wine_register_resources( hInst, NULL );
if (FAILED(hr)) return hr;
return register_server(TRUE);
}
HRESULT WINAPI DllUnregisterServer(void)
{
HRESULT hr = __wine_unregister_resources( hInst, NULL );
if (FAILED(hr)) return hr;
return register_server(FALSE);
}