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

Alexandre Julliard : winhttp: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: f58ce1cef6967f4326b3ec88ca5f7d3278dd4c2d URL: https://gitlab.winehq.org/wine/wine/-/commit/f58ce1cef6967f4326b3ec88ca5f7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:54:48 2023 +0200 winhttp: Use nameless unions/structs. --- dlls/winhttp/net.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 1be78d126d4..6eeb1cb5ac9 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -20,7 +20,6 @@ #include <assert.h> #include <stdarg.h> -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "ws2tcpip.h" @@ -147,7 +146,7 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu */ memcpy(&chainCopy, chain, sizeof(chainCopy)); chainCopy.TrustStatus.dwErrorStatus = 0; - sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); + sslExtraPolicyPara.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = server; sslExtraPolicyPara.fdwChecks = security_flags;

1 0

Alexandre Julliard : wininet: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 94efe81ad581a43a121a60324e325b30e6c197f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/94efe81ad581a43a121a60324e325b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:55:12 2023 +0200 wininet: Use nameless unions/structs. --- dlls/wininet/netconnection.c | 4 +--- dlls/wininet/urlcache.c | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 40da064588b..06aa5c82f6c 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "ws2tcpip.h" #include <time.h> @@ -162,7 +160,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR */ memcpy(&chainCopy, chain, sizeof(chainCopy)); chainCopy.TrustStatus.dwErrorStatus = 0; - sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); + sslExtraPolicyPara.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = conn->server->name; sslExtraPolicyPara.fdwChecks = conn->security_flags; diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index cad4c39046b..bad6f34b510 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -22,9 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ws2tcpip.h" #include <limits.h> @@ -1270,7 +1267,7 @@ static DWORD urlcache_copy_entry(cache_container *container, const urlcache_head entry_info->lpszLocalFileName = NULL; entry_info->lpszSourceUrlName = NULL; entry_info->CacheEntryType = url_entry->cache_entry_type; - entry_info->u.dwExemptDelta = url_entry->exempt_delta; + entry_info->dwExemptDelta = url_entry->exempt_delta; entry_info->dwHeaderInfoSize = url_entry->header_info_size; entry_info->dwHitRate = url_entry->hit_rate; entry_info->dwSizeHigh = url_entry->size.u.HighPart; @@ -1394,7 +1391,7 @@ static DWORD urlcache_set_entry_info(entry_url *url_entry, const INTERNET_CACHE_ if (field_control & CACHE_ENTRY_ATTRIBUTE_FC) url_entry->cache_entry_type = entry_info->CacheEntryType; if (field_control & CACHE_ENTRY_EXEMPT_DELTA_FC) - url_entry->exempt_delta = entry_info->u.dwExemptDelta; + url_entry->exempt_delta = entry_info->dwExemptDelta; if (field_control & CACHE_ENTRY_EXPTIME_FC) file_time_to_dos_date_time(&entry_info->ExpireTime, &url_entry->expire_date, &url_entry->expire_time); if (field_control & CACHE_ENTRY_HEADERINFO_FC)

1 0

