wsock32: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-23 09:10:21 +01:00 committed by Alexandre Julliard
parent 39f732c8c1
commit 6c2b2c3732
3 changed files with 10 additions and 11 deletions

View file

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wsock32.dll MODULE = wsock32.dll
IMPORTLIB = wsock32 IMPORTLIB = wsock32
IMPORTS = mswsock ws2_32 iphlpapi IMPORTS = mswsock ws2_32 iphlpapi

View file

@ -36,7 +36,7 @@ INT WINAPI GetAddressByNameA(DWORD dwNameSpace, LPGUID lpServiceType, LPSTR lpSe
LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPSTR lpAliasBuffer, LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPSTR lpAliasBuffer,
LPDWORD lpdwAliasBufferLength) 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, debugstr_guid(lpServiceType), debugstr_a(lpServiceName), lpiProtocols,
dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength, dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength,
lpAliasBuffer, lpdwAliasBufferLength); lpAliasBuffer, lpdwAliasBufferLength);
@ -50,7 +50,7 @@ INT WINAPI GetAddressByNameW(DWORD dwNameSpace, LPGUID lpServiceType, LPWSTR lpS
LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPWSTR lpAliasBuffer, LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPWSTR lpAliasBuffer,
LPDWORD lpdwAliasBufferLength) 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, debugstr_guid(lpServiceType), debugstr_w(lpServiceName), lpiProtocols,
dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength, dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength,
lpAliasBuffer, lpdwAliasBufferLength); lpAliasBuffer, lpdwAliasBufferLength);
@ -133,7 +133,7 @@ INT WINAPI SetServiceA(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSE
LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags) LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags)
{ {
/* tell the user they've got a substandard implementation */ /* 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); lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags);
/* some programs may be able to compensate if they know what happened */ /* 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) LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags)
{ {
/* tell the user they've got a substandard implementation */ /* 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); lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags);
/* some programs may be able to compensate if they know what happened */ /* 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, DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize,
LPSERVICE_ASYNC_INFO lpServiceAsyncInfo) 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); lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo);
/* some programs may be able to compensate if they know what happened */ /* 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, DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize,
LPSERVICE_ASYNC_INFO lpServiceAsyncInfo) 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); lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo);
/* some programs may be able to compensate if they know what happened */ /* some programs may be able to compensate if they know what happened */

View file

@ -250,7 +250,7 @@ DWORD WINAPI WsControl(DWORD protocol,
*/ */
if (index == 1) if (index == 1)
return NO_ERROR; return NO_ERROR;
ERR ("Error retrieving data for interface index %u\n", ERR ("Error retrieving data for interface index %lu\n",
index); index);
return ret; return ret;
} }
@ -405,8 +405,8 @@ DWORD WINAPI WsControl(DWORD protocol,
{ {
if (table->table[i].dwIndex == index) if (table->table[i].dwIndex == index)
{ {
TRACE("Found IP info for tei_instance 0x%x:\n", index); TRACE("Found IP info for tei_instance 0x%lx:\n", index);
TRACE("IP 0x%08x, mask 0x%08x\n", table->table[i].dwAddr, TRACE("IP 0x%08lx, mask 0x%08lx\n", table->table[i].dwAddr,
table->table[i].dwMask); table->table[i].dwMask);
*baseIPInfo = table->table[i]; *baseIPInfo = table->table[i];
break; break;
@ -615,7 +615,7 @@ DWORD WINAPI WsControl(DWORD protocol,
} }
default: 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); protocol, action, pRequestInfo, pcbRequestInfoLen, pResponseInfo, pcbResponseInfoLen);
return (WSAEOPNOTSUPP); return (WSAEOPNOTSUPP);