Jacek Caban : ieframe: Use nameless unions.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Mar 22 18:31:46 2021 +0100

ieframe: Use nameless unions.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in
index 1ddb02598cc..61037143f2e 100644
--- a/dlls/ieframe/Makefile.in
+++ b/dlls/ieframe/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = ieframe.dll
 IMPORTLIB = ieframe
 IMPORTS   = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32
-EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c
index 6c64eb5b3b2..4a0e870ca09 100644
--- a/dlls/ieframe/intshcut.c
+++ b/dlls/ieframe/intshcut.c
@@ -509,7 +509,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam
         ps.ulKind = PRSPEC_PROPID;
         ps.u.propid = PID_IS_ICONFILE;
         pv.vt = VT_LPWSTR;
-        pv.u.pwszVal = iconfile;
+        pv.pwszVal = iconfile;
         hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0);
         if (FAILED(hr))
             TRACE("Failed to store the iconfile to our property storage.  hr = 0x%x\n", hr);
@@ -525,7 +525,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam
         ps.ulKind = PRSPEC_PROPID;
         ps.u.propid = PID_IS_ICONINDEX;
         pv.vt = VT_I4;
-        pv.u.iVal = iconindex;
+        pv.iVal = iconindex;
         hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0);
         if (FAILED(hr))
            TRACE("Failed to store the iconindex to our property storage.  hr = 0x%x\n", hr);
@@ -606,18 +606,18 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam
                 else if (SUCCEEDED(hr))
                 {
                     char indexString[50];
-                    len = WideCharToMultiByte(CP_UTF8, 0, pvread[0].u.pwszVal, -1, NULL, 0, 0, 0);
+                    len = WideCharToMultiByte(CP_UTF8, 0, pvread[0].pwszVal, -1, NULL, 0, 0, 0);
                     iconfile = heap_alloc(len);
                     if (iconfile != NULL)
                     {
-                        WideCharToMultiByte(CP_UTF8, 0, pvread[0].u.pwszVal, -1, iconfile, len, 0, 0);
+                        WideCharToMultiByte(CP_UTF8, 0, pvread[0].pwszVal, -1, iconfile, len, 0, 0);
                         WriteFile(file, str_ICONFILE, lstrlenA(str_ICONFILE), &bytesWritten, NULL);
                         WriteFile(file, iconfile, lstrlenA(iconfile), &bytesWritten, NULL);
                         WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL);
                         heap_free(iconfile);
                     }
 
-                    sprintf(indexString, "ICONINDEX=%d", pvread[1].u.iVal);
+                    sprintf(indexString, "ICONINDEX=%d", pvread[1].iVal);
                     WriteFile(file, indexString, lstrlenA(indexString), &bytesWritten, NULL);
                     WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL);