[ros-diffs] [akhaldi] 64352: [HNETCFG] * Sync with Wine 1.7.27. CORE-8540

Author: akhaldi
Date: Sat Sep 27 19:37:39 2014
New Revision: 64352

URL: http://svn.reactos.org/svn/reactos?rev=64352&view=rev
Log:
[HNETCFG]
* Sync with Wine 1.7.27.
CORE-8540

Modified:
    trunk/reactos/dll/win32/hnetcfg/apps.c
    trunk/reactos/dll/win32/hnetcfg/hnetcfg.c
    trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl
    trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs
    trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h
    trunk/reactos/dll/win32/hnetcfg/port.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/hnetcfg/apps.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/apps.c?r…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/apps.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/apps.c	[iso-8859-1] Sat Sep 27 19:37:39 2014
@@ -95,6 +95,7 @@
     &IID_INetFwAuthorizedApplication,
     &IID_INetFwAuthorizedApplications,
     &IID_INetFwMgr,
+    &IID_INetFwOpenPort,
     &IID_INetFwPolicy,
     &IID_INetFwProfile
 };

Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/hnetcfg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.c	[iso-8859-1] Sat Sep 27 19:37:39 2014
@@ -101,6 +101,7 @@
 
 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_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create };
 
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
@@ -131,6 +132,10 @@
     {
        cf = &fw_app_cf.IClassFactory_iface;
     }
+    else if (IsEqualGUID( rclsid, &CLSID_NetFwOpenPort ))
+    {
+       cf = &fw_openport_cf.IClassFactory_iface;
+    }
 
     if (!cf) return CLASS_E_CLASSNOTAVAILABLE;
     return IClassFactory_QueryInterface( cf, iid, ppv );

Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl	[iso-8859-1] Sat Sep 27 19:37:39 2014
@@ -35,3 +35,11 @@
     uuid(ec9846b3-2762-4a6b-a214-6acb603462d2)
 ]
 coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; }
+
+[
+    helpstring("HNetCfg.FwOpenPort"),
+    progid("HNetCfg.FwOpenPort"),
+    threading(both),
+    uuid(0ca545c6-37ad-4a6c-bf92-9f7610067ef5)
+]
+coclass NetFwOpenPort { interface INetFwOpenPort; }

Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs	[iso-8859-1] Sat Sep 27 19:37:39 2014
@@ -15,6 +15,11 @@
             InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both'
}
             ProgId = s 'HNetCfg.FwAuthorizedApplication'
         }
+        '{0CA545C6-37AD-4A6C-BF92-9F7610067EF5}' = s
'HNetCfg.FwOpenPort'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both'
}
+            ProgId = s 'HNetCfg.FwOpenPort'
+        }
     }
     'HNetCfg.FwMgr' = s 'HNetCfg.FwMgr'
     {
@@ -24,4 +29,8 @@
     {
         CLSID = s '{EC9846B3-2762-4A6B-A214-6ACB603462D2}'
     }
+    'HNetCfg.FwOpenPort' = s 'HNetCfg.FwOpenPort'
+    {
+        CLSID = s '{0CA545C6-37AD-4A6C-BF92-9F7610067EF5}'
+    }
 }

Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h	[iso-8859-1] Sat Sep 27 19:37:39
2014
@@ -42,6 +42,7 @@
     INetFwAuthorizedApplication_tid,
     INetFwAuthorizedApplications_tid,
     INetFwMgr_tid,
+    INetFwOpenPort_tid,
     INetFwPolicy_tid,
     INetFwProfile_tid,
     last_tid
@@ -55,6 +56,7 @@
 HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
+HRESULT NetFwOpenPort_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 
 #endif /* _HNETCFG_PRIVATE_H_ */

Modified: trunk/reactos/dll/win32/hnetcfg/port.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/port.c?r…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/port.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/port.c	[iso-8859-1] Sat Sep 27 19:37:39 2014
@@ -79,8 +79,9 @@
 {
     fw_port *This = impl_from_INetFwOpenPort( iface );
 
-    FIXME("%p %p\n", This, pctinfo);
-    return E_NOTIMPL;
+    TRACE("%p %p\n", This, pctinfo);
+    *pctinfo = 1;
+    return S_OK;
 }
 
 static HRESULT WINAPI fw_port_GetTypeInfo(
@@ -91,8 +92,8 @@
 {
     fw_port *This = impl_from_INetFwOpenPort( iface );
 
-    FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
-    return E_NOTIMPL;
+    TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
+    return get_typeinfo( INetFwOpenPort_tid, ppTInfo );
 }
 
 static HRESULT WINAPI fw_port_GetIDsOfNames(
@@ -104,9 +105,18 @@
     DISPID *rgDispId )
 {
     fw_port *This = impl_from_INetFwOpenPort( iface );
-
-    FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
-    return E_NOTIMPL;
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
+
+    hr = get_typeinfo( INetFwOpenPort_tid, &typeinfo );
+    if (SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId );
+        ITypeInfo_Release( typeinfo );
+    }
+    return hr;
 }
 
 static HRESULT WINAPI fw_port_Invoke(
@@ -121,10 +131,20 @@
     UINT *puArgErr )
 {
     fw_port *This = impl_from_INetFwOpenPort( iface );
-
-    FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember,
debugstr_guid(riid),
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember,
debugstr_guid(riid),
           lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
-    return E_NOTIMPL;
+
+    hr = get_typeinfo( INetFwOpenPort_tid, &typeinfo );
+    if (SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_Invoke( typeinfo, &This->INetFwOpenPort_iface,
dispIdMember,
+                               wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr );
+        ITypeInfo_Release( typeinfo );
+    }
+    return hr;
 }
 
 static HRESULT WINAPI fw_port_get_Name(
@@ -305,7 +325,7 @@
     fw_port_get_BuiltIn
 };
 
-static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj )
+HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj )
 {
     fw_port *fp;
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Sep 27 19:37:39 2014
@@ -78,7 +78,7 @@
 reactos/dll/win32/gdiplus             # Synced to Wine-1.7.27
 reactos/dll/win32/hhctrl.ocx          # Synced to Wine-1.7.27
 reactos/dll/win32/hlink               # Synced to Wine-1.7.17
-reactos/dll/win32/hnetcfg             # Synced to Wine-1.7.17
+reactos/dll/win32/hnetcfg             # Synced to Wine-1.7.27
 reactos/dll/win32/httpapi             # Synced to Wine-1.7.17
 reactos/dll/win32/iccvid              # Synced to Wine-1.7.17
 reactos/dll/win32/icmp                # Out of sync