From b9a8437d52efb16fb29924bde16b166b645692bc Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Wed, 24 Mar 2021 18:37:56 +0100 Subject: [PATCH] shell32: Use nameless unions. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/shellole.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index e89177c3a73..fe49bf09f98 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHELL32_ -DWINE_NO_NAMELESS_EXTENSION +EXTRADEFS = -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 3c88642512e..64ae59fd283 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -718,7 +718,7 @@ HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, if(FAILED(hres) || ret.vt!=VT_I2) *puCodePage = 0; else - *puCodePage = ret.u.iVal; + *puCodePage = ret.iVal; } } @@ -751,7 +751,7 @@ HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, if(FAILED(hres) || ret.vt!=VT_I2) return S_OK; - uCodePage = ret.u.iVal; + uCodePage = ret.iVal; } hres = IPropertyStorage_Stat(pps, &stat); @@ -789,10 +789,10 @@ HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); if(FAILED(hres)) return hres; - if(ret.vt!=VT_I2 || !ret.u.iVal) + if(ret.vt!=VT_I2 || !ret.iVal) return E_FAIL; - codepage = ret.u.iVal; + codepage = ret.iVal; if(uCodePage) *uCodePage = codepage; }