July 2023 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : wineps.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 044fbbd5a36db9d5cc618537d221f58740a99266 URL: https://gitlab.winehq.org/wine/wine/-/commit/044fbbd5a36db9d5cc618537d221f5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 18:24:00 2023 +1000 wineps.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/wineps.drv/afm.c | 2 +- dlls/wineps.drv/data/agl.h | 70 ++++++------- dlls/wineps.drv/mkagl.c | 2 +- dlls/wineps.drv/printproc.c | 2 +- dlls/wineps.drv/psdrv.h | 248 ++++++++++++++++++++++---------------------- dlls/wineps.drv/text.c | 2 +- 6 files changed, 163 insertions(+), 163 deletions(-)

1 0

Alex Henrie : winspool: Declare JobW as a void pointer in SetJobA.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 45f9ab92869f73139ac2cf21d4488c952f7cdf66 URL: https://gitlab.winehq.org/wine/wine/-/commit/45f9ab92869f73139ac2cf21d4488c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 2 17:20:08 2023 -0600 winspool: Declare JobW as a void pointer in SetJobA. To reduce the number of casts required and avoid a scan-build warning. --- dlls/winspool.drv/info.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 30df3199f40..b82df25082c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2979,7 +2979,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, DWORD Command) { BOOL ret; - LPBYTE JobW; + void *JobW; UNICODE_STRING usBuffer; TRACE("(%p, %ld, %ld, %p, %ld)\n",hPrinter, JobId, Level, pJob, Command); @@ -2996,7 +2996,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, JOB_INFO_1W *info1W = malloc(sizeof(*info1W)); JOB_INFO_1A *info1A = (JOB_INFO_1A*)pJob; - JobW = (LPBYTE)info1W; + JobW = info1W; info1W->pUserName = asciitounicode(&usBuffer, info1A->pUserName); info1W->pDocument = asciitounicode(&usBuffer, info1A->pDocument); info1W->pDatatype = asciitounicode(&usBuffer, info1A->pDatatype); @@ -3012,7 +3012,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, JOB_INFO_2W *info2W = malloc(sizeof(*info2W)); JOB_INFO_2A *info2A = (JOB_INFO_2A*)pJob; - JobW = (LPBYTE)info2W; + JobW = info2W; info2W->pUserName = asciitounicode(&usBuffer, info2A->pUserName); info2W->pDocument = asciitounicode(&usBuffer, info2A->pDocument); info2W->pNotifyName = asciitounicode(&usBuffer, info2A->pNotifyName); @@ -3045,7 +3045,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, { case 1: { - JOB_INFO_1W *info1W = (JOB_INFO_1W*)JobW; + JOB_INFO_1W *info1W = JobW; free(info1W->pUserName); free(info1W->pDocument); free(info1W->pDatatype); @@ -3054,7 +3054,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, } case 2: { - JOB_INFO_2W *info2W = (JOB_INFO_2W*)JobW; + JOB_INFO_2W *info2W = JobW; free(info2W->pUserName); free(info2W->pDocument); free(info2W->pNotifyName);

1 0

Alexandre Julliard : oleaut32: Fix a typo introduced by last change.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 9b67373cbc8fd26f0ddb3d3146e8f73c352ec798 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b67373cbc8fd26f0ddb3d3146e8f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 17:02:42 2023 +0200 oleaut32: Fix a typo introduced by last change. Introduced in 36963b6d27abcf74b58bcf11953ebdf2b7e9767c. --- dlls/oleaut32/variant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 65bc4015f51..85fef3113b6 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5871,7 +5871,7 @@ HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result) case VT_DATE: if (!V_DATE(right)) resvt = VT_NULL; break; case VT_CY: if (!V_CY(right).int64) resvt = VT_NULL; break; case VT_DECIMAL: - if (!V_DECIMAL(right).Hi32 || V_DECIMAL(right).Lo64) + if (!(V_DECIMAL(right).Hi32 || V_DECIMAL(right).Lo64)) resvt = VT_NULL; break; case VT_BSTR:

1 0

