Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HNETCFG]

Browse source 
* Sync to Wine 1.3.37.

svn path=/trunk/; revision=55239
This commit is contained in:
Amine Khaldi 2012-01-27 13:09:03 +00:00
parent 2d45672a9d
commit 1cb7059396
15 changed files with 137 additions and 483 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/hnetcfg/CMakeLists.txt
View file

@ -6,6 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler()
spec2def(hnetcfg.dll hnetcfg.spec)
list(APPEND SOURCE
@ -15,8 +16,8 @@ list(APPEND SOURCE
policy.c
port.c
profile.c
regsvr.c
service.c
hnetcfg.rc
${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def)
add_library(hnetcfg SHARED ${SOURCE})

18
reactos/dll/win32/hnetcfg/apps.c
View file

@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
typedef struct fw_app
{
const INetFwAuthorizedApplicationVtbl *vtbl;
INetFwAuthorizedApplication INetFwAuthorizedApplication_iface;
LONG refs;
} fw_app;
static inline fw_app *impl_from_INetFwAuthorizedApplication( INetFwAuthorizedApplication *iface )
{
return (fw_app *)((char *)iface - FIELD_OFFSET( fw_app, vtbl ));
return CONTAINING_RECORD(iface, fw_app, INetFwAuthorizedApplication_iface);
}
static ULONG WINAPI fw_app_AddRef(
@ -262,7 +262,7 @@ static HRESULT WINAPI fw_app_put_Enabled(
fw_app *This = impl_from_INetFwAuthorizedApplication( iface );
FIXME("%p, %d\n", This, enabled);
return E_NOTIMPL;
return S_OK;
}
static const struct INetFwAuthorizedApplicationVtbl fw_app_vtbl =
@ -297,23 +297,23 @@ HRESULT NetFwAuthorizedApplication_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) );
if (!fa) return E_OUTOFMEMORY;
fa->vtbl = &fw_app_vtbl;
fa->INetFwAuthorizedApplication_iface.lpVtbl = &fw_app_vtbl;
fa->refs = 1;
*ppObj = &fa->vtbl;
*ppObj = &fa->INetFwAuthorizedApplication_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;
}
typedef struct fw_apps
{
const INetFwAuthorizedApplicationsVtbl *vtbl;
INetFwAuthorizedApplications INetFwAuthorizedApplications_iface;
LONG refs;
} fw_apps;
static inline fw_apps *impl_from_INetFwAuthorizedApplications( INetFwAuthorizedApplications *iface )
{
return (fw_apps *)((char *)iface - FIELD_OFFSET( fw_apps, vtbl ));
return CONTAINING_RECORD(iface, fw_apps, INetFwAuthorizedApplications_iface);
}
static ULONG WINAPI fw_apps_AddRef(
@ -490,10 +490,10 @@ HRESULT NetFwAuthorizedApplications_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) );
if (!fa) return E_OUTOFMEMORY;
fa->vtbl = &fw_apps_vtbl;
fa->INetFwAuthorizedApplications_iface.lpVtbl = &fw_apps_vtbl;
fa->refs = 1;
*ppObj = &fa->vtbl;
*ppObj = &fa->INetFwAuthorizedApplications_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;

32
reactos/dll/win32/hnetcfg/hnetcfg.c
View file

