Module: wine Branch: master Commit: c48816400b300f830767b14207292d8efc0cfa31 URL: https://gitlab.winehq.org/wine/wine/-/commit/c48816400b300f830767b14207292d8...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Jul 13 11:57:35 2023 +0200
ieframe: Use nameless unions/structs.
---
dlls/ieframe/intshcut.c | 10 ++++------ dlls/ieframe/navigate.c | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index d250fb051ea..b992305a724 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -29,8 +29,6 @@
#include <stdio.h>
-#define NONAMELESSUNION - #include "ieframe.h"
#include "shlobj.h" @@ -507,7 +505,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam PROPSPEC ps; PROPVARIANT pv; ps.ulKind = PRSPEC_PROPID; - ps.u.propid = PID_IS_ICONFILE; + ps.propid = PID_IS_ICONFILE; pv.vt = VT_LPWSTR; pv.pwszVal = iconfile; hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); @@ -523,7 +521,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam PROPVARIANT pv; iconindex = wcstol(iconindexstring, NULL, 10); ps.ulKind = PRSPEC_PROPID; - ps.u.propid = PID_IS_ICONINDEX; + ps.propid = PID_IS_ICONINDEX; pv.vt = VT_I4; pv.iVal = iconindex; hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); @@ -583,9 +581,9 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam PROPSPEC ps[2]; PROPVARIANT pvread[2]; ps[0].ulKind = PRSPEC_PROPID; - ps[0].u.propid = PID_IS_ICONFILE; + ps[0].propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - ps[1].u.propid = PID_IS_ICONINDEX; + ps[1].propid = PID_IS_ICONINDEX;
WriteFile(file, str_header, ARRAY_SIZE(str_header) - 1, &bytesWritten, NULL); WriteFile(file, str_eol, ARRAY_SIZE(str_eol) - 1, &bytesWritten, NULL); diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 8f8b1f3f192..488ac62fbdf 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define NONAMELESSUNION - #include "ieframe.h"
#include "exdispid.h" @@ -80,7 +78,7 @@ static void dump_BINDINFO(BINDINFO *bi) "}\n",
bi->cbSize, debugstr_w(bi->szExtraInfo), - bi->stgmedData.tymed, bi->stgmedData.u.hGlobal, bi->stgmedData.pUnkForRelease, + bi->stgmedData.tymed, bi->stgmedData.hGlobal, bi->stgmedData.pUnkForRelease, bi->grfBindInfoF > BINDINFOF_URLENCODEDEXTRAINFO ? "unknown" : BINDINFOF_str[bi->grfBindInfoF], bi->dwBindVerb > BINDVERB_CUSTOM @@ -392,7 +390,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, pbindinfo->dwBindVerb = BINDVERB_POST;
pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; - pbindinfo->stgmedData.u.hGlobal = This->post_data; + pbindinfo->stgmedData.hGlobal = This->post_data; pbindinfo->cbstgmedData = This->post_data_len; pbindinfo->stgmedData.pUnkForRelease = (IUnknown*)&This->IBindStatusCallback_iface; IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); @@ -1040,7 +1038,7 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, if(bindinfo.dwBindVerb == BINDVERB_POST) { post_data_len = bindinfo.cbstgmedData; if(post_data_len) - post_data = bindinfo.stgmedData.u.hGlobal; + post_data = bindinfo.stgmedData.hGlobal; }
if(This->doc_navigate) {