Changeset 1655 for trunk/src


Ignore:
Timestamp:
Nov 9, 1999, 11:47:45 AM (26 years ago)
Author:
bird
Message:

Applied fix from David.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ole32/taskmem.cpp

    r872 r1655  
    1 /* $Id: taskmem.cpp,v 1.2 1999-09-08 11:29:28 davidr Exp $ */
    2 /* 
    3  * 
     1/* $Id: taskmem.cpp,v 1.3 1999-11-09 10:47:45 bird Exp $ */
     2/*
     3 *
    44 * Project Odin Software License can be found in LICENSE.TXT
    5  * 
     5 *
    66 */
    7 /* 
     7/*
    88 * COM/OLE memory management functions.
    9  * 
     9 *
    1010 * 7/7/99
    11  * 
     11 *
    1212 * Copyright 1999 David J. Raison
    13  * 
     13 *
    1414 * Some portions from Wine Implementation
    1515 *      Copyright 1997  Marcus Meissner
    … …  
    4444} IMallocImpl;
    4545
    46 static ICOM_VTABLE(IMalloc) VT_IMalloc = 
     46static ICOM_VTABLE(IMalloc) VT_IMalloc =
    4747{
    4848    IMalloc_fnQueryInterface,
    … …  
    115115
    116116    return !(IsBadReadPtr(punk, 4)
    117             || IsBadReadPtr(punk->lpvtbl, 4)
    118             || IsBadReadPtr(punk->lpvtbl->fnQueryInterface, 9)
    119             || IsBadCodePtr((FARPROC)punk->lpvtbl->fnQueryInterface) );
    120 }
    121 
    122 // ======================================================================
    123 // IMalloc implementation 
     117        || IsBadReadPtr(ICOM_VTBL(punk), 4)
     118        || IsBadReadPtr(ICOM_VTBL(punk)->fnQueryInterface, 9)
     119        || IsBadCodePtr((FARPROC)ICOM_VTBL(punk)->fnQueryInterface) );
     120}
     121
     122// ======================================================================
     123// IMalloc implementation
    124124// ======================================================================
    125125
    … …  
    140140// IMalloc_fnQueryInterface
    141141// ----------------------------------------------------------------------
    142 static HRESULT WIN32API IMalloc_fnQueryInterface(LPMALLOC iface, REFIID refiid, LPVOID * obj) 
     142static HRESULT WIN32API IMalloc_fnQueryInterface(LPMALLOC iface, REFIID refiid, LPVOID * obj)
    143143{
    144144    ICOM_THIS(IMallocImpl, iface);
    … …  
    153153        return S_OK;
    154154    }
    155     return OLE_E_ENUM_NOMORE; 
     155    return OLE_E_ENUM_NOMORE;
    156156}
    157157
    … …  
    159159// IMalloc_fnAddRef
    160160// ----------------------------------------------------------------------
    161 static ULONG WIN32API IMalloc_fnAddRef(LPMALLOC iface) 
     161static ULONG WIN32API IMalloc_fnAddRef(LPMALLOC iface)
    162162{
    163163    ICOM_THIS(IMallocImpl, iface);
    … …  
    171171// IMalloc_fnRelease
    172172// ----------------------------------------------------------------------
    173 static ULONG WIN32API IMalloc_fnRelease(LPMALLOC iface) 
     173static ULONG WIN32API IMalloc_fnRelease(LPMALLOC iface)
    174174{
    175175    ICOM_THIS(IMallocImpl, iface);
Note: See TracChangeset for help on using the changeset viewer.