wine-commits July 2023

wine-commits@winehq.org

1 participants
865 discussions

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 : 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 : 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 : 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 : 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 : 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 : 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

Alex Henrie : include: Annotate SHAlloc with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 16a2243ee992931faac1346aa338fc2151b29589 URL: https://gitlab.winehq.org/wine/wine/-/commit/16a2243ee992931faac1346aa338fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 17 21:51:02 2023 -0600 include: Annotate SHAlloc with __WINE_(DEALLOC|MALLOC). --- include/shlobj.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index c00687e84d8..0774dae7eca 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -74,8 +74,9 @@ enum typedef int GPFIDL_FLAGS; +WINSHELLAPI void WINAPI SHFree(void*); WINSHELLAPI UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); -WINSHELLAPI LPVOID WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1); +WINSHELLAPI void* WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(SHFree) __WINE_MALLOC; WINSHELLAPI HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); WINSHELLAPI HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT); WINSHELLAPI HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); @@ -88,7 +89,6 @@ WINSHELLAPI HRESULT WINAPI SHCreateStdEnumFmtEtc(DWORD,const FORMATETC *,IE WINSHELLAPI void WINAPI SHDestroyPropSheetExtArray(HPSXA); WINSHELLAPI BOOL WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST); WINSHELLAPI DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT); -WINSHELLAPI void WINAPI SHFree(LPVOID); WINSHELLAPI BOOL WINAPI GetFileNameFromBrowse(HWND,LPWSTR,DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); WINSHELLAPI HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); WINSHELLAPI HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR);

1 0

Alex Henrie : shell32: Free item lists with ILFree.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 36cf7b3d9d5f0b253905f99a1e23747628f1c975 URL: https://gitlab.winehq.org/wine/wine/-/commit/36cf7b3d9d5f0b253905f99a1e2374… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 17 21:51:02 2023 -0600 shell32: Free item lists with ILFree. --- dlls/shell32/clipboard.c | 4 ++-- dlls/shell32/cpanelfolder.c | 6 +++--- dlls/shell32/pidl.c | 2 +- dlls/shell32/shfldr_desktop.c | 6 +++--- dlls/shell32/shfldr_fs.c | 8 ++++---- dlls/shell32/shfldr_mycomp.c | 6 +++--- dlls/shell32/shfldr_netplaces.c | 4 ++-- dlls/shell32/shlview_cmenu.c | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c index 2f5c63bed9d..487fd0dcf8c 100644 --- a/dlls/shell32/clipboard.c +++ b/dlls/shell32/clipboard.c @@ -165,7 +165,7 @@ HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) return 0; bSuccess = SHGetPathFromIDListA(pidl, szTemp); - SHFree(pidl); + ILFree(pidl); if (!bSuccess) return 0; @@ -197,7 +197,7 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) return 0; bSuccess = SHGetPathFromIDListW(pidl, szTemp); - SHFree(pidl); + ILFree(pidl); if (!bSuccess) return 0; diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index a03f1c3d38c..69af6734f57 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -636,18 +636,18 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 *iface, HWN } else if (IsEqualIID(riid, &IID_IExtractIconA) &&(cidl == 1)) { pidl = ILCombine(This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor(pidl); - SHFree(pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID(riid, &IID_IExtractIconW) &&(cidl == 1)) { pidl = ILCombine(This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor(pidl); - SHFree(pidl); + ILFree(pidl); hr = S_OK; } else if ((IsEqualIID(riid,&IID_IShellLinkW) || IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine(This->pidlRoot, apidl[0]); hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); - SHFree(pidl); + ILFree(pidl); } else { hr = E_NOINTERFACE; } diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a7b5b60b270..9878ef9811e 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1328,7 +1328,7 @@ HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, LPITEMIDLIST pidlParent = ILClone(pidl); ILRemoveLastID(pidlParent); hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); - SHFree (pidlParent); + ILFree(pidlParent); } if (psfDesktop) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 3ebd8806808..49de36aa741 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -530,14 +530,14 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) @@ -550,7 +550,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); - SHFree (pidl); + ILFree(pidl); } else hr = E_NOINTERFACE; diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index b1acfe2ded5..32de9ab6ef1 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -710,12 +710,12 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, } else if (IsEqualIID (riid, &IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) { hr = IShellFolder2_QueryInterface (iface, &IID_IDropTarget, @@ -724,7 +724,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); - SHFree (pidl); + ILFree(pidl); } else { hr = E_NOINTERFACE; } @@ -1305,7 +1305,7 @@ ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl) { LPITEMIDLIST pidl = ILCombine(This->pidlRoot, apidl[i]); SHChangeNotify(wEventId, SHCNF_IDLIST, pidl, NULL); - SHFree(pidl); + ILFree(pidl); } wszCurrentPath += lstrlenW(wszCurrentPath)+1; diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 0f7408e1fae..6d24a8e5c9e 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -527,14 +527,14 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) @@ -547,7 +547,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj); - SHFree (pidl); + ILFree(pidl); } else hr = E_NOINTERFACE; diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 5f5ec43491c..0a48a000bcd 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -424,14 +424,14 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetUIObjectOf (IShellFolder2 * iface, { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); + ILFree(pidl); hr = S_OK; } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index b4cc56321ef..87d25794898 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -282,7 +282,7 @@ static void DoOpenExplore(ContextMenu *This, HWND hwnd, LPCSTR verb) sei.nShow = SW_SHOWNORMAL; sei.lpVerb = verb; ShellExecuteExA(&sei); - SHFree(pidlFQ); + ILFree(pidlFQ); } /************************************************************************** @@ -1150,7 +1150,7 @@ static HRESULT paste_pidls(ContextMenu *This, ITEMIDLIST **pidls, UINT count) if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); IShellFolder_Release(psfFrom); } - SHFree(pidl_dir); + ILFree(pidl_dir); } IShellFolder_Release(psfDesktop);

