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/oleobj.c

    r8441 r8620  
    8787                                         0,
    8888                                         sizeof(OleAdviseHolderImpl));
    89  
     89
    9090  ICOM_VTBL(lpoah) = &oahvt;
    9191  lpoah->ref = 1;
    … …  
    119119    }
    120120  }
    121  
     121
    122122  HeapFree(GetProcessHeap(),
    123123           0,
    124124           ptrToDestroy->arrayOfSinks);
    125  
     125
    126126
    127127  HeapFree(GetProcessHeap(),
    … …  
    135135static HRESULT WINAPI OleAdviseHolderImpl_QueryInterface(
    136136  LPOLEADVISEHOLDER iface,
    137   REFIID            riid, 
     137  REFIID            riid,
    138138  LPVOID*           ppvObj)
    139139{
    140   ICOM_THIS(OleAdviseHolderImpl, iface); 
     140  ICOM_THIS(OleAdviseHolderImpl, iface);
    141141  TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObj);
    142142  /*
    … …  
    148148  *ppvObj = NULL;
    149149
    150   if (IsEqualIID(riid, &IID_IUnknown)) 
     150  if (IsEqualIID(riid, &IID_IUnknown))
    151151  {
    152152    /* IUnknown */
    153     *ppvObj = This; 
    154   }
    155   else if(IsEqualIID(riid, &IID_IOleAdviseHolder)) 
     153    *ppvObj = This;
     154  }
     155  else if(IsEqualIID(riid, &IID_IOleAdviseHolder))
    156156  {
    157157    /* IOleAdviseHolder */
    … …  
    161161  if(*ppvObj == NULL)
    162162    return E_NOINTERFACE;
    163  
     163
    164164  /*
    165165   * A successful QI always increments the reference count.
    … …  
    176176  LPOLEADVISEHOLDER iface)
    177177{
    178   ICOM_THIS(OleAdviseHolderImpl, iface); 
    179   TRACE("(%p)->(ref=%ld)\n", This, This->ref); 
     178  ICOM_THIS(OleAdviseHolderImpl, iface);
     179  TRACE("(%p)->(ref=%ld)\n", This, This->ref);
    180180  return ++(This->ref);
    181181}
    … …  
    187187  LPOLEADVISEHOLDER iface)
    188188{
    189   ICOM_THIS(OleAdviseHolderImpl, iface); 
    190   TRACE("(%p)->(ref=%ld)\n", This, This->ref); 
     189  ICOM_THIS(OleAdviseHolderImpl, iface);
     190  TRACE("(%p)->(ref=%ld)\n", This, This->ref);
    191191  This->ref--;
    192192
    … …  
    210210{
    211211  DWORD index;
    212  
    213   ICOM_THIS(OleAdviseHolderImpl, iface); 
     212
     213  ICOM_THIS(OleAdviseHolderImpl, iface);
    214214
    215215  TRACE("(%p)->(%p, %p)\n", This, pAdvise, pdwConnection);
    … …  
    220220  if (pdwConnection==NULL)
    221221    return E_POINTER;
    222  
     222
    223223  *pdwConnection = 0;
    224224
    … …  
    241241    This->maxSinks+=INITIAL_SINKS;
    242242
    243     This->arrayOfSinks = HeapReAlloc(GetProcessHeap(), 
     243    This->arrayOfSinks = HeapReAlloc(GetProcessHeap(),
    244244                                     0,
    245245                                     This->arrayOfSinks,
    … …  
    247247
    248248    for (i=index;i < This->maxSinks; i++)
    249       This->arrayOfSinks[i]=0;     
     249      This->arrayOfSinks[i]=0;
    250250  }
    251251
    … …  
    272272 */
    273273static HRESULT WINAPI OleAdviseHolderImpl_Unadvise(
    274   LPOLEADVISEHOLDER iface, 
     274  LPOLEADVISEHOLDER iface,
    275275  DWORD             dwConnection)
    276276{
    277   ICOM_THIS(OleAdviseHolderImpl, iface); 
     277  ICOM_THIS(OleAdviseHolderImpl, iface);
    278278
    279279  TRACE("(%p)->(%lu)\n", This, dwConnection);
    280280
    281281  /*
    282    * So we don't return 0 as a cookie, the index was 
     282   * So we don't return 0 as a cookie, the index was
    283283   * incremented by 1 in OleAdviseHolderImpl_Advise
    284284   * we have to compensate.
    285285   */
    286286  dwConnection--;
    287  
     287
    288288  /*
    289289   * Check for invalid cookies.
    290290   */
    291   if ( (dwConnection < 0) || 
     291  if ( (dwConnection < 0) ||
    292292       (dwConnection >= This->maxSinks) )
    293293    return OLE_E_NOCONNECTION;
    … …  
    311311OleAdviseHolderImpl_EnumAdvise (LPOLEADVISEHOLDER iface, IEnumSTATDATA **ppenumAdvise)
    312312{
    313     ICOM_THIS(OleAdviseHolderImpl, iface); 
     313    ICOM_THIS(OleAdviseHolderImpl, iface);
    314314    FIXME("(%p)->(%p)\n", This, ppenumAdvise);
    315315
    … …  
    325325OleAdviseHolderImpl_SendOnRename (LPOLEADVISEHOLDER iface, IMoniker *pmk)
    326326{
    327     ICOM_THIS(OleAdviseHolderImpl, iface); 
     327    ICOM_THIS(OleAdviseHolderImpl, iface);
    328328    FIXME("(%p)->(%p)\n", This, pmk);
    329329
    … …  
    338338OleAdviseHolderImpl_SendOnSave (LPOLEADVISEHOLDER iface)
    339339{
    340     ICOM_THIS(OleAdviseHolderImpl, iface); 
     340    ICOM_THIS(OleAdviseHolderImpl, iface);
    341341    FIXME("(%p)\n", This);
    342342
    … …  
    350350OleAdviseHolderImpl_SendOnClose (LPOLEADVISEHOLDER iface)
    351351{
    352     ICOM_THIS(OleAdviseHolderImpl, iface); 
     352    ICOM_THIS(OleAdviseHolderImpl, iface);
    353353    FIXME("(%p)\n", This);
    354354
    … …  
    364364  FORMATETC fmat;
    365365  DWORD advf;
    366 } DataAdviseConnection; 
     366} DataAdviseConnection;
    367367
    368368typedef struct DataAdviseHolder
    … …  
    384384                            REFIID                  riid,
    385385                            void**                  ppvObject);
    386 static ULONG WINAPI       DataAdviseHolder_AddRef( 
     386static ULONG WINAPI       DataAdviseHolder_AddRef(
    387387                            IDataAdviseHolder*      iface);
    388 static ULONG WINAPI       DataAdviseHolder_Release( 
     388static ULONG WINAPI       DataAdviseHolder_Release(
    389389                            IDataAdviseHolder*      iface);
    390 static HRESULT WINAPI     DataAdviseHolder_Advise( 
     390static HRESULT WINAPI     DataAdviseHolder_Advise(
    391391                            IDataAdviseHolder*      iface,
    392                             IDataObject*            pDataObject, 
    393                             FORMATETC*              pFetc, 
    394                             DWORD                   advf, 
    395                             IAdviseSink*            pAdvise, 
     392                            IDataObject*            pDataObject,
     393                            FORMATETC*              pFetc,
     394                            DWORD                   advf,
     395                            IAdviseSink*            pAdvise,
    396396                            DWORD*                  pdwConnection);
    397 static HRESULT WINAPI     DataAdviseHolder_Unadvise( 
     397static HRESULT WINAPI     DataAdviseHolder_Unadvise(
    398398                            IDataAdviseHolder*      iface,
    399399                            DWORD                   dwConnection);
    400 static HRESULT WINAPI     DataAdviseHolder_EnumAdvise( 
    401                             IDataAdviseHolder*      iface,       
     400static HRESULT WINAPI     DataAdviseHolder_EnumAdvise(
     401                            IDataAdviseHolder*      iface,
    402402                            IEnumSTATDATA**         ppenumAdvise);
    403 static HRESULT WINAPI     DataAdviseHolder_SendOnDataChange( 
    404                             IDataAdviseHolder*      iface, 
    405                             IDataObject*            pDataObject, 
    406                             DWORD                   dwReserved, 
     403static HRESULT WINAPI     DataAdviseHolder_SendOnDataChange(
     404                            IDataAdviseHolder*      iface,
     405                            IDataObject*            pDataObject,
     406                            DWORD                   dwReserved,
    407407                            DWORD                   advf);
    408408
    … …  
    432432                                           0,
    433433                                           sizeof(DataAdviseHolder));
    434  
     434
    435435  ICOM_VTBL(newHolder) = &DataAdviseHolderImpl_VTable;
    436436  newHolder->ref = 1;
    … …  
    438438  newHolder->Connections = HeapAlloc(GetProcessHeap(),
    439439                                     HEAP_ZERO_MEMORY,
    440                                      newHolder->maxCons * 
     440                                     newHolder->maxCons *
    441441                                     sizeof(DataAdviseConnection));
    442442
    … …  
    461461    }
    462462  }
    463  
     463
    464464  HeapFree(GetProcessHeap(), 0, ptrToDestroy->Connections);
    465465  HeapFree(GetProcessHeap(), 0, ptrToDestroy);
    … …  
    476476  void**                  ppvObject)
    477477{
    478   ICOM_THIS(DataAdviseHolder, iface); 
     478  ICOM_THIS(DataAdviseHolder, iface);
    479479  TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject);
    480480  /*
    … …  
    483483  if ( (This==0) || (ppvObject==0) )
    484484    return E_INVALIDARG;
    485  
     485
    486486  /*
    487487   * Initialize the return parameter.
    … …  
    497497    *ppvObject = iface;
    498498  }
    499  
     499
    500500  /*
    501501   * Check that we obtained an interface.
    … …  
    505505    return E_NOINTERFACE;
    506506  }
    507  
     507
    508508  /*
    509509   * Query Interface always increases the reference count by one when it is
    510    * successful. 
     510   * successful.
    511511   */
    512512  IUnknown_AddRef((IUnknown*)*ppvObject);
    513513
    514   return S_OK;; 
     514  return S_OK;
    515515}
    516516
    … …  
    520520 * See Windows documentation for more details on IUnknown methods.
    521521 */
    522 static ULONG WINAPI       DataAdviseHolder_AddRef(                             
     522static ULONG WINAPI       DataAdviseHolder_AddRef(
    523523  IDataAdviseHolder*      iface)
    524524{
    525   ICOM_THIS(DataAdviseHolder, iface); 
     525  ICOM_THIS(DataAdviseHolder, iface);
    526526  TRACE("(%p) (ref=%ld)\n", This, This->ref);
    527527  This->ref++;
    … …  
    535535 * See Windows documentation for more details on IUnknown methods.
    536536 */
    537 static ULONG WINAPI DataAdviseHolder_Release( 
     537static ULONG WINAPI DataAdviseHolder_Release(
    538538  IDataAdviseHolder*      iface)
    539539{
    … …  
    555555    return 0;
    556556  }
    557  
     557
    558558  return This->ref;
    559559}
    … …  
    565565static HRESULT WINAPI DataAdviseHolder_Advise(
    566566  IDataAdviseHolder*      iface,
    567   IDataObject*            pDataObject, 
    568   FORMATETC*              pFetc, 
    569   DWORD                   advf, 
    570   IAdviseSink*            pAdvise, 
     567  IDataObject*            pDataObject,
     568  FORMATETC*              pFetc,
     569  DWORD                   advf,
     570  IAdviseSink*            pAdvise,
    571571  DWORD*                  pdwConnection)
    572572{
    573573  DWORD index;
    574  
    575   ICOM_THIS(DataAdviseHolder, iface); 
     574
     575  ICOM_THIS(DataAdviseHolder, iface);
    576576
    577577  TRACE("(%p)->(%p, %p, %08lx, %p, %p)\n", This, pDataObject, pFetc, advf,
    … …  
    582582  if (pdwConnection==NULL)
    583583    return E_POINTER;
    584  
     584
    585585  *pdwConnection = 0;
    586586
    … …  
    630630 * DataAdviseHolder_Unadvise
    631631 */
    632 static HRESULT WINAPI     DataAdviseHolder_Unadvise( 
     632static HRESULT WINAPI     DataAdviseHolder_Unadvise(
    633633  IDataAdviseHolder*      iface,
    634634  DWORD                   dwConnection)
    635635{
    636   ICOM_THIS(DataAdviseHolder, iface); 
     636  ICOM_THIS(DataAdviseHolder, iface);
    637637
    638638  TRACE("(%p)->(%lu)\n", This, dwConnection);
    639639
    640640  /*
    641    * So we don't return 0 as a cookie, the index was 
     641   * So we don't return 0 as a cookie, the index was
    642642   * incremented by 1 in OleAdviseHolderImpl_Advise
    643643   * we have to compensate.
    644644   */
    645645  dwConnection--;
    646  
     646
    647647  /*
    648648   * Check for invalid cookies.
    649649   */
    650   if ( (dwConnection < 0) || 
     650  if ( (dwConnection < 0) ||
    651651       (dwConnection >= This->maxCons) )
    652652    return OLE_E_NOCONNECTION;
    … …  
    663663}
    664664
    665 static HRESULT WINAPI     DataAdviseHolder_EnumAdvise( 
    666   IDataAdviseHolder*      iface,       
     665static HRESULT WINAPI     DataAdviseHolder_EnumAdvise(
     666  IDataAdviseHolder*      iface,
    667667  IEnumSTATDATA**         ppenumAdvise)
    668668{
    669   ICOM_THIS(DataAdviseHolder, iface); 
     669  ICOM_THIS(DataAdviseHolder, iface);
    670670
    671671  FIXME("(%p)->(%p)\n", This, ppenumAdvise);
    … …  
    676676 * DataAdviseHolder_SendOnDataChange
    677677 */
    678 static HRESULT WINAPI     DataAdviseHolder_SendOnDataChange( 
    679   IDataAdviseHolder*      iface, 
    680   IDataObject*            pDataObject, 
    681   DWORD                   dwReserved, 
     678static HRESULT WINAPI     DataAdviseHolder_SendOnDataChange(
     679  IDataAdviseHolder*      iface,
     680  IDataObject*            pDataObject,
     681  DWORD                   dwReserved,
    682682  DWORD                   advf)
    683683{
    684   ICOM_THIS(DataAdviseHolder, iface); 
     684  ICOM_THIS(DataAdviseHolder, iface);
    685685  DWORD index;
    686686  STGMEDIUM stg;
Note: See TracChangeset for help on using the changeset viewer.