Jacek Caban : wininet: Use nameless structs and unions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5d8dde1ab731af9e5151962d3da45e829195c465
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5d8dde1ab731af9e5151962d3...

Author: Jacek Caban 
Date:   Tue Mar 23 00:30:47 2021 +0100

wininet: Use nameless structs and unions.

Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

dlls/wininet/Makefile.in |  1 -
 dlls/wininet/urlcache.c  | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index 615433ea0fb..79823806803 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -D_WINX32_ -DWINE_NO_NAMELESS_EXTENSION
 MODULE    = wininet.dll
 IMPORTLIB = wininet
 IMPORTS   = mpr shlwapi shell32 user32 ws2_32 advapi32
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index c4ca54ac87c..d8b0d5fb037 100644
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -3809,12 +3809,12 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD s
     info->dwNumCachePaths = 1;
     info->dwNormalUsage = 0;
     info->dwExemptUsage = 0;
-    info->u.s.dwCacheSize = container->file_size / 1024;
-    lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH);
+    info->dwCacheSize = container->file_size / 1024;
+    lstrcpynW(info->CachePath, container->path, MAX_PATH);

cache_container_close_index(container);

-    TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath));
+    TRACE("CachePath %s\n", debugstr_w(info->CachePath));

return TRUE;
 }
@@ -3846,8 +3846,8 @@ BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD s
     info->dwNumCachePaths = infoW.dwNumCachePaths;
     info->dwNormalUsage = infoW.dwNormalUsage;
     info->dwExemptUsage = infoW.dwExemptUsage;
-    info->u.s.dwCacheSize = infoW.u.s.dwCacheSize;
-    WideCharToMultiByte(CP_ACP, 0, infoW.u.s.CachePath, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL);
+    info->dwCacheSize = infoW.dwCacheSize;
+    WideCharToMultiByte(CP_ACP, 0, infoW.CachePath, -1, info->CachePath, MAX_PATH, NULL, NULL);

return TRUE;
 }