Eric Pouech : wsock32: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6c2b2c37327d66a08337cb486a2f26ef2ce1ab0a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6c2b2c37327d66a08337cb486a2f26ef2ce1ab0a

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Wed Feb 23 09:10:21 2022 +0100

wsock32: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wsock32/Makefile.in |  1 -
 dlls/wsock32/service.c   | 12 ++++++------
 dlls/wsock32/socket.c    |  8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in
index 5307150bfef..b5a9c437825 100644
--- a/dlls/wsock32/Makefile.in
+++ b/dlls/wsock32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wsock32.dll
 IMPORTLIB = wsock32
 IMPORTS   = mswsock ws2_32 iphlpapi
diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c
index f2a45c983b5..c10951110b5 100644
--- a/dlls/wsock32/service.c
+++ b/dlls/wsock32/service.c
@@ -36,7 +36,7 @@ INT WINAPI GetAddressByNameA(DWORD dwNameSpace, LPGUID lpServiceType, LPSTR lpSe
     LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPSTR lpAliasBuffer,
     LPDWORD lpdwAliasBufferLength)
 {
-    FIXME("(0x%08x, %s, %s, %p, 0x%08x, %p, %p, %p, %p, %p) stub\n", dwNameSpace,
+    FIXME("(0x%08lx, %s, %s, %p, 0x%08lx, %p, %p, %p, %p, %p) stub\n", dwNameSpace,
           debugstr_guid(lpServiceType), debugstr_a(lpServiceName), lpiProtocols,
           dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength,
           lpAliasBuffer, lpdwAliasBufferLength);
@@ -50,7 +50,7 @@ INT WINAPI GetAddressByNameW(DWORD dwNameSpace, LPGUID lpServiceType, LPWSTR lpS
     LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPWSTR lpAliasBuffer,
     LPDWORD lpdwAliasBufferLength)
 {
-    FIXME("(0x%08x, %s, %s, %p, 0x%08x, %p, %p, %p, %p, %p) stub\n", dwNameSpace,
+    FIXME("(0x%08lx, %s, %s, %p, 0x%08lx, %p, %p, %p, %p, %p) stub\n", dwNameSpace,
           debugstr_guid(lpServiceType), debugstr_w(lpServiceName), lpiProtocols,
           dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength,
           lpAliasBuffer, lpdwAliasBufferLength);
@@ -133,7 +133,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(%u, %u, %u, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags,
+   FIXME("wsock32: SetServiceA(%lu, %lu, %lu, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags,
            lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags);
     
    /* some programs may be able to compensate if they know what happened */
@@ -150,7 +150,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(%u, %u, %u, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags,
+   FIXME("wsock32: SetServiceW(%lu, %lu, %lu, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags,
            lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags);
     
    /* some programs may be able to compensate if they know what happened */
@@ -192,7 +192,7 @@ INT WINAPI GetServiceA(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName,
                        DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize,
                        LPSERVICE_ASYNC_INFO lpServiceAsyncInfo)
 {
-   FIXME("(%u, %p, %s, %u, %p, %p, %p): stub\n", dwNameSpace,
+   FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace,
          lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo);
 
    /* some programs may be able to compensate if they know what happened */
@@ -209,7 +209,7 @@ INT WINAPI GetServiceW(DWORD dwNameSpace, LPGUID lpGuid, LPSTR lpServiceName,
                        DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize,
                        LPSERVICE_ASYNC_INFO lpServiceAsyncInfo)
 {
-   FIXME("(%u, %p, %s, %u, %p, %p, %p): stub\n", dwNameSpace,
+   FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace,
          lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo);
 
    /* some programs may be able to compensate if they know what happened */
diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index 88ddf5b8eeb..2df54b2280a 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -250,7 +250,7 @@ DWORD WINAPI WsControl(DWORD protocol,
                       */
                      if (index == 1)
                         return NO_ERROR;
-                     ERR ("Error retrieving data for interface index %u\n",
+                     ERR ("Error retrieving data for interface index %lu\n",
                       index);
                      return ret;
                   }
@@ -405,8 +405,8 @@ DWORD WINAPI WsControl(DWORD protocol,
             {
                if (table->table[i].dwIndex == index)
                {
-                  TRACE("Found IP info for tei_instance 0x%x:\n", index);
-                  TRACE("IP 0x%08x, mask 0x%08x\n", table->table[i].dwAddr,
+                  TRACE("Found IP info for tei_instance 0x%lx:\n", index);
+                  TRACE("IP 0x%08lx, mask 0x%08lx\n", table->table[i].dwAddr,
                    table->table[i].dwMask);
                   *baseIPInfo = table->table[i];
                   break;
@@ -615,7 +615,7 @@ DWORD WINAPI WsControl(DWORD protocol,
    }
 
    default:
-      FIXME("Protocol Not Supported -> protocol=0x%x, action=0x%x, Request=%p, RequestLen=%p, Response=%p, ResponseLen=%p\n",
+      FIXME("Protocol Not Supported -> protocol=0x%lx, action=0x%lx, Request=%p, RequestLen=%p, Response=%p, ResponseLen=%p\n",
        protocol, action, pRequestInfo, pcbRequestInfoLen, pResponseInfo, pcbResponseInfoLen);
 
       return (WSAEOPNOTSUPP);