1 0

Alex Henrie : include: Annotate IoAllocate functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: c79ffafcae894cc3d800a96bbf7da3d8fd95b138 URL: https://gitlab.winehq.org/wine/wine/-/commit/c79ffafcae894cc3d800a96bbf7da3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 4 14:57:14 2023 -0600 include: Annotate IoAllocate functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- include/ddk/wdm.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0e54d59a7f6..79c88315c2e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1705,13 +1705,17 @@ void WINAPI ExUnregisterCallback(void*); #define PLUGPLAY_PROPERTY_PERSISTENT 0x0001 +void WINAPI IoFreeErrorLogEntry(void*); +void WINAPI IoFreeIrp(IRP*); +void WINAPI IoFreeMdl(MDL*); +void WINAPI IoFreeWorkItem(PIO_WORKITEM); void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); -PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); -PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); -PMDL WINAPI IoAllocateMdl(PVOID,ULONG,BOOLEAN,BOOLEAN,IRP*); -PIO_WORKITEM WINAPI IoAllocateWorkItem(PDEVICE_OBJECT); +void* WINAPI IoAllocateErrorLogEntry(void*,unsigned char) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(IoFreeErrorLogEntry) __WINE_MALLOC; +IRP* WINAPI IoAllocateIrp(char,BOOLEAN) __WINE_DEALLOC(IoFreeIrp); +MDL* WINAPI IoAllocateMdl(void*,ULONG,BOOLEAN,BOOLEAN,IRP*) __WINE_DEALLOC(IoFreeMdl); +PIO_WORKITEM WINAPI IoAllocateWorkItem(DEVICE_OBJECT*) __WINE_DEALLOC(IoFreeWorkItem); void WINAPI IoDetachDevice(PDEVICE_OBJECT); PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack(PDEVICE_OBJECT,PDEVICE_OBJECT); PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG,DEVICE_OBJECT*,void*,ULONG,LARGE_INTEGER*,IO_STATUS_BLOCK*); @@ -1728,9 +1732,6 @@ PKEVENT WINAPI IoCreateSynchronizationEvent(UNICODE_STRING*,HANDLE*); void WINAPI IoDeleteDevice(DEVICE_OBJECT*); void WINAPI IoDeleteDriver(DRIVER_OBJECT*); NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); -void WINAPI IoFreeIrp(IRP*); -void WINAPI IoFreeMdl(MDL*); -void WINAPI IoFreeWorkItem(PIO_WORKITEM); DEVICE_OBJECT * WINAPI IoGetAttachedDeviceReference(DEVICE_OBJECT*); PEPROCESS WINAPI IoGetCurrentProcess(void); NTSTATUS WINAPI IoGetDeviceInterfaces(const GUID*,PDEVICE_OBJECT,ULONG,PWSTR*);

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2023