wsock32: Win64 printf format warning fixes.

dlls/wsock32/Makefile.in

@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = wsock32.dll
 IMPORTLIB = libwsock32.$(IMPLIBEXT)
 IMPORTS   = ws2_32 iphlpapi kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	protocol.c \

dlls/wsock32/service.c

@@ -38,7 +38,7 @@ INT WINAPI GetAddressByNameA(DWORD dwNameSpace, LPGUID lpServiceType, LPSTR lpSe
     LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPSTR lpAliasBuffer,
     LPDWORD lpdwAliasBufferLength)
 {
-    FIXME("(0x%08lx, %s, %s, %p, 0x%08lx, %p, %p, %p, %p, %p) stub\n", dwNameSpace,
+    FIXME("(0x%08x, %s, %s, %p, 0x%08x, %p, %p, %p, %p, %p) stub\n", dwNameSpace,
           debugstr_guid(lpServiceType), debugstr_a(lpServiceName), lpiProtocols,
           dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength,
           lpAliasBuffer, lpdwAliasBufferLength);
@@ -52,7 +52,7 @@ INT WINAPI GetAddressByNameW(DWORD dwNameSpace, LPGUID lpServiceType, LPWSTR lpS
     LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPWSTR lpAliasBuffer,
     LPDWORD lpdwAliasBufferLength)
 {
-    FIXME("(0x%08lx, %s, %s, %p, 0x%08lx, %p, %p, %p, %p, %p) stub\n", dwNameSpace,
+    FIXME("(0x%08x, %s, %s, %p, 0x%08x, %p, %p, %p, %p, %p) stub\n", dwNameSpace,
           debugstr_guid(lpServiceType), debugstr_w(lpServiceName), lpiProtocols,
           dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength,
           lpAliasBuffer, lpdwAliasBufferLength);
@@ -135,7 +135,7 @@ INT WINAPI SetServiceA(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSE
                        LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags)
 {
    /* tell the user they've got a substandard implementation */
-   FIXME("wsock32: SetServiceA(%lu, %lu, %lu, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags,
+   FIXME("wsock32: SetServiceA(%u, %u, %u, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags,
            lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags);
     
    /* some programs may be able to compensate if they know what happened */
@@ -152,7 +152,7 @@ INT WINAPI SetServiceW(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSE
                        LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags)
 {
    /* tell the user they've got a substandard implementation */
-   FIXME("wsock32: SetServiceW(%lu, %lu, %lu, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags,
+   FIXME("wsock32: SetServiceW(%u, %u, %u, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags,
            lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags);
     
    /* some programs may be able to compensate if they know what happened */
@@ -194,7 +194,7 @@ INT WINAPI GetServiceA(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName,
                        DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize,
                        LPSERVICE_ASYNC_INFO lpServiceAsyncInfo)
 {
-   FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace,
+   FIXME("(%u, %p, %s, %u, %p, %p, %p): stub\n", dwNameSpace,
          lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo);
 
    /* some programs may be able to compensate if they know what happened */
@@ -211,7 +211,7 @@ INT WINAPI GetServiceW(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName,
                        DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize,
                        LPSERVICE_ASYNC_INFO lpServiceAsyncInfo)
 {
-   FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace,
+   FIXME("(%u, %p, %s, %u, %p, %p, %p): stub\n", dwNameSpace,
          lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo);
 
    /* some programs may be able to compensate if they know what happened */

dlls/wsock32/socket.c

@@ -252,7 +252,7 @@ DWORD WINAPI WsControl(DWORD protocol,
                       */
                      if (index == 1)
                         return NO_ERROR;
-                     ERR ("Error retrieving data for interface index %lu\n",
+                     ERR ("Error retrieving data for interface index %u\n",
                       index);
                      return ret;
                   }
@@ -407,8 +407,8 @@ DWORD WINAPI WsControl(DWORD protocol,
             {
                if (table->table[i].dwIndex == index)
                {
-                  TRACE("Found IP info for tei_instance 0x%lx:\n", index);
-                  TRACE("IP 0x%08lx, mask 0x%08lx\n", table->table[i].dwAddr,
+                  TRACE("Found IP info for tei_instance 0x%x:\n", index);
+                  TRACE("IP 0x%08x, mask 0x%08x\n", table->table[i].dwAddr,
                    table->table[i].dwMask);
                   memcpy(baseIPInfo, &table->table[i], sizeof(MIB_IPADDRROW));
                   break;
@@ -611,7 +611,7 @@ DWORD WINAPI WsControl(DWORD protocol,
    }
 
    default:
-      FIXME("Protocol Not Supported -> protocol=0x%lx, action=0x%lx, Request=%p, RequestLen=%p, Response=%p, ResponseLen=%p\n",
+      FIXME("Protocol Not Supported -> protocol=0x%x, action=0x%x, Request=%p, RequestLen=%p, Response=%p, ResponseLen=%p\n",
        protocol, action, pRequestInfo, pcbRequestInfoLen, pResponseInfo, pcbResponseInfoLen);
 
       return (WSAEOPNOTSUPP);