Alexandre Julliard : combase: Use nameless union/structs.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 420a7d06047f8abd001399f682f7e8bcd77f979c URL: https://gitlab.winehq.org/wine/wine/-/commit/420a7d06047f8abd001399f682f7e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 10:21:44 2023 +0200 combase: Use nameless union/structs. --- dlls/combase/apartment.c | 2 -- dlls/combase/combase.c | 2 -- dlls/combase/hglobalstream.c | 36 +++++++++++++++++------------------- dlls/combase/usrmarshal.c | 2 -- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index b951486ee82..d679ef3407a 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -27,8 +27,6 @@ #include <assert.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "servprov.h" diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index d834121e2ef..f1b5828e0f8 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -18,8 +18,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION - #include "ntstatus.h" #define WIN32_NO_STATUS #define USE_COM_CONTEXT_DEF diff --git a/dlls/combase/hglobalstream.c b/dlls/combase/hglobalstream.c index 2f135bcbd74..88491f24e87 100644 --- a/dlls/combase/hglobalstream.c +++ b/dlls/combase/hglobalstream.c @@ -20,8 +20,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION - #include "objbase.h" #include "wine/debug.h" @@ -151,8 +149,8 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *rea if (!read_len) read_len = &dummy; - if (stream->handle->size >= stream->position.u.LowPart) - len = min(stream->handle->size - stream->position.u.LowPart, cb); + if (stream->handle->size >= stream->position.LowPart) + len = min(stream->handle->size - stream->position.LowPart, cb); else len = 0; @@ -164,8 +162,8 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *rea return S_OK; } - memcpy(pv, buffer + stream->position.u.LowPart, len); - stream->position.u.LowPart += len; + memcpy(pv, buffer + stream->position.LowPart, len); + stream->position.LowPart += len; *read_len = len; @@ -191,10 +189,10 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO *written = 0; - size.u.HighPart = 0; - size.u.LowPart = stream->position.u.LowPart + cb; + size.HighPart = 0; + size.LowPart = stream->position.LowPart + cb; - if (size.u.LowPart > stream->handle->size) + if (size.LowPart > stream->handle->size) { /* grow stream */ HRESULT hr = IStream_SetSize(iface, size); @@ -212,8 +210,8 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO return S_OK; } - memcpy(buffer + stream->position.u.LowPart, pv, cb); - stream->position.u.LowPart += cb; + memcpy(buffer + stream->position.LowPart, pv, cb); + stream->position.LowPart += cb; GlobalUnlock(stream->handle->hglobal); @@ -247,10 +245,10 @@ static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER move, DWORD orig goto end; } - position.u.HighPart = 0; - position.u.LowPart += move.QuadPart; + position.HighPart = 0; + position.LowPart += move.QuadPart; - if (move.u.LowPart >= 0x80000000 && position.u.LowPart >= move.u.LowPart) + if (move.LowPart >= 0x80000000 && position.LowPart >= move.LowPart) { /* We tried to seek backwards and went past the start. */ hr = STG_E_SEEKERROR; @@ -272,15 +270,15 @@ static HRESULT WINAPI stream_SetSize(IStream *iface, ULARGE_INTEGER size) TRACE("%p, %s\n", iface, wine_dbgstr_longlong(size.QuadPart)); - if (stream->handle->size == size.u.LowPart) + if (stream->handle->size == size.LowPart) return S_OK; - hglobal = GlobalReAlloc(stream->handle->hglobal, size.u.LowPart, GMEM_MOVEABLE); + hglobal = GlobalReAlloc(stream->handle->hglobal, size.LowPart, GMEM_MOVEABLE); if (!hglobal) return E_OUTOFMEMORY; stream->handle->hglobal = hglobal; - stream->handle->size = size.u.LowPart; + stream->handle->size = size.LowPart; return S_OK; } @@ -292,7 +290,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE HRESULT hr = S_OK; BYTE buffer[128]; - TRACE("%p, %p, %ld, %p, %p\n", iface, dest, cb.u.LowPart, read_len, written); + TRACE("%p, %p, %ld, %p, %p\n", iface, dest, cb.LowPart, read_len, written); if (!dest) return STG_E_INVALIDPOINTER; @@ -302,7 +300,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE while (cb.QuadPart > 0) { - ULONG chunk_size = cb.QuadPart >= sizeof(buffer) ? sizeof(buffer) : cb.u.LowPart; + ULONG chunk_size = cb.QuadPart >= sizeof(buffer) ? sizeof(buffer) : cb.LowPart; ULONG chunk_read, chunk_written; hr = IStream_Read(iface, buffer, chunk_size, &chunk_read); diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 52891cbf563..87513d335bf 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -20,8 +20,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION - #include "ole2.h" #include "wine/debug.h"

1 0

