Skip to content

Commit fa041e0

Browse files
committed
[HNETCFG] Sync with Wine Staging 1.9.16. CORE-11866
svn path=/trunk/; revision=72363
1 parent a0297b5 commit fa041e0

File tree

7 files changed

+357
-1
lines changed

7 files changed

+357
-1
lines changed

reactos/dll/win32/hnetcfg/apps.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ static REFIID tid_id[] =
100100
&IID_INetFwOpenPort,
101101
&IID_INetFwOpenPorts,
102102
&IID_INetFwPolicy,
103+
&IID_INetFwPolicy2,
103104
&IID_INetFwProfile
104105
};
105106

reactos/dll/win32/hnetcfg/hnetcfg.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ static const struct IClassFactoryVtbl hnetcfg_cf_vtbl =
102102
static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create };
103103
static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create };
104104
static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create };
105+
static hnetcfg_cf fw_policy2_cf = { { &hnetcfg_cf_vtbl }, NetFwPolicy2_create };
105106

106107
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
107108
{
@@ -140,6 +141,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
140141
{
141142
cf = &fw_openport_cf.IClassFactory_iface;
142143
}
144+
else if (IsEqualGUID( rclsid, &CLSID_NetFwPolicy2 ))
145+
{
146+
cf = &fw_policy2_cf.IClassFactory_iface;
147+
}
143148

144149
if (!cf) return CLASS_E_CLASSNOTAVAILABLE;
145150
return IClassFactory_QueryInterface( cf, iid, ppv );

reactos/dll/win32/hnetcfg/hnetcfg.idl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,11 @@ coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; }
4343
uuid(0ca545c6-37ad-4a6c-bf92-9f7610067ef5)
4444
]
4545
coclass NetFwOpenPort { interface INetFwOpenPort; }
46+
47+
[
48+
helpstring("HNetCfg.FwPolicy2"),
49+
progid("HNetCfg.FwPolicy2"),
50+
threading(both),
51+
uuid(e2b3c97f-6ae1-41ac-817a-f6f92166d7dd)
52+
]
53+
coclass NetFwPolicy2 { interface INetFwPolicy2; }

reactos/dll/win32/hnetcfg/hnetcfg.rgs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ HKCR
2020
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
2121
ProgId = s 'HNetCfg.FwOpenPort'
2222
}
23+
'{E2B3C97F-6AE1-41AC-817A-F6F92166D7DD}' = s 'HNetCfg.FwPolicy2'
24+
{
25+
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
26+
ProgId = s 'HNetCfg.FwPolicy2'
27+
}
2328
}
2429
'HNetCfg.FwMgr' = s 'HNetCfg.FwMgr'
2530
{
@@ -33,4 +38,8 @@ HKCR
3338
{
3439
CLSID = s '{0CA545C6-37AD-4A6C-BF92-9F7610067EF5}'
3540
}
41+
'HNetCfg.FwPolicy2' = s 'HNetCfg.FwPolicy2'
42+
{
43+
CLSID = s '{E2B3C97F-6AE1-41AC-817A-F6F92166D7DD}'
44+
}
3645
}

reactos/dll/win32/hnetcfg/hnetcfg_private.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ enum type_id
4545
INetFwOpenPort_tid,
4646
INetFwOpenPorts_tid,
4747
INetFwPolicy_tid,
48+
INetFwPolicy2_tid,
4849
INetFwProfile_tid,
4950
last_tid
5051
};
@@ -54,6 +55,7 @@ void release_typelib(void) DECLSPEC_HIDDEN;
5455

5556
HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
5657
HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
58+
HRESULT NetFwPolicy2_create(IUnknown *, void **) DECLSPEC_HIDDEN;
5759
HRESULT NetFwProfile_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
5860
HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
5961
HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

0 commit comments

Comments
 (0)