Alexandre Julliard : winmm: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 0682b43b550910a835b7cd1859dbff09691a8f78 URL: https://gitlab.winehq.org/wine/wine/-/commit/0682b43b550910a835b7cd1859dbff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:55:27 2023 +0200 winmm: Use nameless unions/structs. --- dlls/winmm/lolvldrv.c | 1 - dlls/winmm/waveform.c | 38 ++++++++++++++++++-------------------- dlls/winmm/winmm.c | 2 -- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index ff7e83398f1..906405ac74f 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS #include <string.h> diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index ecd2acb8b28..42cc0b24510 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -22,8 +22,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include "windef.h" #include "winbase.h" @@ -3921,8 +3919,8 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA int size = max(1, lpmcdA->cChannels) * sizeof(MIXERCONTROLDETAILS_LISTTEXTW); unsigned int i; - if (lpmcdA->u.cMultipleItems != 0) { - size *= lpmcdA->u.cMultipleItems; + if (lpmcdA->cMultipleItems != 0) { + size *= lpmcdA->cMultipleItems; } pDetailsW = HeapAlloc(GetProcessHeap(), 0, size); lpmcdA->paDetails = pDetailsW; @@ -3931,7 +3929,7 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA ret = mixerGetControlDetailsW(hmix, lpmcdA, fdwDetails); /* copy from lpmcd->paDetails back to paDetailsW; */ if (ret == MMSYSERR_NOERROR) { - for (i = 0; i < lpmcdA->u.cMultipleItems * lpmcdA->cChannels; i++) { + for (i = 0; i < lpmcdA->cMultipleItems * lpmcdA->cChannels; i++) { pDetailsA->dwParam1 = pDetailsW->dwParam1; pDetailsA->dwParam2 = pDetailsW->dwParam2; WideCharToMultiByte( CP_ACP, 0, pDetailsW->szName, -1, @@ -3940,8 +3938,8 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA pDetailsA++; pDetailsW++; } - pDetailsA -= lpmcdA->u.cMultipleItems * lpmcdA->cChannels; - pDetailsW -= lpmcdA->u.cMultipleItems * lpmcdA->cChannels; + pDetailsA -= lpmcdA->cMultipleItems * lpmcdA->cChannels; + pDetailsW -= lpmcdA->cMultipleItems * lpmcdA->cChannels; } HeapFree(GetProcessHeap(), 0, pDetailsW); lpmcdA->paDetails = pDetailsA; @@ -3973,8 +3971,8 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, mlcW.cbStruct = sizeof(mlcW); mlcW.dwLineID = lpmlcA->dwLineID; - mlcW.u.dwControlID = lpmlcA->u.dwControlID; - mlcW.u.dwControlType = lpmlcA->u.dwControlType; + mlcW.dwControlID = lpmlcA->dwControlID; + mlcW.dwControlType = lpmlcA->dwControlType; /* Debugging on Windows shows for MIXER_GETLINECONTROLSF_ONEBYTYPE only, the control count is assumed to be 1 - This is relied upon by a game, @@ -3992,8 +3990,8 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, if (ret == MMSYSERR_NOERROR) { lpmlcA->dwLineID = mlcW.dwLineID; - lpmlcA->u.dwControlID = mlcW.u.dwControlID; - lpmlcA->u.dwControlType = mlcW.u.dwControlType; + lpmlcA->dwControlID = mlcW.dwControlID; + lpmlcA->dwControlType = mlcW.dwControlType; for (i = 0; i < mlcW.cControls; i++) { lpmlcA->pamxctrl[i].cbStruct = sizeof(MIXERCONTROLA); @@ -4032,8 +4030,8 @@ static UINT WINMM_GetVolumeLineControl(WINMM_MMDevice *mmdevice, DWORD line, ctl->cMultipleItems = 0; LoadStringW(hWinMM32Instance, IDS_VOLUME, ctl->szShortName, MIXER_SHORT_NAME_CHARS); LoadStringW(hWinMM32Instance, IDS_VOLUME, ctl->szName, MIXER_LONG_NAME_CHARS); - ctl->Bounds.s1.dwMinimum = 0; - ctl->Bounds.s1.dwMaximum = 0xFFFF; + ctl->Bounds.dwMinimum = 0; + ctl->Bounds.dwMaximum = 0xFFFF; ctl->Metrics.cSteps = 192; return MMSYSERR_NOERROR; @@ -4048,8 +4046,8 @@ static UINT WINMM_GetMuteLineControl(WINMM_MMDevice *mmdevice, DWORD line, ctl->cMultipleItems = 0; LoadStringW(hWinMM32Instance, IDS_MUTE, ctl->szShortName, MIXER_SHORT_NAME_CHARS); LoadStringW(hWinMM32Instance, IDS_MUTE, ctl->szName, MIXER_LONG_NAME_CHARS); - ctl->Bounds.s1.dwMinimum = 0; - ctl->Bounds.s1.dwMaximum = 1; + ctl->Bounds.dwMinimum = 0; + ctl->Bounds.dwMaximum = 1; ctl->Metrics.cSteps = 0; return MMSYSERR_NOERROR; @@ -4083,7 +4081,7 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, return MMSYSERR_INVALPARAM; TRACE("dwLineID: %lu\n", lpmlcW->dwLineID); - TRACE("dwControl: %lx\n", lpmlcW->u.dwControlID); + TRACE("dwControl: %lx\n", lpmlcW->dwControlID); TRACE("cControls: %lu\n", lpmlcW->cControls); mmdevice = WINMM_GetMixerMMDevice(hmix, fdwControls, NULL); @@ -4110,10 +4108,10 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, return MMSYSERR_INVALPARAM; if(lpmlcW->dwLineID != 0 && lpmlcW->dwLineID != 0xFFFF0000) return MIXERR_INVALLINE; - if(lpmlcW->u.dwControlID == 0) + if(lpmlcW->dwControlID == 0) return WINMM_GetVolumeLineControl(mmdevice, lpmlcW->dwLineID, lpmlcW->pamxctrl, fdwControls); - if(lpmlcW->u.dwControlID == 1) + if(lpmlcW->dwControlID == 1) return WINMM_GetMuteLineControl(mmdevice, lpmlcW->dwLineID, lpmlcW->pamxctrl, fdwControls); return MMSYSERR_NOTSUPPORTED; @@ -4124,10 +4122,10 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, return MMSYSERR_INVALPARAM; if(lpmlcW->dwLineID != 0 && lpmlcW->dwLineID != 0xFFFF0000) return MIXERR_INVALLINE; - if(lpmlcW->u.dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + if(lpmlcW->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) return WINMM_GetVolumeLineControl(mmdevice, lpmlcW->dwLineID, lpmlcW->pamxctrl, fdwControls); - if(lpmlcW->u.dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + if(lpmlcW->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) return WINMM_GetMuteLineControl(mmdevice, lpmlcW->dwLineID, lpmlcW->pamxctrl, fdwControls); return MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 31567d33c4f..f69c2282073 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -43,8 +43,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "mmsystem.h"