Alexandre Julliard : crypt32: Use nameless union/structs.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: febb06ce7794315b60e4b030370a5ad9116494e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/febb06ce7794315b60e4b030370a5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 10:22:25 2023 +0200 crypt32: Use nameless union/structs. --- dlls/crypt32/cert.c | 41 ++++++++++---------- dlls/crypt32/chain.c | 74 ++++++++++++++++++------------------ dlls/crypt32/crl.c | 26 ++++++------- dlls/crypt32/decode.c | 83 ++++++++++++++++++++-------------------- dlls/crypt32/encode.c | 32 ++++++++-------- dlls/crypt32/msg.c | 102 +++++++++++++++++++++++++------------------------- dlls/crypt32/object.c | 54 +++++++++++++------------- dlls/crypt32/oid.c | 22 +++++------ dlls/crypt32/str.c | 16 ++++---- 9 files changed, 221 insertions(+), 229 deletions(-)

1 0

Alexandre Julliard : dbghelp: Use nameless union/structs.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 03ce134d6f4736c37c2de4f71ecbaa24b641b1cb URL: https://gitlab.winehq.org/wine/wine/-/commit/03ce134d6f4736c37c2de4f71ecbaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 10:22:46 2023 +0200 dbghelp: Use nameless union/structs. --- dlls/dbghelp/cpu_arm64.c | 28 +++++++++++------------ dlls/dbghelp/cpu_x86_64.c | 54 +++++++++++++++++++++----------------------- dlls/dbghelp/minidump.c | 57 ++++++++++++++++++++++------------------------- dlls/dbghelp/msc.c | 2 -- dlls/dbghelp/symbol.c | 2 -- dlls/dbghelp/type.c | 2 -- 6 files changed, 66 insertions(+), 79 deletions(-)

1 0

Alexandre Julliard : mountmgr.sys: Use nameless union/structs.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 99159c7a0baafd9d50dd12cfc52b48e15675f662 URL: https://gitlab.winehq.org/wine/wine/-/commit/99159c7a0baafd9d50dd12cfc52b48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 10:23:38 2023 +0200 mountmgr.sys: Use nameless union/structs. --- dlls/mountmgr.sys/cred.c | 2 -- dlls/mountmgr.sys/device.c | 6 ++---- dlls/mountmgr.sys/mountmgr.c | 20 +++++++++----------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/cred.c b/dlls/mountmgr.sys/cred.c index 5c95dff5cab..b9080d162bf 100644 --- a/dlls/mountmgr.sys/cred.c +++ b/dlls/mountmgr.sys/cred.c @@ -36,8 +36,6 @@ #undef GetCurrentThread #endif -#define NONAMELESSUNION - #include "mountmgr.h" #include "unixlib.h" #include "wine/debug.h" diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 33ce1f248e5..48ee8d9189a 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -24,8 +24,6 @@ #include <stdio.h> #include <stdlib.h> -#define NONAMELESSUNION - #include "mountmgr.h" #include "winreg.h" #include "winnls.h" @@ -1749,7 +1747,7 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) } done: - io->u.Status = status; + io->Status = status; LeaveCriticalSection( &device_section ); IoCompleteRequest( irp, IO_NO_INCREMENT ); return status; @@ -1841,7 +1839,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) } } - irp->IoStatus.u.Status = status; + irp->IoStatus.Status = status; LeaveCriticalSection( &device_section ); IoCompleteRequest( irp, IO_NO_INCREMENT ); return status; diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index ec22a8eb9bc..ad3c034fe0f 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -21,8 +21,6 @@ #include <stdarg.h> #include <stdlib.h> -#define NONAMELESSUNION - #include "mountmgr.h" #include "winreg.h" #include "unixlib.h" @@ -378,20 +376,20 @@ static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, vo /* sanity checks */ if (FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]) > insize) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; goto err; } for (i = 0; i < query->count; i++) if (query->params[i].offset + query->params[i].size > insize) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; goto err; } if (!memchr( query->unix_name, 0, sizeof(query->unix_name) )) { - irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; goto err; } @@ -407,11 +405,11 @@ static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, vo { if (offset >= sizeof(query->size)) query->size = offset; offset = sizeof(query->size); - irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; + irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; goto err; } } - irp->IoStatus.u.Status = STATUS_SUCCESS; + irp->IoStatus.Status = STATUS_SUCCESS; err: irp->IoStatus.Information = offset; @@ -430,7 +428,7 @@ static void WINAPI query_symbol_file_callback( TP_CALLBACK_INSTANCE *instance, v NTSTATUS status = MOUNTMGR_CALL( query_symbol_file, &params ); irp->IoStatus.Information = info; - irp->IoStatus.u.Status = status; + irp->IoStatus.Status = status; IoCompleteRequest( irp, IO_NO_INCREMENT ); } @@ -528,7 +526,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) } if (TrySubmitThreadpoolCallback( query_dhcp_request_params, irp, NULL )) - return (irp->IoStatus.u.Status = STATUS_PENDING); + return (irp->IoStatus.Status = STATUS_PENDING); status = STATUS_NO_MEMORY; break; case IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE: @@ -538,7 +536,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; } if (TrySubmitThreadpoolCallback( query_symbol_file_callback, irp, NULL )) - return (irp->IoStatus.u.Status = STATUS_PENDING); + return (irp->IoStatus.Status = STATUS_PENDING); status = STATUS_NO_MEMORY; break; case IOCTL_MOUNTMGR_READ_CREDENTIAL: @@ -594,7 +592,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_NOT_SUPPORTED; break; } - irp->IoStatus.u.Status = status; + irp->IoStatus.Status = status; IoCompleteRequest( irp, IO_NO_INCREMENT ); return status; }

1 0

Alexandre Julliard : ntoskrnl.exe: Use nameless union/structs.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 23daba9abe0741db0c4b348f0b1bd40425ca62da URL: https://gitlab.winehq.org/wine/wine/-/commit/23daba9abe0741db0c4b348f0b1bd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 10:24:03 2023 +0200 ntoskrnl.exe: Use nameless union/structs. --- dlls/ntoskrnl.exe/instr.c | 1 - dlls/ntoskrnl.exe/ntoskrnl.c | 45 +++++++++++++++++++++----------------------- dlls/ntoskrnl.exe/pnp.c | 36 +++++++++++++++++------------------ 3 files changed, 38 insertions(+), 44 deletions(-)

1 0

Alexandre Julliard : rpcrt4: Use nameless union/structs.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: d8e35c51c9be00cf549044d2299d43edb98dbf3a URL: https://gitlab.winehq.org/wine/wine/-/commit/d8e35c51c9be00cf549044d2299d43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 10:24:34 2023 +0200 rpcrt4: Use nameless union/structs. --- dlls/rpcrt4/ndr_marshall.c | 13 ++++++------- dlls/rpcrt4/ndr_ole.c | 10 ++++------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d54e6ce7d0a..5ed6b6364ec 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -33,7 +33,6 @@ #include <string.h> #include <limits.h> -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -4617,15 +4616,15 @@ RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_M if (level != 1) return RPC_S_INVALID_ARG; - memset(&umi->u1.Level1, 0, sizeof(umi->u1.Level1)); + memset(&umi->Level1, 0, sizeof(umi->Level1)); umi->InformationLevel = level; if (umcb->Signature != USER_MARSHAL_CB_SIGNATURE) return RPC_S_INVALID_ARG; - umi->u1.Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; - umi->u1.Level1.pfnFree = umcb->pStubMsg->pfnFree; - umi->u1.Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer; + umi->Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; + umi->Level1.pfnFree = umcb->pStubMsg->pfnFree; + umi->Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer; switch (umcb->CBType) { @@ -4641,8 +4640,8 @@ RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_M umcb->pStubMsg->Buffer > buffer_end) return RPC_X_INVALID_BUFFER; - umi->u1.Level1.Buffer = umcb->pStubMsg->Buffer; - umi->u1.Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; + umi->Level1.Buffer = umcb->pStubMsg->Buffer; + umi->Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; break; } case USER_MARSHAL_CB_BUFFER_SIZE: diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 69ce3e1871b..aa7ca1ab765 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -26,8 +26,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -139,13 +137,13 @@ static HRESULT WINAPI RpcStream_Seek(LPSTREAM iface, RpcStreamImpl *This = impl_from_IStream(iface); switch (origin) { case STREAM_SEEK_SET: - This->pos = move.u.LowPart; + This->pos = move.LowPart; break; case STREAM_SEEK_CUR: - This->pos = This->pos + move.u.LowPart; + This->pos = This->pos + move.LowPart; break; case STREAM_SEEK_END: - This->pos = *This->size + move.u.LowPart; + This->pos = *This->size + move.LowPart; break; default: return STG_E_INVALIDFUNCTION; @@ -161,7 +159,7 @@ static HRESULT WINAPI RpcStream_SetSize(LPSTREAM iface, ULARGE_INTEGER newSize) { RpcStreamImpl *This = impl_from_IStream(iface); - *This->size = newSize.u.LowPart; + *This->size = newSize.LowPart; return S_OK; }

1 0