@ -23,6 +23,7 @@
#include "windef.h"
#include "winbase.h"
#include "objbase.h"
#include "rpcproxy.h"
#include "netfw.h"
#include "wine/debug.h"
@ -30,17 +31,19 @@
WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
static HINSTANCE instance;
typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj );
typedef struct
{
const struct IClassFactoryVtbl *vtbl;
IClassFactory IClassFactory_iface;
fnCreateInstance pfnCreateInstance;
} hnetcfg_cf;
static inline hnetcfg_cf *impl_from_IClassFactory( IClassFactory *iface )
{
return (hnetcfg_cf *)((char *)iface - FIELD_OFFSET( hnetcfg_cf, vtbl ));
return CONTAINING_RECORD(iface, hnetcfg_cf, IClassFactory_iface);
}
static HRESULT WINAPI hnetcfg_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj )
@ -107,8 +110,8 @@ static const struct IClassFactoryVtbl hnetcfg_cf_vtbl =
hnetcfg_cf_LockServer
};
static hnetcfg_cf fw_manager_cf = { &hnetcfg_cf_vtbl, NetFwMgr_create };
static hnetcfg_cf fw_app_cf = { &hnetcfg_cf_vtbl, NetFwAuthorizedApplication_create };
static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create };
static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create };
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
@ -118,6 +121,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
case DLL_WINE_PREATTACH:
return FALSE;
case DLL_PROCESS_ATTACH:
instance = hInstDLL;
DisableThreadLibraryCalls(hInstDLL);
break;
case DLL_PROCESS_DETACH:
@ -134,11 +138,11 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
if (IsEqualGUID( rclsid, &CLSID_NetFwMgr ))
{
cf = (IClassFactory *)&fw_manager_cf.vtbl;
cf = &fw_manager_cf.IClassFactory_iface;
}
else if (IsEqualGUID( rclsid, &CLSID_NetFwAuthorizedApplication ))
{
cf = (IClassFactory *)&fw_app_cf.vtbl;
cf = &fw_app_cf.IClassFactory_iface;
}
if (!cf) return CLASS_E_CLASSNOTAVAILABLE;
@ -149,3 +153,19 @@ HRESULT WINAPI DllCanUnloadNow( void )
{
return S_FALSE;
}
/***********************************************************************
* DllRegisterServer (HNETCFG.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance );
}
/***********************************************************************
* DllUnregisterServer (HNETCFG.@)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance );
}

35
reactos/dll/win32/hnetcfg/hnetcfg.idl Normal file
View file

@ -0,0 +1,35 @@
/*
* COM Classes for hnetcfg
*
* 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("HNetCfg.FwMgr"),
progid("HNetCfg.FwMgr"),
threading(both),
uuid(304ce942-6e39-40d8-943a-b913c40c9cd4)
]
coclass NetFwMgr { interface INetFwMgr; }
[
helpstring("HNetCfg.FwAuthorizedApplication"),
progid("HNetCfg.FwAuthorizedApplication"),
threading(both),
uuid(ec9846b3-2762-4a6b-a214-6acb603462d2)
]
coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; }

2
reactos/dll/win32/hnetcfg/hnetcfg.rbuild
View file

@ -14,6 +14,6 @@
<file>policy.c</file>
<file>port.c</file>
<file>profile.c</file>
<file>regsvr.c</file>
<file>service.c</file>
<file>hnetcfg.rc</file>
</module>

1
reactos/dll/win32/hnetcfg/hnetcfg.rc Normal file
View file

@ -0,0 +1 @@
1 WINE_REGISTRY hnetcfg.rgs

27
reactos/dll/win32/hnetcfg/hnetcfg.rgs Normal file
View file

@ -0,0 +1,27 @@
HKCR
{
NoRemove Interface
{
}
NoRemove CLSID
{
'{304CE942-6E39-40D8-943A-B913C40C9CD4}' = s 'HNetCfg.FwMgr'
{
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
ProgId = s 'HNetCfg.FwMgr'
}
'{EC9846B3-2762-4A6B-A214-6ACB603462D2}' = s 'HNetCfg.FwAuthorizedApplication'
{
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
ProgId = s 'HNetCfg.FwAuthorizedApplication'
}
}
'HNetCfg.FwMgr' = s 'HNetCfg.FwMgr'
{
CLSID = s '{304CE942-6E39-40D8-943A-B913C40C9CD4}'
}
'HNetCfg.FwAuthorizedApplication' = s 'HNetCfg.FwAuthorizedApplication'
{
CLSID = s '{EC9846B3-2762-4A6B-A214-6ACB603462D2}'
}
}

14
reactos/dll/win32/hnetcfg/hnetcfg_private.h
View file

@ -16,10 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
HRESULT NetFwMgr_create(IUnknown *, LPVOID *);
HRESULT NetFwPolicy_create(IUnknown *, LPVOID *);
HRESULT NetFwProfile_create(IUnknown *, LPVOID *);
HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *);
HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *);
HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *);
HRESULT NetFwServices_create(IUnknown *, LPVOID *);
HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT NetFwProfile_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

8
reactos/dll/win32/hnetcfg/manager.c
View file

@ -37,13 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
typedef struct fw_manager
{
const INetFwMgrVtbl *vtbl;
INetFwMgr INetFwMgr_iface;
LONG refs;
} fw_manager;
static inline fw_manager *impl_from_INetFwMgr( INetFwMgr *iface )
{
return (fw_manager *)((char *)iface - FIELD_OFFSET( fw_manager, vtbl ));
return CONTAINING_RECORD(iface, fw_manager, INetFwMgr_iface);
}
static ULONG WINAPI fw_manager_AddRef(
@ -230,10 +230,10 @@ HRESULT NetFwMgr_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) );
if (!fm) return E_OUTOFMEMORY;
fm->vtbl = &fw_manager_vtbl;
fm->INetFwMgr_iface.lpVtbl = &fw_manager_vtbl;
fm->refs = 1;
*ppObj = &fm->vtbl;
*ppObj = &fm->INetFwMgr_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;

8
reactos/dll/win32/hnetcfg/policy.c
View file

@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
typedef struct fw_policy
{
const INetFwPolicyVtbl *vtbl;
INetFwPolicy INetFwPolicy_iface;
LONG refs;
} fw_policy;
static inline fw_policy *impl_from_INetFwPolicy( INetFwPolicy *iface )
{
return (fw_policy *)((char *)iface - FIELD_OFFSET( fw_policy, vtbl ));
return CONTAINING_RECORD(iface, fw_policy, INetFwPolicy_iface);
}
static ULONG WINAPI fw_policy_AddRef(
@ -186,10 +186,10 @@ HRESULT NetFwPolicy_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) );
if (!fp) return E_OUTOFMEMORY;
fp->vtbl = &fw_policy_vtbl;
fp->INetFwPolicy_iface.lpVtbl = &fw_policy_vtbl;
fp->refs = 1;
*ppObj = &fp->vtbl;
*ppObj = &fp->INetFwPolicy_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;

16
reactos/dll/win32/hnetcfg/port.c
View file

@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
typedef struct fw_port
{
const INetFwOpenPortVtbl *vtbl;
INetFwOpenPort INetFwOpenPort_iface;
LONG refs;
} fw_port;
static inline fw_port *impl_from_INetFwOpenPort( INetFwOpenPort *iface )
{
return (fw_port *)((char *)iface - FIELD_OFFSET( fw_port, vtbl ));
return CONTAINING_RECORD(iface, fw_port, INetFwOpenPort_iface);
}
static ULONG WINAPI fw_port_AddRef(
@ -330,10 +330,10 @@ static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) );
if (!fp) return E_OUTOFMEMORY;
fp->vtbl = &fw_port_vtbl;
fp->INetFwOpenPort_iface.lpVtbl = &fw_port_vtbl;
fp->refs = 1;
*ppObj = &fp->vtbl;
*ppObj = &fp->INetFwOpenPort_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;
@ -341,13 +341,13 @@ static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj )
typedef struct fw_ports
{
const INetFwOpenPortsVtbl *vtbl;
INetFwOpenPorts INetFwOpenPorts_iface;
LONG refs;
} fw_ports;
static inline fw_ports *impl_from_INetFwOpenPorts( INetFwOpenPorts *iface )
{
return (fw_ports *)((char *)iface - FIELD_OFFSET( fw_ports, vtbl ));
return CONTAINING_RECORD(iface, fw_ports, INetFwOpenPorts_iface);
}
static ULONG WINAPI fw_ports_AddRef(
@ -536,10 +536,10 @@ HRESULT NetFwOpenPorts_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) );
if (!fp) return E_OUTOFMEMORY;
fp->vtbl = &fw_ports_vtbl;
fp->INetFwOpenPorts_iface.lpVtbl = &fw_ports_vtbl;
fp->refs = 1;
*ppObj = &fp->vtbl;
*ppObj = &fp->INetFwOpenPorts_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;

8
reactos/dll/win32/hnetcfg/profile.c
View file

@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
typedef struct fw_profile
{
const INetFwProfileVtbl *vtbl;
INetFwProfile INetFwProfile_iface;
LONG refs;
} fw_profile;
static inline fw_profile *impl_from_INetFwProfile( INetFwProfile *iface )
{
return (fw_profile *)((char *)iface - FIELD_OFFSET( fw_profile, vtbl ));
return CONTAINING_RECORD(iface, fw_profile, INetFwProfile_iface);
}
static ULONG WINAPI fw_profile_AddRef(
@ -319,10 +319,10 @@ HRESULT NetFwProfile_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) );
if (!fp) return E_OUTOFMEMORY;
fp->vtbl = &fw_profile_vtbl;
fp->INetFwProfile_iface.lpVtbl = &fw_profile_vtbl;
fp->refs = 1;
*ppObj = &fp->vtbl;
*ppObj = &fp->INetFwProfile_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;

430
reactos/dll/win32/hnetcfg/regsvr.c
View file

@ -1,430 +0,0 @@
/*
* self-registerable dll functions for hnetcfg.dll
*
* Copyright (C) 2003 John K. Hohm
*
* 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
*/
#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
#include "objbase.h"
#include "netfw.h"
#include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
/*
* Near the bottom of this file are the exported DllRegisterServer and
* DllUnregisterServer, which make all this worthwhile.
*/
/***********************************************************************
* interface for self-registering
*/
struct regsvr_interface
{
IID const *iid; /* NULL for end of list */
LPCSTR name; /* can be NULL to omit */
IID const *base_iid; /* can be NULL to omit */
int num_methods; /* can be <0 to omit */
CLSID const *ps_clsid; /* can be NULL to omit */
CLSID const *ps_clsid32; /* can be NULL to omit */
};
static HRESULT register_interfaces(struct regsvr_interface const *list);
static HRESULT unregister_interfaces(struct regsvr_interface const *list);
struct regsvr_coclass
{
CLSID const *clsid; /* NULL for end of list */
LPCSTR name; /* can be NULL to omit */
LPCSTR ips; /* can be NULL to omit */
LPCSTR ips32; /* can be NULL to omit */
LPCSTR ips32_tmodel; /* can be NULL to omit */
LPCSTR clsid_str; /* can be NULL to omit */
LPCSTR progid; /* can be NULL to omit */
};
static HRESULT register_coclasses(struct regsvr_coclass const *list);
static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
/***********************************************************************
* static string constants
*/
static WCHAR const interface_keyname[10] = {
'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 };
static WCHAR const base_ifa_keyname[14] = {
'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c',
'e', 0 };
static WCHAR const num_methods_keyname[11] = {
'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 };
static WCHAR const ps_clsid_keyname[15] = {
'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
'i', 'd', 0 };
static WCHAR const ps_clsid32_keyname[17] = {
'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
'i', 'd', '3', '2', 0 };
static WCHAR const clsid_keyname[6] = {
'C', 'L', 'S', 'I', 'D', 0 };
static WCHAR const ips_keyname[13] = {
'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
0 };
static WCHAR const ips32_keyname[15] = {
'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
'3', '2', 0 };
static WCHAR const progid_keyname[7] = {
'P', 'r', 'o', 'g', 'I', 'D', 0 };
static char const tmodel_valuename[] = "ThreadingModel";
/***********************************************************************
* static helper functions
*/
static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid);
static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
WCHAR const *value);
static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
char const *value);
/***********************************************************************
* register_interfaces
*/
static HRESULT register_interfaces(struct regsvr_interface const *list)
{
LONG res = ERROR_SUCCESS;
HKEY interface_key;
res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &interface_key, NULL);
if (res != ERROR_SUCCESS) goto error_return;
for (; res == ERROR_SUCCESS && list->iid; ++list) {
WCHAR buf[39];
HKEY iid_key;
StringFromGUID2(list->iid, buf, 39);
res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &iid_key, NULL);
if (res != ERROR_SUCCESS) goto error_close_interface_key;
if (list->name) {
res = RegSetValueExA(iid_key, NULL, 0, REG_SZ,
(CONST BYTE*)(list->name),
strlen(list->name) + 1);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
if (list->base_iid) {
res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
if (0 <= list->num_methods) {
static WCHAR const fmt[3] = { '%', 'd', 0 };
HKEY key;
res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &key, NULL);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
sprintfW(buf, fmt, list->num_methods);
res = RegSetValueExW(key, NULL, 0, REG_SZ,
(CONST BYTE*)buf,
(lstrlenW(buf) + 1) * sizeof(WCHAR));
RegCloseKey(key);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
if (list->ps_clsid) {
res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
if (list->ps_clsid32) {
res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
}
error_close_iid_key:
RegCloseKey(iid_key);
}
error_close_interface_key:
RegCloseKey(interface_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
/***********************************************************************
* unregister_interfaces
*/
static HRESULT unregister_interfaces(struct regsvr_interface const *list)
{
LONG res = ERROR_SUCCESS;
HKEY interface_key;
res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0,
KEY_READ | KEY_WRITE, &interface_key);
if (res == ERROR_FILE_NOT_FOUND) return S_OK;
if (res != ERROR_SUCCESS) goto error_return;
for (; res == ERROR_SUCCESS && list->iid; ++list) {
WCHAR buf[39];
StringFromGUID2(list->iid, buf, 39);
res = RegDeleteTreeW(interface_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
}
RegCloseKey(interface_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
/***********************************************************************
* register_coclasses
*/
static HRESULT register_coclasses(struct regsvr_coclass const *list)
{
LONG res = ERROR_SUCCESS;
HKEY coclass_key;
res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL);
if (res != ERROR_SUCCESS) goto error_return;
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
WCHAR buf[39];
HKEY clsid_key;
StringFromGUID2(list->clsid, buf, 39);
res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
if (list->name) {
res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
(CONST BYTE*)(list->name),
strlen(list->name) + 1);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
if (list->ips) {
res = register_key_defvalueA(clsid_key, ips_keyname, list->ips);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
if (list->ips32) {
HKEY ips32_key;
res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL,
&ips32_key, NULL);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
(CONST BYTE*)list->ips32,
lstrlenA(list->ips32) + 1);
if (res == ERROR_SUCCESS && list->ips32_tmodel)
res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ,
(CONST BYTE*)list->ips32_tmodel,
strlen(list->ips32_tmodel) + 1);
RegCloseKey(ips32_key);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
if (list->clsid_str) {
res = register_key_defvalueA(clsid_key, clsid_keyname,
list->clsid_str);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
if (list->progid) {
HKEY progid_key;
res = register_key_defvalueA(clsid_key, progid_keyname,
list->progid);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0,
NULL, 0, KEY_READ | KEY_WRITE, NULL,
&progid_key, NULL);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
res = register_key_defvalueW(progid_key, clsid_keyname, buf);
RegCloseKey(progid_key);
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
error_close_clsid_key:
RegCloseKey(clsid_key);
}
error_close_coclass_key:
RegCloseKey(coclass_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
/***********************************************************************
* unregister_coclasses
*/
static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
{
LONG res = ERROR_SUCCESS;
HKEY coclass_key;
res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
KEY_READ | KEY_WRITE, &coclass_key);
if (res == ERROR_FILE_NOT_FOUND) return S_OK;
if (res != ERROR_SUCCESS) goto error_return;
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
WCHAR buf[39];
StringFromGUID2(list->clsid, buf, 39);
res = RegDeleteTreeW(coclass_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
if (list->progid) {
res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
}
}
error_close_coclass_key:
RegCloseKey(coclass_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
/***********************************************************************
* regsvr_key_guid
*/
static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid)
{
WCHAR buf[39];
StringFromGUID2(guid, buf, 39);
return register_key_defvalueW(base, name, buf);
}
/***********************************************************************
* regsvr_key_defvalueW
*/
static LONG register_key_defvalueW(
HKEY base,
WCHAR const *name,
WCHAR const *value)
{
LONG res;
HKEY key;
res = RegCreateKeyExW(base, name, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &key, NULL);
if (res != ERROR_SUCCESS) return res;
res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
(lstrlenW(value) + 1) * sizeof(WCHAR));
RegCloseKey(key);
return res;
}
/***********************************************************************
* regsvr_key_defvalueA
*/
static LONG register_key_defvalueA(
HKEY base,
WCHAR const *name,
char const *value)
{
LONG res;
HKEY key;
res = RegCreateKeyExW(base, name, 0, NULL, 0,
KEY_READ | KEY_WRITE, NULL, &key, NULL);
if (res != ERROR_SUCCESS) return res;
res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
lstrlenA(value) + 1);
RegCloseKey(key);
return res;
}
/***********************************************************************
* coclass list
*/
static struct regsvr_coclass const coclass_list[] = {
{ &CLSID_NetFwMgr,
"NetFwMgr",
NULL,
"hnetcfg.dll",
"Both"
},
{ &CLSID_NetFwAuthorizedApplication,
"NetFwAuthorizedApplication",
NULL,
"hnetcfg.dll",
"Both"
},
{ NULL } /* list terminator */
};
/***********************************************************************
* interface list
*/
static struct regsvr_interface const interface_list[] = {
{ NULL } /* list terminator */
};
/***********************************************************************
* DllRegisterServer (HNETCFG.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
HRESULT hr;
TRACE("\n");
hr = register_coclasses(coclass_list);
if (SUCCEEDED(hr))
hr = register_interfaces(interface_list);
return hr;
}
/***********************************************************************
* DllUnregisterServer (HNETCFG.@)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
HRESULT hr;
TRACE("\n");
hr = unregister_coclasses(coclass_list);
if (SUCCEEDED(hr))
hr = unregister_interfaces(interface_list);
return hr;
}

16
reactos/dll/win32/hnetcfg/service.c
View file

@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
typedef struct fw_service
{
const INetFwServiceVtbl *vtbl;
INetFwService INetFwService_iface;
LONG refs;
} fw_service;
static inline fw_service *impl_from_INetFwService( INetFwService *iface )
{
return (fw_service *)((char *)iface - FIELD_OFFSET( fw_service, vtbl ));
return CONTAINING_RECORD(iface, fw_service, INetFwService_iface);
}
static ULONG WINAPI fw_service_AddRef(
@ -295,10 +295,10 @@ static HRESULT NetFwService_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) );
if (!fp) return E_OUTOFMEMORY;
fp->vtbl = &fw_service_vtbl;
fp->INetFwService_iface.lpVtbl = &fw_service_vtbl;
fp->refs = 1;
*ppObj = &fp->vtbl;
*ppObj = &fp->INetFwService_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;
@ -306,13 +306,13 @@ static HRESULT NetFwService_create( IUnknown *pUnkOuter, LPVOID *ppObj )
typedef struct fw_services
{
const INetFwServicesVtbl *vtbl;
INetFwServices INetFwServices_iface;
LONG refs;
} fw_services;
static inline fw_services *impl_from_INetFwServices( INetFwServices *iface )
{
return (fw_services *)((char *)iface - FIELD_OFFSET( fw_services, vtbl ));
return CONTAINING_RECORD(iface, fw_services, INetFwServices_iface);
}
static ULONG WINAPI fw_services_AddRef(
@ -469,10 +469,10 @@ HRESULT NetFwServices_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) );
if (!fp) return E_OUTOFMEMORY;
fp->vtbl = &fw_services_vtbl;
fp->INetFwServices_iface.lpVtbl = &fw_services_vtbl;
fp->refs = 1;
*ppObj = &fp->vtbl;
*ppObj = &fp->INetFwServices_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;

2
reactos/media/doc/README.WINE
View file

@ -64,7 +64,7 @@ reactos/dll/win32/fusion # Synced to Wine-1.3.37
reactos/dll/win32/gdiplus # Autosync
reactos/dll/win32/hhctrl.ocx # Autosync
reactos/dll/win32/hlink # Synced to Wine-1.3.37
reactos/dll/win32/hnetcfg # Autosync
reactos/dll/win32/hnetcfg # Synced to Wine-1.3.37
reactos/dll/win32/httpapi # Synced to Wine-1.3.37
reactos/dll/win32/iccvid # Autosync
reactos/dll/win32/icmp # Synced to Wine-0_9_10