1 0

Alexandre Julliard : winspool.drv: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 0724f94fa74d497a1f99b2ac7ce225116f11ebff URL: https://gitlab.winehq.org/wine/wine/-/commit/0724f94fa74d497a1f99b2ac7ce225… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:55:40 2023 +0200 winspool.drv: Use nameless unions/structs. --- dlls/winspool.drv/info.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index b82df25082c..8a948ce7575 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -30,9 +30,6 @@ #include <ctype.h> #include <stddef.h> -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -1898,17 +1895,17 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size) } map[] = { #define F_SIZE(field) FIELD_OFFSET(DEVMODEW, field) + sizeof(dm->field) - { DM_ORIENTATION, F_SIZE(u1.s1.dmOrientation) }, - { DM_PAPERSIZE, F_SIZE(u1.s1.dmPaperSize) }, - { DM_PAPERLENGTH, F_SIZE(u1.s1.dmPaperLength) }, - { DM_PAPERWIDTH, F_SIZE(u1.s1.dmPaperWidth) }, - { DM_SCALE, F_SIZE(u1.s1.dmScale) }, - { DM_COPIES, F_SIZE(u1.s1.dmCopies) }, - { DM_DEFAULTSOURCE, F_SIZE(u1.s1.dmDefaultSource) }, - { DM_PRINTQUALITY, F_SIZE(u1.s1.dmPrintQuality) }, - { DM_POSITION, F_SIZE(u1.s2.dmPosition) }, - { DM_DISPLAYORIENTATION, F_SIZE(u1.s2.dmDisplayOrientation) }, - { DM_DISPLAYFIXEDOUTPUT, F_SIZE(u1.s2.dmDisplayFixedOutput) }, + { DM_ORIENTATION, F_SIZE(dmOrientation) }, + { DM_PAPERSIZE, F_SIZE(dmPaperSize) }, + { DM_PAPERLENGTH, F_SIZE(dmPaperLength) }, + { DM_PAPERWIDTH, F_SIZE(dmPaperWidth) }, + { DM_SCALE, F_SIZE(dmScale) }, + { DM_COPIES, F_SIZE(dmCopies) }, + { DM_DEFAULTSOURCE, F_SIZE(dmDefaultSource) }, + { DM_PRINTQUALITY, F_SIZE(dmPrintQuality) }, + { DM_POSITION, F_SIZE(dmPosition) }, + { DM_DISPLAYORIENTATION, F_SIZE(dmDisplayOrientation) }, + { DM_DISPLAYFIXEDOUTPUT, F_SIZE(dmDisplayFixedOutput) }, { DM_COLOR, F_SIZE(dmColor) }, { DM_DUPLEX, F_SIZE(dmDuplex) }, { DM_YRESOLUTION, F_SIZE(dmYResolution) }, @@ -1919,8 +1916,8 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size) { DM_BITSPERPEL, F_SIZE(dmBitsPerPel) }, { DM_PELSWIDTH, F_SIZE(dmPelsWidth) }, { DM_PELSHEIGHT, F_SIZE(dmPelsHeight) }, - { DM_DISPLAYFLAGS, F_SIZE(u2.dmDisplayFlags) }, - { DM_NUP, F_SIZE(u2.dmNup) }, + { DM_DISPLAYFLAGS, F_SIZE(dmDisplayFlags) }, + { DM_NUP, F_SIZE(dmNup) }, { DM_DISPLAYFREQUENCY, F_SIZE(dmDisplayFrequency) }, { DM_ICMMETHOD, F_SIZE(dmICMMethod) }, { DM_ICMINTENT, F_SIZE(dmICMIntent) },

