[PATCH 25/27] dlls/hnetcfg: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Thu Feb 10 01:43:43 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/hnetcfg/Makefile.in | 1 -
dlls/hnetcfg/apps.c | 16 ++++++-----
dlls/hnetcfg/hnetcfg.c | 2 +
dlls/hnetcfg/manager.c | 8 +++---
dlls/hnetcfg/policy.c | 22 ++++++++-------
dlls/hnetcfg/port.c | 66 +++++++++++++++++++++++-----------------------
dlls/hnetcfg/profile.c | 6 ++--
dlls/hnetcfg/service.c | 12 ++++----
8 files changed, 66 insertions(+), 67 deletions(-)
diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in
index 926eec4e476..0ff7c511eb4 100644
--- a/dlls/hnetcfg/Makefile.in
+++ b/dlls/hnetcfg/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = hnetcfg.dll
IMPORTS = oleaut32 ole32 advapi32 mpr uuid
DELAYIMPORTS = ws2_32 winhttp shcore xmllite
diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c
index 9f0b30cd28a..842ead499fb 100644
--- a/dlls/hnetcfg/apps.c
+++ b/dlls/hnetcfg/apps.c
@@ -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 );
diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c
index 96b86e690e8..70c49d6806a 100644
--- a/dlls/hnetcfg/hnetcfg.c
+++ b/dlls/hnetcfg/hnetcfg.c
@@ -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:
diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c
index fda69729901..fe93a3a8da0 100644
--- a/dlls/hnetcfg/manager.c
+++ b/dlls/hnetcfg/manager.c
@@ -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;
}
diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c
index 7bdc1563d90..3426fc82304 100644
--- a/dlls/hnetcfg/policy.c
+++ b/dlls/hnetcfg/policy.c
@@ -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;
}
diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c
index 47bfc16be79..bda9455a2b5 100644
--- a/dlls/hnetcfg/port.c
+++ b/dlls/hnetcfg/port.c
@@ -319,7 +319,7 @@ static BOOL open_gateway_connection(void)
upnp_gateway_connection.connection = WinHttpConnect ( upnp_gateway_connection.session, hostname, url.nPort, 0 );
if (!upnp_gateway_connection.connection)
{
- WARN( "WinHttpConnect error %u.\n", GetLastError() );
+ WARN( "WinHttpConnect error %lu.\n", GetLastError() );
return FALSE;
}
return TRUE;
@@ -344,13 +344,13 @@ static BOOL get_control_url(void)
if (!WinHttpSendRequest( request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0 ))
{
- WARN( "Error sending request %u.\n", GetLastError() );
+ WARN( "Error sending request %lu.\n", GetLastError() );
WinHttpCloseHandle( request );
return FALSE;
}
if (!WinHttpReceiveResponse(request, NULL))
{
- WARN( "Error receiving response %u.\n", GetLastError() );
+ WARN( "Error receiving response %lu.\n", GetLastError() );
WinHttpCloseHandle( request );
return FALSE;
}
@@ -358,7 +358,7 @@ static BOOL get_control_url(void)
if (!WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER,
NULL, &status, &size, NULL) || status != HTTP_STATUS_OK )
{
- WARN( "Error response from server, error %u, http status %u.\n", GetLastError(), status );
+ WARN( "Error response from server, error %lu, http status %lu.\n", GetLastError(), status );
WinHttpCloseHandle( request );
return FALSE;
}
@@ -456,12 +456,12 @@ static BOOL request_service( const WCHAR *function, const struct xml_value_desc
upnp_gateway_connection.version, function );
if (!WinHttpSendRequest( request, request_headers, -1, request_data, request_len, request_len, 0 ))
{
- WARN( "Error sending request %u.\n", GetLastError() );
+ WARN( "Error sending request %lu.\n", GetLastError() );
goto done;
}
if (!WinHttpReceiveResponse(request, NULL))
{
- WARN( "Error receiving response %u.\n", GetLastError() );
+ WARN( "Error receiving response %lu.\n", GetLastError() );
goto done;
}
size = sizeof(*http_status);
@@ -607,7 +607,7 @@ static void update_mapping_list(void)
new_mappings[index].enabled = VARIANT_FALSE;
new_mappings[index].descr = mapping_move_bstr( &mapping_desc[PM_DESC].value );
- TRACE( "%s %s %s:%u -> %s:%u, enabled %d.\n", debugstr_w(new_mappings[index].descr),
+ TRACE( "%s %s %s:%lu -> %s:%lu, enabled %d.\n", debugstr_w(new_mappings[index].descr),
debugstr_w(new_mappings[index].protocol), debugstr_w(new_mappings[index].external_ip),
new_mappings[index].external, debugstr_w(new_mappings[index].client),
new_mappings[index].internal, new_mappings[index].enabled );
@@ -638,7 +638,7 @@ static BOOL remove_port_mapping( LONG port, BSTR protocol )
NULL, 0, &status, &error_str );
if (ret && status != HTTP_STATUS_OK)
{
- WARN( "status %u, server returned error %s.\n", status, debugstr_w(error_str) );
+ WARN( "status %lu, server returned error %s.\n", status, debugstr_w(error_str) );
SysFreeString( error_str );
ret = FALSE;
}
@@ -680,7 +680,7 @@ static BOOL add_port_mapping( LONG external, BSTR protocol, LONG internal, BSTR
NULL, 0, &status, &error_str );
if (ret && status != HTTP_STATUS_OK)
{
- WARN( "status %u, server returned error %s.\n", status, debugstr_w(error_str) );
+ WARN( "status %lu, server returned error %s.\n", status, debugstr_w(error_str) );
SysFreeString( error_str );
ret = FALSE;
}
@@ -940,7 +940,7 @@ static HRESULT WINAPI static_port_mapping_GetTypeInfo(
{
struct static_port_mapping *mapping = impl_from_IStaticPortMapping( iface );
- TRACE("%p %u %u %p\n", mapping, iTInfo, lcid, ppTInfo);
+ TRACE("%p %u %lu %p\n", mapping, iTInfo, lcid, ppTInfo);
return get_typeinfo( IStaticPortMapping_tid, ppTInfo );
}
@@ -956,7 +956,7 @@ static HRESULT WINAPI static_port_mapping_GetIDsOfNames(
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("%p %s %p %u %u %p\n", mapping, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
+ TRACE("%p %s %p %u %lu %p\n", mapping, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo( IStaticPortMapping_tid, &typeinfo );
if (SUCCEEDED(hr))
@@ -982,7 +982,7 @@ static HRESULT WINAPI static_port_mapping_Invoke(
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("%p %d %s %d %d %p %p %p %p\n", mapping, dispIdMember, debugstr_guid(riid),
+ TRACE("%p %ld %s %ld %d %p %p %p %p\n", mapping, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo( IStaticPortMapping_tid, &typeinfo );
@@ -1121,7 +1121,7 @@ static HRESULT WINAPI static_port_mapping_EditInternalPort(
IStaticPortMapping *iface,
LONG value )
{
- FIXME( "iface %p, value %d stub.\n", iface, value );
+ FIXME( "iface %p, value %ld stub.\n", iface, value );
return E_NOTIMPL;
}
@@ -1225,7 +1225,7 @@ static HRESULT WINAPI port_mapping_enum_Next( IEnumVARIANT *iface, ULONG celt, V
unsigned int i, count;
HRESULT ret;
- TRACE( "iface %p, celt %u, var %p, fetched %p.\n", iface, celt, var, fetched );
+ TRACE( "iface %p, celt %lu, var %p, fetched %p.\n", iface, celt, var, fetched );
if (fetched) *fetched = 0;
if (!celt) return S_OK;
@@ -1261,7 +1261,7 @@ static HRESULT WINAPI port_mapping_enum_Skip( IEnumVARIANT *iface, ULONG celt )
struct port_mapping_enum *mapping_enum = impl_from_IEnumVARIANT( iface );
unsigned int count = get_port_mapping_count();
- TRACE( "iface %p, celt %u.\n", iface, celt );
+ TRACE( "iface %p, celt %lu.\n", iface, celt );
mapping_enum->index += celt;
return mapping_enum->index <= count ? S_OK : S_FALSE;
@@ -1395,7 +1395,7 @@ static HRESULT WINAPI static_ports_GetTypeInfo(
{
struct static_port_mapping_collection *ports = impl_from_IStaticPortMappingCollection( iface );
- TRACE("%p %u %u %p\n", ports, iTInfo, lcid, ppTInfo);
+ TRACE("%p %u %lu %p\n", ports, iTInfo, lcid, ppTInfo);
return get_typeinfo( IStaticPortMappingCollection_tid, ppTInfo );
}
@@ -1411,7 +1411,7 @@ static HRESULT WINAPI static_ports_GetIDsOfNames(
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("%p %s %p %u %u %p\n", ports, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
+ TRACE("%p %s %p %u %lu %p\n", ports, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
hr = get_typeinfo( IStaticPortMappingCollection_tid, &typeinfo );
if (SUCCEEDED(hr))
@@ -1437,7 +1437,7 @@ static HRESULT WINAPI static_ports_Invoke(
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("%p %d %s %d %d %p %p %p %p\n", ports, dispIdMember, debugstr_guid(riid),
+ TRACE("%p %ld %s %ld %d %p %p %p %p\n", ports, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo( IStaticPortMappingCollection_tid, &typeinfo );
@@ -1471,7 +1471,7 @@ static HRESULT WINAPI static_ports_get_Item(
struct port_mapping mapping_data;
HRESULT ret;
- TRACE( "iface %p, port %d, protocol %s.\n", iface, port, debugstr_w(protocol) );
+ TRACE( "iface %p, port %ld, protocol %s.\n", iface, port, debugstr_w(protocol) );
if (!mapping) return E_POINTER;
*mapping = NULL;
@@ -1499,7 +1499,7 @@ static HRESULT WINAPI static_ports_Remove(
LONG port,
BSTR protocol )
{
- TRACE( "iface %p, port %d, protocol %s.\n", iface, port, debugstr_w(protocol) );
+ TRACE( "iface %p, port %ld, protocol %s.\n", iface, port, debugstr_w(protocol) );
if (!is_valid_protocol( protocol )) return E_INVALIDARG;
if (port < 0 || port > 65535) return E_INVALIDARG;
@@ -1522,7 +1522,7 @@ static HRESULT WINAPI static_ports_Add(
struct port_mapping mapping_data;
HRESULT ret;
- TRACE( "iface %p, external %d, protocol %s, internal %d, client %s, enabled %d, descritption %s, mapping %p.\n",
+ TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, descritption %s, mapping %p.\n",
iface, external, debugstr_w(protocol), internal, debugstr_w(client), enabled, debugstr_w(description),
mapping );
@@ -1667,7 +1667,7 @@ static HRESULT WINAPI fw_port_GetTypeInfo(
{
fw_port *This = impl_from_INetFwOpenPort( iface );
- TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo( INetFwOpenPort_tid, ppTInfo );
}
@@ -1683,7 +1683,7 @@ static HRESULT WINAPI fw_port_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( INetFwOpenPort_tid, &typeinfo );
if (SUCCEEDED(hr))
@@ -1709,7 +1709,7 @@ static HRESULT WINAPI fw_port_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( INetFwOpenPort_tid, &typeinfo );
@@ -1809,7 +1809,7 @@ static HRESULT WINAPI fw_port_put_Port(
{
fw_port *This = impl_from_INetFwOpenPort( iface );
- TRACE("%p %d\n", This, portNumber);
+ TRACE("%p %ld\n", This, portNumber);
This->port = portNumber;
return S_OK;
}
@@ -2007,7 +2007,7 @@ static HRESULT WINAPI fw_ports_GetTypeInfo(
{
fw_ports *This = impl_from_INetFwOpenPorts( iface );
- TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo( INetFwOpenPorts_tid, ppTInfo );
}
@@ -2023,7 +2023,7 @@ static HRESULT WINAPI fw_ports_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( INetFwOpenPorts_tid, &typeinfo );
if (SUCCEEDED(hr))
@@ -2049,7 +2049,7 @@ static HRESULT WINAPI fw_ports_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( INetFwOpenPorts_tid, &typeinfo );
@@ -2091,7 +2091,7 @@ static HRESULT WINAPI fw_ports_Remove(
{
fw_ports *This = impl_from_INetFwOpenPorts( iface );
- FIXME("%p, %d, %u\n", This, portNumber, ipProtocol);
+ FIXME("%p, %ld, %u\n", This, portNumber, ipProtocol);
return E_NOTIMPL;
}
@@ -2104,7 +2104,7 @@ static HRESULT WINAPI fw_ports_Item(
HRESULT hr;
fw_ports *This = impl_from_INetFwOpenPorts( iface );
- FIXME("%p, %d, %u, %p\n", This, portNumber, ipProtocol, openPort);
+ FIXME("%p, %ld, %u, %p\n", This, portNumber, ipProtocol, openPort);
hr = NetFwOpenPort_create( NULL, (void **)openPort );
if (SUCCEEDED(hr))
@@ -2226,7 +2226,7 @@ static HRESULT WINAPI upnpnat_GetTypeInfo(IUPnPNAT *iface, UINT iTInfo, LCID lci
{
upnpnat *This = impl_from_IUPnPNAT( iface );
- TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p %u %lu %p\n", This, iTInfo, lcid, ppTInfo);
return get_typeinfo( IUPnPNAT_tid, ppTInfo );
}
@@ -2237,7 +2237,7 @@ static HRESULT WINAPI upnpnat_GetIDsOfNames(IUPnPNAT *iface, REFIID riid, LPOLES
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( IUPnPNAT_tid, &typeinfo );
if (SUCCEEDED(hr))
@@ -2256,7 +2256,7 @@ static HRESULT WINAPI upnpnat_Invoke(IUPnPNAT *iface, DISPID dispIdMember, REFII
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( IUPnPNAT_tid, &typeinfo );
diff --git a/dlls/hnetcfg/profile.c b/dlls/hnetcfg/profile.c
index 63f6d0cc7ed..ee34519bbb7 100644
--- a/dlls/hnetcfg/profile.c
+++ b/dlls/hnetcfg/profile.c
@@ -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 );
diff --git a/dlls/hnetcfg/service.c b/dlls/hnetcfg/service.c
index 122d9797bab..0ba15158f5d 100644
--- a/dlls/hnetcfg/service.c
+++ b/dlls/hnetcfg/service.c
@@ -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;
}
More information about the wine-devel
mailing list