Module: wine Branch: master Commit: 94efe81ad581a43a121a60324e325b30e6c197f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/94efe81ad581a43a121a60324e325b3...
Author: Alexandre Julliard julliard@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)