Ignore:
Timestamp:
Jun 9, 2002, 6:37:22 PM (23 years ago)
Author:
sandervl
Message:

Resync with latest Wine

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/ole32/errorinfo.c

    r8441 r8620  
    2020 * NOTES:
    2121 *
    22  * The errorinfo is a per-thread object. The reference is stored in the 
     22 * The errorinfo is a per-thread object. The reference is stored in the
    2323 * TEB at offset 0xf80
    2424 */
     
    4848    WCHAR* stringBuffer;
    4949    DWORD len;
    50    
     50
    5151    if (in == NULL)
    5252        return NULL;
     
    107107{
    108108    DWORD* bufferPointer;
    109    
     109
    110110    /* NULL is a valid parameter */
    111111    if(!in) return;
     
    133133        ICOM_VTABLE(ISupportErrorInfo)  *lpvtsei;
    134134        DWORD                           ref;
    135        
     135
    136136        GUID m_Guid;
    137137        BSTR bstrSource;
     
    148148 converts a objectpointer to This
    149149 */
    150 #define _IErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtei))) 
    151 #define _ICOM_THIS_From_IErrorInfo(class, name) class* This = (class*)(((char*)name)-_IErrorInfo_Offset); 
    152 
    153 #define _ICreateErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtcei))) 
    154 #define _ICOM_THIS_From_ICreateErrorInfo(class, name) class* This = (class*)(((char*)name)-_ICreateErrorInfo_Offset); 
    155 
    156 #define _ISupportErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtsei))) 
    157 #define _ICOM_THIS_From_ISupportErrorInfo(class, name) class* This = (class*)(((char*)name)-_ISupportErrorInfo_Offset); 
     150#define _IErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtei)))
     151#define _ICOM_THIS_From_IErrorInfo(class, name) class* This = (class*)(((char*)name)-_IErrorInfo_Offset);
     152
     153#define _ICreateErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtcei)))
     154#define _ICOM_THIS_From_ICreateErrorInfo(class, name) class* This = (class*)(((char*)name)-_ICreateErrorInfo_Offset);
     155
     156#define _ISupportErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtsei)))
     157#define _ICOM_THIS_From_ISupportErrorInfo(class, name) class* This = (class*)(((char*)name)-_ISupportErrorInfo_Offset);
    158158
    159159/*
     
    194194        if(IsEqualIID(riid, &IID_IErrorInfo))
    195195        {
    196           *ppvoid = _IErrorInfo_(This); 
     196          *ppvoid = _IErrorInfo_(This);
    197197        }
    198198        else if(IsEqualIID(riid, &IID_ICreateErrorInfo))
     
    240240static HRESULT WINAPI IErrorInfoImpl_GetGUID(
    241241        IErrorInfo* iface,
    242         GUID * pGUID) 
     242        GUID * pGUID)
    243243{
    244244        _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
     
    271271            return E_INVALIDARG;
    272272        *pBstrDescription = ERRORINFO_SysAllocString(This->bstrDescription);
    273        
     273
    274274        return S_OK;
    275275}
     
    285285            return E_INVALIDARG;
    286286        *pBstrHelpFile = ERRORINFO_SysAllocString(This->bstrHelpFile);
    287        
     287
    288288        return S_OK;
    289289}
     
    298298            return E_INVALIDARG;
    299299        *pdwHelpContext = This->m_dwHelpContext;
    300        
     300
    301301        return S_OK;
    302302}
     
    308308  IErrorInfoImpl_AddRef,
    309309  IErrorInfoImpl_Release,
    310  
     310
    311311  IErrorInfoImpl_GetGUID,
    312312  IErrorInfoImpl_GetSource,
     
    363363            ERRORINFO_SysFreeString(This->bstrSource);
    364364        This->bstrSource = ERRORINFO_SysAllocString(szSource);
    365        
     365
    366366        return S_OK;
    367367}
     
    376376            ERRORINFO_SysFreeString(This->bstrDescription);
    377377        This->bstrDescription = ERRORINFO_SysAllocString(szDescription);
    378        
     378
    379379        return S_OK;
    380380}
     
    400400        TRACE("(%p)\n",This);
    401401        This->m_dwHelpContext = dwHelpContext;
    402        
     402
    403403        return S_OK;
    404404}
     
    425425        _ICOM_THIS_From_ISupportErrorInfo(ErrorInfoImpl, iface);
    426426        TRACE("(%p)\n", This);
    427        
     427
    428428        return IErrorInfo_QueryInterface(_IErrorInfo_(This), riid, ppvoid);
    429429}
     
    475475        if(! pperrinfo ) return E_INVALIDARG;
    476476        if(!(pei=IErrorInfoImpl_Constructor()))return E_OUTOFMEMORY;
    477        
     477
    478478        res = IErrorInfo_QueryInterface(pei, &IID_ICreateErrorInfo, (LPVOID*)pperrinfo);
    479479        IErrorInfo_Release(pei);
Note: See TracChangeset for help on using the changeset viewer.