1 0

Alexandre Julliard : strmbase: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: f5c4ae7c10a505d77f7764aa260e1cbfb0966bd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c4ae7c10a505d77f7764aa260e1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:55:55 2023 +0200 strmbase: Use nameless unions/structs. --- libs/strmbase/mediatype.c | 6 +++--- libs/strmbase/strmbase_private.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/strmbase/mediatype.c b/libs/strmbase/mediatype.c index 33af6f2e636..90c9bd01206 100644 --- a/libs/strmbase/mediatype.c +++ b/libs/strmbase/mediatype.c @@ -132,10 +132,10 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) if (vih->dwInterlaceFlags) TRACE("interlace flags %#lx, ", vih->dwInterlaceFlags); if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#lx, ", vih->dwCopyProtectFlags); TRACE("aspect ratio %lu/%lu, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); - if (vih->u.dwControlFlags) TRACE("control flags %#lx, ", vih->u.dwControlFlags); - if (vih->u.dwControlFlags & AMCONTROL_COLORINFO_PRESENT) + if (vih->dwControlFlags) TRACE("control flags %#lx, ", vih->dwControlFlags); + if (vih->dwControlFlags & AMCONTROL_COLORINFO_PRESENT) { - const DXVA_ExtendedFormat *colorimetry = (const DXVA_ExtendedFormat *)&vih->u.dwControlFlags; + const DXVA_ExtendedFormat *colorimetry = (const DXVA_ExtendedFormat *)&vih->dwControlFlags; TRACE("chroma site %#x, range %#x, matrix %#x, lighting %#x, primaries %#x, transfer function %#x, ", colorimetry->VideoChromaSubsampling, colorimetry->NominalRange, colorimetry->VideoTransferMatrix, diff --git a/libs/strmbase/strmbase_private.h b/libs/strmbase/strmbase_private.h index 9ac0b24bb1a..cf702a279c2 100644 --- a/libs/strmbase/strmbase_private.h +++ b/libs/strmbase/strmbase_private.h @@ -22,8 +22,6 @@ #define __WINE_STRMBASE_PRIVATE_H #include <assert.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include "dshow.h" #include "uuids.h"

1 0

Alexandre Julliard : krnl386: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 7a82d78b171873c45e7aca211ae07a92df5aac4f URL: https://gitlab.winehq.org/wine/wine/-/commit/7a82d78b171873c45e7aca211ae07a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:56:11 2023 +0200 krnl386: Use nameless unions/structs. --- dlls/krnl386.exe16/int2f.c | 1 - dlls/krnl386.exe16/local.c | 7 +++---- dlls/krnl386.exe16/vxd.c | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c index 7114a46e455..fcb9ebd7d79 100644 --- a/dlls/krnl386.exe16/int2f.c +++ b/dlls/krnl386.exe16/int2f.c @@ -25,7 +25,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "wine/winbase16.h" #include "wine/debug.h" #include "winternl.h" diff --git a/dlls/krnl386.exe16/local.c b/dlls/krnl386.exe16/local.c index 672f1c22a19..1f75d8ef00f 100644 --- a/dlls/krnl386.exe16/local.c +++ b/dlls/krnl386.exe16/local.c @@ -27,7 +27,6 @@ * parameter than usual. */ -#define NONAMELESSUNION #include <stdlib.h> #include <string.h> #include "wine/winbase16.h" @@ -2160,9 +2159,9 @@ BOOL16 WINAPI Local32Info16( LOCAL32INFO *pLocal32Info, HGLOBAL16 handle ) { if (entry.wFlags & PROCESS_HEAP_REGION) { - pLocal32Info->dwMemReserved += entry.u.Region.dwCommittedSize - + entry.u.Region.dwUnCommittedSize; - pLocal32Info->dwMemCommitted = entry.u.Region.dwCommittedSize; + pLocal32Info->dwMemReserved += entry.Region.dwCommittedSize + + entry.Region.dwUnCommittedSize; + pLocal32Info->dwMemCommitted = entry.Region.dwCommittedSize; } else if (!(entry.wFlags & PROCESS_HEAP_ENTRY_BUSY)) { diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index a707fc36043..9ac1ea0bbb5 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -27,7 +27,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h"

1 0

Alexandre Julliard : mmsystem: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 80ee53bb90f13f59b638ef40df064050b98c3118 URL: https://gitlab.winehq.org/wine/wine/-/commit/80ee53bb90f13f59b638ef40df0640… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:56:26 2023 +0200 mmsystem: Use nameless unions/structs. --- dlls/mmsystem.dll16/mmsystem.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 59480292224..fc3b6f413bd 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -29,8 +29,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "mmsystem.h" @@ -471,8 +469,8 @@ UINT16 WINAPI mixerGetLineControls16(HMIXEROBJ16 hmix, mlcA.cbStruct = sizeof(mlcA); mlcA.dwLineID = lpmlc16->dwLineID; - mlcA.u.dwControlID = lpmlc16->u.dwControlID; - mlcA.u.dwControlType = lpmlc16->u.dwControlType; + mlcA.dwControlID = lpmlc16->u.dwControlID; + mlcA.dwControlType = lpmlc16->u.dwControlType; mlcA.cControls = lpmlc16->cControls; mlcA.cbmxctrl = sizeof(MIXERCONTROLA); mlcA.pamxctrl = HeapAlloc(GetProcessHeap(), 0, @@ -482,8 +480,8 @@ UINT16 WINAPI mixerGetLineControls16(HMIXEROBJ16 hmix, if (ret == MMSYSERR_NOERROR) { lpmlc16->dwLineID = mlcA.dwLineID; - lpmlc16->u.dwControlID = mlcA.u.dwControlID; - lpmlc16->u.dwControlType = mlcA.u.dwControlType; + lpmlc16->u.dwControlID = mlcA.dwControlID; + lpmlc16->u.dwControlType = mlcA.dwControlType; lpmlc16->cControls = mlcA.cControls; lpmc16 = MapSL(lpmlc16->pamxctrl);