Alexandre Julliard : ws2_32: Use nameless union/structs.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: e20b1431a8ce4b3a3996ffdc0ab5eb5a5ab0648a URL: https://gitlab.winehq.org/wine/wine/-/commit/e20b1431a8ce4b3a3996ffdc0ab5eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 10:25:00 2023 +0200 ws2_32: Use nameless union/structs. --- dlls/ws2_32/protocol.c | 4 ++-- dlls/ws2_32/socket.c | 30 +++++++++++++++--------------- dlls/ws2_32/ws2_32_private.h | 2 -- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index f746257a4fc..4d0f6561ad4 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -356,7 +356,7 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co if (res) { *args->result = addrinfo_list_AtoW(res); - overlapped->u.Pointer = args->result; + overlapped->Pointer = args->result; freeaddrinfo(res); } @@ -836,7 +836,7 @@ static struct hostent *get_local_ips( char *hostname ) /* Check if this is a default route (there may be more than one) */ if (!routes->table[n].dwForwardDest) ifdefault = ++default_routes; - else if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) + else if (routes->table[n].ForwardType != MIB_IPROUTE_TYPE_DIRECT) continue; ifindex = routes->table[n].dwForwardIfIndex; ifmetric = routes->table[n].dwForwardMetric1; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 710ec8cbb26..5d647d12699 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -767,7 +767,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len ) { if (wait_event_alertable( sync_event ) == WAIT_FAILED) return SOCKET_ERROR; - status = io.u.Status; + status = io.Status; } if (status) { @@ -862,8 +862,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE file, DWORD file_len, DWOR event = overlapped->hEvent; overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; - params.offset.u.LowPart = overlapped->u.s.Offset; - params.offset.u.HighPart = overlapped->u.s.OffsetHigh; + params.offset.LowPart = overlapped->Offset; + params.offset.HighPart = overlapped->OffsetHigh; } else { @@ -889,7 +889,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE file, DWORD file_len, DWOR { if (WaitForSingleObject( event, INFINITE ) == WAIT_FAILED) return FALSE; - status = piosb->u.Status; + status = piosb->Status; } SetLastError( NtStatusToWSAError( status ) ); TRACE( "status %#lx.\n", status ); @@ -926,7 +926,7 @@ static void WINAPI WS2_GetAcceptExSockaddrs( void *buffer, DWORD data_size, DWOR static void WINAPI socket_apc( void *apc_user, IO_STATUS_BLOCK *io, ULONG reserved ) { LPWSAOVERLAPPED_COMPLETION_ROUTINE func = apc_user; - func( NtStatusToWSAError( io->u.Status ), io->Information, (OVERLAPPED *)io, 0 ); + func( NtStatusToWSAError( io->Status ), io->Information, (OVERLAPPED *)io, 0 ); } static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD *ret_size, DWORD *flags, @@ -954,7 +954,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * { if (!(event = get_sync_event())) return -1; } - piosb->u.Status = STATUS_PENDING; + piosb->Status = STATUS_PENDING; if (completion) { @@ -977,7 +977,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * { if (wait_event_alertable( event ) == WAIT_FAILED) return -1; - status = piosb->u.Status; + status = piosb->Status; } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); @@ -1022,7 +1022,7 @@ static int WS2_sendto( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD *ret { if (!(event = get_sync_event())) return -1; } - piosb->u.Status = STATUS_PENDING; + piosb->Status = STATUS_PENDING; if (completion) { @@ -1044,7 +1044,7 @@ static int WS2_sendto( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD *ret { if (WaitForSingleObject( event, INFINITE ) == WAIT_FAILED) return -1; - status = piosb->u.Status; + status = piosb->Status; } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); @@ -1174,7 +1174,7 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) return -1; - status = io.u.Status; + status = io.Status; } if (status) TRACE( "failed, status %#lx.\n", status ); @@ -1241,7 +1241,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) if (status == STATUS_PENDING) { if (wait_event_alertable( sync_event ) == WAIT_FAILED) return -1; - status = io.u.Status; + status = io.Status; } if (status) { @@ -2266,7 +2266,7 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s { if (WaitForSingleObject( event, INFINITE ) == WAIT_FAILED) return -1; - status = piosb->u.Status; + status = piosb->Status; } if (status == STATUS_NOT_SUPPORTED) { @@ -2847,7 +2847,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, free( params ); return -1; } - status = io.u.Status; + status = io.Status; } if (status == STATUS_TIMEOUT) status = STATUS_SUCCESS; if (!status) @@ -2999,7 +2999,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) free( params ); return -1; } - status = io.u.Status; + status = io.Status; } if (!status) { @@ -3732,7 +3732,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, *lpcbTransfer = lpOverlapped->InternalHigh; if ( lpdwFlags ) - *lpdwFlags = lpOverlapped->u.s.Offset; + *lpdwFlags = lpOverlapped->Offset; SetLastError( NtStatusToWSAError(status) ); TRACE( "status %#lx.\n", status ); diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 10cb4da30aa..6ebcd6837ae 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -26,8 +26,6 @@ #include <string.h> #include <limits.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

1 0