Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 16:26:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HNETCFG] Sync with Wine Staging 1.7.37. CORE-9246

Browse source 
svn path=/trunk/; revision=66870
This commit is contained in:
Amine Khaldi 2015-03-25 11:54:05 +00:00
parent b3f9d34e0f
commit 9d1ae195ab
4 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,9 +131,22 @@ HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret )
ITypeInfo_Release( info ); ITypeInfo_Release( info );
} }
*ret = typeinfo[tid]; *ret = typeinfo[tid];
ITypeInfo_AddRef(typeinfo[tid]);
return S_OK; 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( static HRESULT WINAPI fw_app_GetTypeInfo(
INetFwAuthorizedApplication *iface, INetFwAuthorizedApplication *iface,
UINT iTInfo, UINT iTInfo,
@ -243,8 +256,12 @@ static HRESULT WINAPI fw_app_get_IpVersion(
{ {
fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); fw_app *This = impl_from_INetFwAuthorizedApplication( iface );
FIXME("%p, %p\n", This, ipVersion); TRACE("%p, %p\n", This, ipVersion);
return E_NOTIMPL;
if (!ipVersion)
return E_POINTER;
*ipVersion = NET_FW_IP_VERSION_ANY;
return S_OK;
} }
static HRESULT WINAPI fw_app_put_IpVersion( static HRESULT WINAPI fw_app_put_IpVersion(
@ -253,8 +270,8 @@ static HRESULT WINAPI fw_app_put_IpVersion(
{ {
fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); fw_app *This = impl_from_INetFwAuthorizedApplication( iface );
FIXME("%p, %u\n", This, ipVersion); TRACE("%p, %u\n", This, ipVersion);
return E_NOTIMPL; return S_OK;
} }
static HRESULT WINAPI fw_app_get_Scope( static HRESULT WINAPI fw_app_get_Scope(

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

@ -103,9 +103,9 @@ 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_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create };
static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_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) { switch(fdwReason) {
case DLL_WINE_PREATTACH: case DLL_WINE_PREATTACH:
@ -114,6 +114,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
instance = hInstDLL; instance = hInstDLL;
DisableThreadLibraryCalls(hInstDLL); DisableThreadLibraryCalls(hInstDLL);
break; break;
case DLL_PROCESS_DETACH:
if (reserved) break;
release_typelib();
break;
} }
return TRUE; return TRUE;
} }

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

@ -49,6 +49,7 @@ enum type_id
}; };
HRESULT get_typeinfo(enum type_id, ITypeInfo **) DECLSPEC_HIDDEN; HRESULT get_typeinfo(enum type_id, ITypeInfo **) DECLSPEC_HIDDEN;
void release_typelib(void) DECLSPEC_HIDDEN;
HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

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

@ -79,7 +79,7 @@ reactos/dll/win32/fusion # Synced to WineStaging-1.7.37
reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.37 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.37
reactos/dll/win32/hhctrl.ocx # 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.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/httpapi # Synced to Wine-1.7.27
reactos/dll/win32/iccvid # Synced to Wine-1.7.27 reactos/dll/win32/iccvid # Synced to Wine-1.7.27
reactos/dll/win32/icmp # Out of sync reactos/dll/win32/icmp # Out of sync