1 0

Alexandre Julliard : ver: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 70a6ac07bf5e353d55500a722c255f937c1fa35d URL: https://gitlab.winehq.org/wine/wine/-/commit/70a6ac07bf5e353d55500a722c255f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 19:56:36 2023 +0200 ver: Use nameless unions/structs. --- dlls/ver.dll16/version.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 6dfbc55c33b..0a16646c740 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -25,8 +25,6 @@ #include <string.h> #include <sys/types.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "wine/winbase16.h" #include "winternl.h" @@ -55,9 +53,9 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DI while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); - if (entry[pos].u.Id > id) max = pos - 1; + if (entry[pos].Id == id) + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].OffsetToDirectory); + if (entry[pos].Id > id) max = pos - 1; else min = pos + 1; } return NULL; @@ -76,7 +74,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_default( const IMAGE_RESOURCE_ const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s2.OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->OffsetToDirectory); } @@ -114,11 +112,11 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_ while (min <= max) { pos = (min + max) / 2; - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].u.s.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].NameOffset); res = wcsnicmp( nameW, str->NameString, str->Length ); if (!res && namelen == str->Length) { - ret = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); + ret = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].OffsetToDirectory); break; } if (res < 0) max = pos - 1;

1 0

Jeff Smith : windowscodecs: Factor out common GIF palette copying logic.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 8ff77999b5600b3cf995cd830b8ec678b6529d6f URL: https://gitlab.winehq.org/wine/wine/-/commit/8ff77999b5600b3cf995cd830b8ec6… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 16 15:02:12 2023 -0500 windowscodecs: Factor out common GIF palette copying logic. --- dlls/windowscodecs/gifformat.c | 92 ++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 52 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index f0048d12da9..11b2ccf6aea 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -701,14 +701,49 @@ static HRESULT WINAPI GifFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, return S_OK; } +static void copy_palette(ColorMapObject *cm, Extensions *extensions, int count, WICColor *colors) +{ + int i; + + if (cm) + { + for (i = 0; i < count; i++) + { + colors[i] = 0xff000000 | /* alpha */ + cm->Colors[i].Red << 16 | + cm->Colors[i].Green << 8 | + cm->Colors[i].Blue; + } + } + else + { + colors[0] = 0xff000000; + colors[1] = 0xffffffff; + for (i = 2; i < count; i++) + colors[i] = 0xff000000; + } + + /* look for the transparent color extension */ + for (i = 0; i < extensions->ExtensionBlockCount; i++) + { + ExtensionBlock *eb = extensions->ExtensionBlocks + i; + if (eb->Function == GRAPHICS_EXT_FUNC_CODE && + eb->ByteCount == 8 && eb->Bytes[3] & 1) + { + int trans = (unsigned char)eb->Bytes[6]; + colors[trans] &= 0xffffff; /* set alpha to 0 */ + break; + } + } +} + static HRESULT WINAPI GifFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); WICColor colors[256]; ColorMapObject *cm = This->frame->ImageDesc.ColorMap; - int i, trans; - ExtensionBlock *eb; + TRACE("(%p,%p)\n", iface, pIPalette); if (!cm) cm = This->parent->gif->SColorMap; @@ -719,24 +754,7 @@ static HRESULT WINAPI GifFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, return E_FAIL; } - for (i = 0; i < cm->ColorCount; i++) { - colors[i] = 0xff000000| /* alpha */ - cm->Colors[i].Red << 16| - cm->Colors[i].Green << 8| - cm->Colors[i].Blue; - } - - /* look for the transparent color extension */ - for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; ++i) { - eb = This->frame->Extensions.ExtensionBlocks + i; - if (eb->Function == GRAPHICS_EXT_FUNC_CODE && eb->ByteCount == 8) { - if (eb->Bytes[3] & 1) { - trans = (unsigned char)eb->Bytes[6]; - colors[trans] &= 0xffffff; /* set alpha to 0 */ - break; - } - } - } + copy_palette(cm, &This->frame->Extensions, cm->ColorCount, colors); return IWICPalette_InitializeCustom(pIPalette, colors, cm->ColorCount); } @@ -1170,8 +1188,7 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet GifDecoder *This = impl_from_IWICBitmapDecoder(iface); WICColor colors[256]; ColorMapObject *cm; - int i, trans, count; - ExtensionBlock *eb; + int count; TRACE("(%p,%p)\n", iface, palette); @@ -1187,41 +1204,12 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet return E_FAIL; } - for (i = 0; i < cm->ColorCount; i++) - { - colors[i] = 0xff000000 | /* alpha */ - cm->Colors[i].Red << 16 | - cm->Colors[i].Green << 8 | - cm->Colors[i].Blue; - } - count = cm->ColorCount; } else - { - colors[0] = 0xff000000; - colors[1] = 0xffffffff; - - for (i = 2; i < 256; i++) - colors[i] = 0xff000000; - count = 256; - } - /* look for the transparent color extension */ - for (i = 0; i < This->gif->SavedImages[This->current_frame].Extensions.ExtensionBlockCount; i++) - { - eb = This->gif->SavedImages[This->current_frame].Extensions.ExtensionBlocks + i; - if (eb->Function == GRAPHICS_EXT_FUNC_CODE && eb->ByteCount == 8) - { - if (eb->Bytes[3] & 1) - { - trans = (unsigned char)eb->Bytes[6]; - colors[trans] &= 0xffffff; /* set alpha to 0 */ - break; - } - } - } + copy_palette(cm, &This->gif->SavedImages[This->current_frame].Extensions, count, colors); return IWICPalette_InitializeCustom(palette, colors, count); }

1 0

Jeff Smith : windowscodecs: Allow GIF with no color table.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 224b771c0d8bf32bae9be5f066692a74978091cc URL: https://gitlab.winehq.org/wine/wine/-/commit/224b771c0d8bf32bae9be5f066692a… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jul 16 15:16:57 2023 -0500 windowscodecs: Allow GIF with no color table. --- dlls/windowscodecs/gifformat.c | 32 +++++++++-------- dlls/windowscodecs/tests/gifformat.c | 70 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/ungif.c | 1 + dlls/windowscodecs/ungif.h | 1 + 4 files changed, 89 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 11b2ccf6aea..152c51eac76 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -743,20 +743,27 @@ static HRESULT WINAPI GifFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); WICColor colors[256]; ColorMapObject *cm = This->frame->ImageDesc.ColorMap; + int count; TRACE("(%p,%p)\n", iface, pIPalette); - if (!cm) cm = This->parent->gif->SColorMap; + if (cm) + count = cm->ColorCount; + else + { + cm = This->parent->gif->SColorMap; + count = This->parent->gif->SColorTableSize; + } - if (cm->ColorCount > 256) + if (count > 256) { - ERR("GIF contains %i colors???\n", cm->ColorCount); + ERR("GIF contains %i colors???\n", count); return E_FAIL; } - copy_palette(cm, &This->frame->Extensions, cm->ColorCount, colors); + copy_palette(cm, &This->frame->Extensions, count, colors); - return IWICPalette_InitializeCustom(pIPalette, colors, cm->ColorCount); + return IWICPalette_InitializeCustom(pIPalette, colors, count); } static HRESULT copy_interlaced_pixels(const BYTE *srcbuffer, @@ -1196,18 +1203,13 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet return WINCODEC_ERR_WRONGSTATE; cm = This->gif->SColorMap; - if (cm) - { - if (cm->ColorCount > 256) - { - ERR("GIF contains invalid number of colors: %d\n", cm->ColorCount); - return E_FAIL; - } + count = This->gif->SColorTableSize; - count = cm->ColorCount; + if (count > 256) + { + ERR("GIF contains invalid number of colors: %d\n", count); + return E_FAIL; } - else - count = 256; copy_palette(cm, &This->gif->SavedImages[This->current_frame].Extensions, count, colors); diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 8488f486a11..08f8ba1c12b 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -57,6 +57,13 @@ static const char gif_local_palette[] = { 0x02,0x02,0x44,0x01,0x00,0x3b }; +static const char gif_no_palette[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x21,0x02,0x00, +/* GCE */0x21,0xf9,0x04,0x01,0x05,0x00,0x01,0x00, /* index 1 */ +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +0x02,0x02,0x44,0x01,0x00,0x3b +}; + /* Generated with ImageMagick: * convert -delay 100 -size 2x2 xc:red \ * -dispose none -page +0+0 -size 2x1 xc:white \ @@ -364,6 +371,67 @@ static void test_local_gif_palette(void) IWICBitmapDecoder_Release(decoder); } +static void test_no_gif_palette(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + decoder = create_decoder(gif_no_palette, sizeof(gif_no_palette)); + ok(decoder != 0, "Failed to load GIF image data\n"); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#lx\n", hr); + + /* global palette */ + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == S_OK, "CopyPalette error %#lx\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#lx\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#lx\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff000000, "expected 0xff000000, got %#x\n", color[0]); + ok(color[1] == 0x00ffffff, "expected 0x00ffffff, got %#x\n", color[1]); + ok(color[2] == 0xff000000, "expected 0xff000000, got %#x\n", color[2]); + ok(color[3] == 0xff000000, "expected 0xff000000, got %#x\n", color[3]); + + /* frame palette */ + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#lx\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#lx\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "wrong pixel format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#lx\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#lx\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#lx\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff000000, "expected 0xff000000, got %#x\n", color[0]); + ok(color[1] == 0x00ffffff, "expected 0x00ffffff, got %#x\n", color[1]); + ok(color[2] == 0xff000000, "expected 0xff000000, got %#x\n", color[2]); + ok(color[3] == 0xff000000, "expected 0xff000000, got %#x\n", color[3]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + static void test_gif_frame_sizes(void) { static const BYTE frame0[] = {0, 1, 0xfe, 0xfe, 2, 3, 0xfe, 0xfe}; @@ -577,6 +645,7 @@ START_TEST(gifformat) test_global_gif_palette(); test_global_gif_palette_2frames(); test_local_gif_palette(); + test_no_gif_palette(); test_gif_frame_sizes(); test_gif_notrailer(); @@ -590,6 +659,7 @@ START_TEST(gifformat) test_global_gif_palette(); test_global_gif_palette_2frames(); test_local_gif_palette(); + test_no_gif_palette(); test_gif_frame_sizes(); test_truncated_gif(); diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 0f5ed6e25d5..1fb16e52f15 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -320,6 +320,7 @@ DGifGetScreenDesc(GifFileType * GifFile) { GifFile->SColorResolution = (((Buf[0] & 0x70) + 1) >> 4) + 1; SortFlag = (Buf[0] & 0x08) != 0; BitsPerPixel = (Buf[0] & 0x07) + 1; + GifFile->SColorTableSize = 1 << BitsPerPixel; GifFile->SBackGroundColor = Buf[1]; GifFile->SAspectRatio = Buf[2]; if (Buf[0] & 0x80) { /* Do we have global color map? */ diff --git a/dlls/windowscodecs/ungif.h b/dlls/windowscodecs/ungif.h index ae8269226df..f61a7eb1e16 100644 --- a/dlls/windowscodecs/ungif.h +++ b/dlls/windowscodecs/ungif.h @@ -114,6 +114,7 @@ typedef struct { typedef struct GifFileType { GifWord SWidth, SHeight, /* Screen dimensions. */ SColorResolution, /* How many colors can we generate? */ + SColorTableSize, /* Calculated color table size, even if not present */ SBackGroundColor, /* I hope you understand this one... */ SAspectRatio; /* Pixel aspect ratio, in 1/64 units, starting at 1:4. */ ColorMapObject *SColorMap; /* NULL if not exists. */

1 0