[ros-diffs] [akhaldi] 66870: [HNETCFG] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Wed Mar 25 11:54:05 2015
New Revision: 66870

URL: http://svn.reactos.org/svn/reactos?rev=66870&view=rev
Log:
[HNETCFG] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/win32/hnetcfg/apps.c
    trunk/reactos/dll/win32/hnetcfg/hnetcfg.c
    trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h
    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] Wed Mar 25 11:54:05 2015
@@ -131,7 +131,20 @@
             ITypeInfo_Release( info );
     }
     *ret = typeinfo[tid];
-    return S_OK;
+    ITypeInfo_AddRef(typeinfo[tid]);
+    return S_OK;
+}
+
+void release_typelib(void)
+{
+    unsigned i;
+
+    for (i = 0; i < sizeof(typeinfo)/sizeof(*typeinfo); i++)
+        if (typeinfo[i])
+            ITypeInfo_Release(typeinfo[i]);
+
+    if (typelib)
+        ITypeLib_Release(typelib);
 }
 
 static HRESULT WINAPI fw_app_GetTypeInfo(
@@ -243,8 +256,12 @@
 {
     fw_app *This = impl_from_INetFwAuthorizedApplication( iface );
 
-    FIXME("%p, %p\n", This, ipVersion);
-    return E_NOTIMPL;
+    TRACE("%p, %p\n", This, ipVersion);
+
+    if (!ipVersion)
+        return E_POINTER;
+    *ipVersion = NET_FW_IP_VERSION_ANY;
+    return S_OK;
 }
 
 static HRESULT WINAPI fw_app_put_IpVersion(
@@ -253,8 +270,8 @@
 {
     fw_app *This = impl_from_INetFwAuthorizedApplication( iface );
 
-    FIXME("%p, %u\n", This, ipVersion);
-    return E_NOTIMPL;
+    TRACE("%p, %u\n", This, ipVersion);
+    return S_OK;
 }
 
 static HRESULT WINAPI fw_app_get_Scope(

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] Wed Mar 25 11:54:05 2015
@@ -103,9 +103,9 @@
 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)
+BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
 {
-    TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved);
+    TRACE("(0x%p, %d, %p)\n", hInstDLL, fdwReason, reserved);
 
     switch(fdwReason) {
         case DLL_WINE_PREATTACH:
@@ -113,6 +113,10 @@
         case DLL_PROCESS_ATTACH:
             instance = hInstDLL;
             DisableThreadLibraryCalls(hInstDLL);
+            break;
+        case DLL_PROCESS_DETACH:
+            if (reserved) break;
+            release_typelib();
             break;
     }
     return TRUE;

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] Wed Mar 25 11:54:05
2015
@@ -49,6 +49,7 @@
 };
 
 HRESULT get_typeinfo(enum type_id, ITypeInfo **) DECLSPEC_HIDDEN;
+void release_typelib(void) DECLSPEC_HIDDEN;
 
 HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

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] Wed Mar 25 11:54:05 2015
@@ -79,7 +79,7 @@
 reactos/dll/win32/gdiplus             # Synced to WineStaging-1.7.37
 reactos/dll/win32/hhctrl.ocx          # Synced to Wine-1.7.27
 reactos/dll/win32/hlink               # Synced to Wine-1.7.27
-reactos/dll/win32/hnetcfg             # Synced to Wine-1.7.27
+reactos/dll/win32/hnetcfg             # Synced to WineStaging-1.7.37
 reactos/dll/win32/httpapi             # Synced to Wine-1.7.27
 reactos/dll/win32/iccvid              # Synced to Wine-1.7.27
 reactos/dll/win32/icmp                # Out of sync