wsdapi: Enable compilation with long types.

dlls/wsdapi/Makefile.in

-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wsdapi.dll
 IMPORTLIB = wsdapi
 IMPORTS   = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32

dlls/wsdapi/address.c

@@ -78,7 +78,7 @@ static ULONG WINAPI IWSDUdpAddressImpl_AddRef(IWSDUdpAddress *iface)
     IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
     return ref;
 }
 
@@ -87,7 +87,7 @@ static ULONG WINAPI IWSDUdpAddressImpl_Release(IWSDUdpAddress *iface)
     IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (ref == 0)
     {
@@ -99,7 +99,7 @@ static ULONG WINAPI IWSDUdpAddressImpl_Release(IWSDUdpAddress *iface)
 
 static HRESULT WINAPI IWSDUdpAddressImpl_Serialize(IWSDUdpAddress *This, LPWSTR pszBuffer, DWORD cchLength, BOOL fSafe)
 {
-    FIXME("(%p, %p, %d, %d)\n", This, pszBuffer, cchLength, fSafe);
+    FIXME("(%p, %p, %ld, %d)\n", This, pszBuffer, cchLength, fSafe);
     return E_NOTIMPL;
 }
 
@@ -294,7 +294,7 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetMessageType(IWSDUdpAddress *This, WS
 
 static HRESULT WINAPI IWSDUdpAddressImpl_SetTTL(IWSDUdpAddress *This, DWORD dwTTL)
 {
-    FIXME("(%p, %d)\n", This, dwTTL);
+    FIXME("(%p, %ld)\n", This, dwTTL);
     return E_NOTIMPL;
 }
 

dlls/wsdapi/discovery.c

@@ -69,7 +69,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_AddRef(IWSDiscoveryPublisher *ifac
     IWSDiscoveryPublisherImpl *This = impl_from_IWSDiscoveryPublisher(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
     return ref;
 }
 
@@ -80,7 +80,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa
     struct notificationSink *sink, *cursor;
     struct message_id *msg_id, *msg_id_cursor;
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (ref == 0)
     {
@@ -118,7 +118,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_SetAddressFamily(IWSDiscoveryPub
 {
     IWSDiscoveryPublisherImpl *impl = impl_from_IWSDiscoveryPublisher(This);
 
-    TRACE("(%p, %d)\n", This, dwAddressFamily);
+    TRACE("(%p, %ld)\n", This, dwAddressFamily);
 
     /* Has the address family already been set? */
     if (impl->addressFamily != 0)

dlls/wsdapi/memory.c

@@ -82,7 +82,7 @@ void * WINAPI WSDAllocateLinkedMemory(void *pParent, SIZE_T cbSize)
     struct memory_allocation *allocation, *parent;
     void *ptr;
 
-    TRACE("(%p, %lu)\n", pParent, cbSize);
+    TRACE("(%p, %Iu)\n", pParent, cbSize);
 
     ptr = HeapAlloc(GetProcessHeap(), 0, MEMORY_ALLOCATION_SIZE + cbSize);
 

dlls/wsdapi/msgparams.c

@@ -58,7 +58,7 @@ static ULONG IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *iface)
     IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
     return ref;
 }
 
@@ -67,7 +67,7 @@ static ULONG IWSDMessageParametersImpl_Release(IWSDMessageParameters *iface)
     IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (ref == 0)
     {

dlls/wsdapi/network.c

@@ -116,7 +116,7 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d
 
     if (retval != ERROR_BUFFER_OVERFLOW)
     {
-        WARN("GetAdaptorsAddresses failed with error %08x\n", retval);
+        WARN("GetAdaptorsAddresses failed with error %08lx\n", retval);
         goto cleanup;
     }
 
@@ -133,7 +133,7 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d
 
     if (retval != ERROR_SUCCESS)
     {
-        WARN("GetAdaptorsAddresses failed with error %08x\n", retval);
+        WARN("GetAdaptorsAddresses failed with error %08lx\n", retval);
         goto cleanup;
     }
 
@@ -200,7 +200,7 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d
 
         if (thread_handle == NULL)
         {
-            WARN("CreateThread failed (error %d)\n", GetLastError());
+            WARN("CreateThread failed (error %ld)\n", GetLastError());
             closesocket(s);
 
             heap_free(send_params->data);
@@ -487,7 +487,7 @@ static int start_listening(IWSDiscoveryPublisherImpl *impl, SOCKADDR_STORAGE *bi
 
     if (thread_handle == NULL)
     {
-        WARN("CreateThread failed (error %d)\n", GetLastError());
+        WARN("CreateThread failed (error %ld)\n", GetLastError());
         goto cleanup;
     }
 
@@ -514,7 +514,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL
 
     if (ret != ERROR_BUFFER_OVERFLOW)
     {
-        WARN("GetAdaptorsAddresses failed with error %08x\n", ret);
+        WARN("GetAdaptorsAddresses failed with error %08lx\n", ret);
         return FALSE;
     }
 
@@ -532,7 +532,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL
 
     if (ret != ERROR_SUCCESS)
     {
-        WARN("GetAdaptorsAddresses failed with error %08x\n", ret);
+        WARN("GetAdaptorsAddresses failed with error %08lx\n", ret);
         goto cleanup;
     }
 

dlls/wsdapi/xml.c

@@ -466,7 +466,7 @@ static ULONG WINAPI IWSDXMLContextImpl_AddRef(IWSDXMLContext *iface)
     IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
     return ref;
 }
 
@@ -475,7 +475,7 @@ static ULONG WINAPI IWSDXMLContextImpl_Release(IWSDXMLContext *iface)
     IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
 
     if (ref == 0)
     {
@@ -617,7 +617,7 @@ static HRESULT WINAPI IWSDXMLContextImpl_SetNamespaces(IWSDXMLContext *iface, co
 
 static HRESULT WINAPI IWSDXMLContextImpl_SetTypes(IWSDXMLContext *iface, const PCWSDXML_TYPE *pTypes, DWORD dwTypesCount, BYTE bLayerNumber)
 {
-    FIXME("(%p, %p, %d, %d)\n", iface, pTypes, dwTypesCount, bLayerNumber);
+    FIXME("(%p, %p, %ld, %d)\n", iface, pTypes, dwTypesCount, bLayerNumber);
     return E_NOTIMPL;
 }