Removed incorrect uses of DUMMYUNIONNAME.
This commit is contained in:
parent
8cbb94ca93
commit
502f6c5634
|
@ -1161,7 +1161,7 @@ TREEVIEW_DoSetItemT(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
|
||||||
static LRESULT
|
static LRESULT
|
||||||
TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL isW)
|
TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL isW)
|
||||||
{
|
{
|
||||||
const TVITEMEXW *tvItem = &ptdi->DUMMYUNIONNAME.itemex;
|
const TVITEMEXW *tvItem = &ptdi->u.itemex;
|
||||||
HTREEITEM insertAfter;
|
HTREEITEM insertAfter;
|
||||||
TREEVIEW_ITEM *newItem, *parentItem;
|
TREEVIEW_ITEM *newItem, *parentItem;
|
||||||
BOOL bTextUpdated = FALSE;
|
BOOL bTextUpdated = FALSE;
|
||||||
|
|
|
@ -180,7 +180,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyA(
|
||||||
return ERROR_INVALID_HANDLE;
|
return ERROR_INVALID_HANDLE;
|
||||||
|
|
||||||
spec.ulKind = PRSPEC_PROPID;
|
spec.ulKind = PRSPEC_PROPID;
|
||||||
spec.DUMMYUNIONNAME.propid = uiProperty;
|
spec.u.propid = uiProperty;
|
||||||
|
|
||||||
r = IPropertyStorage_ReadMultiple( suminfo->propstg, 1, &spec, &var);
|
r = IPropertyStorage_ReadMultiple( suminfo->propstg, 1, &spec, &var);
|
||||||
if( FAILED(r) )
|
if( FAILED(r) )
|
||||||
|
@ -193,18 +193,18 @@ UINT WINAPI MsiSummaryInfoGetPropertyA(
|
||||||
{
|
{
|
||||||
case VT_I4:
|
case VT_I4:
|
||||||
if( piValue )
|
if( piValue )
|
||||||
*piValue = var.DUMMYUNIONNAME.lVal;
|
*piValue = var.u.lVal;
|
||||||
break;
|
break;
|
||||||
case VT_LPSTR:
|
case VT_LPSTR:
|
||||||
if( pcchValueBuf && szValueBuf )
|
if( pcchValueBuf && szValueBuf )
|
||||||
{
|
{
|
||||||
lstrcpynA(szValueBuf, var.DUMMYUNIONNAME.pszVal, *pcchValueBuf );
|
lstrcpynA(szValueBuf, var.u.pszVal, *pcchValueBuf );
|
||||||
*pcchValueBuf = lstrlenA( var.DUMMYUNIONNAME.pszVal );
|
*pcchValueBuf = lstrlenA( var.u.pszVal );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case VT_FILETIME:
|
case VT_FILETIME:
|
||||||
if( pftValue )
|
if( pftValue )
|
||||||
memcpy(pftValue, &var.DUMMYUNIONNAME.filetime, sizeof (FILETIME) );
|
memcpy(pftValue, &var.u.filetime, sizeof (FILETIME) );
|
||||||
break;
|
break;
|
||||||
case VT_EMPTY:
|
case VT_EMPTY:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -202,7 +202,7 @@ static HTREEITEM InsertTreeViewItem(IShellFolder * lpsf, LPCITEMIDLIST pidl, LPC
|
||||||
lptvid->pEnumIL = pEnumIL;
|
lptvid->pEnumIL = pEnumIL;
|
||||||
GetNormalAndSelectedIcons(lptvid->lpifq, &tvi);
|
GetNormalAndSelectedIcons(lptvid->lpifq, &tvi);
|
||||||
|
|
||||||
tvins.DUMMYUNIONNAME.item = tvi;
|
tvins.u.item = tvi;
|
||||||
tvins.hInsertAfter = NULL;
|
tvins.hInsertAfter = NULL;
|
||||||
tvins.hParent = hParent;
|
tvins.hParent = hParent;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue