shell32: Use nameless unions.
Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
1610c80a39
commit
b9a8437d52
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue