Skip to content

W
wine-cw
Commit 54f851bb authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

hnetcfg: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 34a94ea3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 34 deletions
dlls/hnetcfg/Makefile.in
View file @ 54f851bb
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = hnetcfg.dll
IMPORTS = oleaut32 ole32 advapi32 mpr uuid
DELAYIMPORTS = ws2_32 winhttp shcore xmllite
......
dlls/hnetcfg/apps.c
View file @ 54f851bb
......@@ -130,7 +130,7 @@ HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret )
hr = LoadRegTypeLib( &LIBID_NetFwPublicTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &lib );
if (FAILED(hr))
{
ERR("LoadRegTypeLib failed: %08x\n", hr);
ERR("LoadRegTypeLib failed: %08lx\n", hr);
return hr;
}
if (InterlockedCompareExchangePointer( (void **)&typelib, lib, NULL ))
......@@ -143,7 +143,7 @@ HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret )
hr = ITypeLib_GetTypeInfoOfGuid( typelib, tid_id[tid], &info );
if (FAILED(hr))
{
ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_id[tid]), hr);
ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_id[tid]), hr);
return hr;
}
if (InterlockedCompareExchangePointer( (void **)(typeinfo + tid), info, NULL ))
......@@ -174,7 +174,7 @@ static HRESULT WINAPI fw_app_GetTypeInfo(
{
fw_app *This = impl_from_INetFwAuthorizedApplication( iface );
TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo( INetFwAuthorizedApplication_tid, ppTInfo );
}
......@@ -190,7 +190,7 @@ static HRESULT WINAPI fw_app_GetIDsOfNames(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo( INetFwAuthorizedApplication_tid, &typeinfo );
if (SUCCEEDED(hr))
......@@ -216,7 +216,7 @@ static HRESULT WINAPI fw_app_Invoke(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo( INetFwAuthorizedApplication_tid, &typeinfo );
......@@ -519,7 +519,7 @@ static HRESULT WINAPI fw_apps_GetTypeInfo(
{
fw_apps *This = impl_from_INetFwAuthorizedApplications( iface );
TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo( INetFwAuthorizedApplications_tid, ppTInfo );
}
......@@ -535,7 +535,7 @@ static HRESULT WINAPI fw_apps_GetIDsOfNames(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo( INetFwAuthorizedApplications_tid, &typeinfo );
if (SUCCEEDED(hr))
......@@ -561,7 +561,7 @@ static HRESULT WINAPI fw_apps_Invoke(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo( INetFwAuthorizedApplications_tid, &typeinfo );
......
dlls/hnetcfg/hnetcfg.c
View file @ 54f851bb
......@@ -118,7 +118,7 @@ static hnetcfg_cf upnpnat_cf = { { &hnetcfg_cf_vtbl }, IUPnPNAT_create };
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
{
TRACE("(0x%p, %d, %p)\n", hInstDLL, fdwReason, reserved);
TRACE("(0x%p, %ld, %p)\n", hInstDLL, fdwReason, reserved);
switch(fdwReason) {
case DLL_PROCESS_ATTACH:
......
dlls/hnetcfg/manager.c
View file @ 54f851bb
......@@ -106,7 +106,7 @@ static HRESULT WINAPI fw_manager_GetTypeInfo(
{
fw_manager *This = impl_from_INetFwMgr( iface );
TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo( INetFwMgr_tid, ppTInfo );
}
......@@ -122,7 +122,7 @@ static HRESULT WINAPI fw_manager_GetIDsOfNames(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo( INetFwMgr_tid, &typeinfo );
if (SUCCEEDED(hr))
......@@ -148,7 +148,7 @@ static HRESULT WINAPI fw_manager_Invoke(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo( INetFwMgr_tid, &typeinfo );
......@@ -202,7 +202,7 @@ static HRESULT WINAPI fw_manager_IsPortAllowed(
{
fw_manager *This = impl_from_INetFwMgr( iface );
FIXME("%p, %s, %u, %d, %s, %u, %p, %p\n", This, debugstr_w(imageFileName),
FIXME("%p, %s, %u, %ld, %s, %u, %p, %p\n", This, debugstr_w(imageFileName),
ipVersion, portNumber, debugstr_w(localAddress), ipProtocol, allowed, restricted);
return E_NOTIMPL;
}
......
dlls/hnetcfg/policy.c
View file @ 54f851bb
......@@ -129,7 +129,7 @@ static HRESULT WINAPI netfw_rules_GetTypeInfo(
{
fw_rules *This = impl_from_INetFwRules( iface );
TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo( INetFwRules_tid, ppTInfo );
}
......@@ -145,7 +145,7 @@ static HRESULT WINAPI netfw_rules_GetIDsOfNames(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo( INetFwRules_tid, &typeinfo );
if (SUCCEEDED(hr))
......@@ -171,7 +171,7 @@ static HRESULT WINAPI netfw_rules_Invoke(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo( INetFwRules_tid, &typeinfo );
......@@ -340,7 +340,7 @@ static HRESULT WINAPI fw_policy_GetTypeInfo(
{
fw_policy *This = impl_from_INetFwPolicy( iface );
TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo( INetFwPolicy_tid, ppTInfo );
}
......@@ -356,7 +356,7 @@ static HRESULT WINAPI fw_policy_GetIDsOfNames(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo( INetFwPolicy_tid, &typeinfo );
if (SUCCEEDED(hr))
......@@ -382,7 +382,7 @@ static HRESULT WINAPI fw_policy_Invoke(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo( INetFwPolicy_tid, &typeinfo );
......@@ -505,7 +505,7 @@ static HRESULT WINAPI fwpolicy2_GetTypeInfo(INetFwPolicy2 *iface, UINT iTInfo, L
{
fw_policy2 *This = impl_from_INetFwPolicy2( iface );
TRACE("%p %u %u %p\n", This, iTInfo, lcid, info);
TRACE("%p %u %lu %p\n", This, iTInfo, lcid, info);
return get_typeinfo( INetFwPolicy2_tid, info );
}
......@@ -516,7 +516,7 @@ static HRESULT WINAPI fwpolicy2_GetIDsOfNames(INetFwPolicy2 *iface, REFIID riid,
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo( INetFwPolicy2_tid, &typeinfo );
if (SUCCEEDED(hr))
......@@ -534,7 +534,7 @@ static HRESULT WINAPI fwpolicy2_Invoke(INetFwPolicy2 *iface, DISPID dispIdMember
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo( INetFwPolicy2_tid, &typeinfo );
......@@ -661,7 +661,7 @@ static HRESULT WINAPI fwpolicy2_EnableRuleGroup(INetFwPolicy2 *iface, LONG bitma
{
fw_policy2 *This = impl_from_INetFwPolicy2( iface );
FIXME("%p %d %s %d\n", This, bitmask, debugstr_w(group), enable);
FIXME("%p %ld %s %d\n", This, bitmask, debugstr_w(group), enable);
return E_NOTIMPL;
}
......@@ -669,7 +669,7 @@ static HRESULT WINAPI fwpolicy2_IsRuleGroupEnabled(INetFwPolicy2 *iface, LONG bi
{
fw_policy2 *This = impl_from_INetFwPolicy2( iface );
FIXME("%p %d %s %p\n", This, bitmask, debugstr_w(group), enabled);
FIXME("%p %ld %s %p\n", This, bitmask, debugstr_w(group), enabled);
return E_NOTIMPL;
}
......
dlls/hnetcfg/profile.c
View file @ 54f851bb
......@@ -106,7 +106,7 @@ static HRESULT WINAPI fw_profile_GetTypeInfo(
{
fw_profile *This = impl_from_INetFwProfile( iface );
TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo( INetFwProfile_tid, ppTInfo );
}
......@@ -122,7 +122,7 @@ static HRESULT WINAPI fw_profile_GetIDsOfNames(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
TRACE("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo( INetFwProfile_tid, &typeinfo );
if (SUCCEEDED(hr))
......@@ -148,7 +148,7 @@ static HRESULT WINAPI fw_profile_Invoke(
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
TRACE("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo( INetFwProfile_tid, &typeinfo );
......
dlls/hnetcfg/service.c
View file @ 54f851bb
......@@ -105,7 +105,7 @@ static HRESULT WINAPI fw_service_GetTypeInfo(
{
fw_service *This = impl_from_INetFwService( iface );
FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
FIXME("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
......@@ -119,7 +119,7 @@ static HRESULT WINAPI fw_service_GetIDsOfNames(
{
fw_service *This = impl_from_INetFwService( iface );
FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
FIXME("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
return E_NOTIMPL;
}
......@@ -136,7 +136,7 @@ static HRESULT WINAPI fw_service_Invoke(
{
fw_service *This = impl_from_INetFwService( iface );
FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
FIXME("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
......@@ -375,7 +375,7 @@ static HRESULT WINAPI fw_services_GetTypeInfo(
{
fw_services *This = impl_from_INetFwServices( iface );
FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
FIXME("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
......@@ -389,7 +389,7 @@ static HRESULT WINAPI fw_services_GetIDsOfNames(
{
fw_services *This = impl_from_INetFwServices( iface );
FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
FIXME("%p %s %p %u %lu %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
return E_NOTIMPL;
}
......@@ -406,7 +406,7 @@ static HRESULT WINAPI fw_services_Invoke(
{
fw_services *This = impl_from_INetFwServices( iface );
FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
FIXME("%p %ld %s %ld %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment