Module: wine Branch: master Commit: 749184a1e8a0edb9d9e4bf15aa8bffabd6c56816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749184a1e8a0edb9d9e4bf15aa...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Fri Jul 11 10:41:44 2008 +0100
ole32: Remove unneeded address-of operators from array names.
---
dlls/ole32/moniker.c | 10 +++++----- dlls/ole32/rpc.c | 2 +- dlls/ole32/stg_prop.c | 2 +- dlls/ole32/storage32.c | 4 ++-- dlls/ole32/stubmanager.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 65e0091..4e56462 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -464,7 +464,7 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, const void *pv = GlobalLock(hglobal); rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); rot_entry->object->ulCntData = size; - memcpy(&rot_entry->object->abData, pv, size); + memcpy(rot_entry->object->abData, pv, size); GlobalUnlock(hglobal); } } @@ -530,7 +530,7 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, const void *pv = GlobalLock(hglobal); moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[size])); moniker->ulCntData = size; - memcpy(&moniker->abData, pv, size); + memcpy(moniker->abData, pv, size); GlobalUnlock(hglobal); } } @@ -642,7 +642,7 @@ RunningObjectTableImpl_IsRunning( IRunningObjectTable* iface, IMoniker *pmkObjec LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, const struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) { hr = S_OK; break; @@ -714,7 +714,7 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) { IStream *pStream; hr = create_stream_on_mip_ro(rot_entry->object, &pStream); @@ -860,7 +860,7 @@ RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* iface, LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, const struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) { *pfiletime = rot_entry->last_modified; hr = S_OK; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index df1c100..b805dba 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1584,7 +1584,7 @@ HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) oxid_info->ipidRemUnknown.Data1 = 0xffffffff; oxid_info->ipidRemUnknown.Data2 = 0xffff; oxid_info->ipidRemUnknown.Data3 = 0xffff; - memcpy(&oxid_info->ipidRemUnknown.Data4, &oxid, sizeof(OXID)); + memcpy(oxid_info->ipidRemUnknown.Data4, &oxid, sizeof(OXID)); oxid_info->psa = NULL /* FIXME */;
return S_OK; diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index d9dafe6..747cf9f 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1717,7 +1717,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, len = var->u.pclipdata->cbSize; StorageUtl_WriteDWord((LPBYTE)&cf_hdr[0], 0, len + 8); StorageUtl_WriteDWord((LPBYTE)&cf_hdr[1], 0, var->u.pclipdata->ulClipFmt); - hr = IStream_Write(This->stm, &cf_hdr, sizeof(cf_hdr), &count); + hr = IStream_Write(This->stm, cf_hdr, sizeof(cf_hdr), &count); if (FAILED(hr)) goto end; hr = IStream_Write(This->stm, &var->u.pclipdata->pClipData, len, &count); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a64e595..7d79a39 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7237,8 +7237,8 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName
/* Initialize the CompObj structure */ memset(&IStorageCompObj, 0, sizeof(IStorageCompObj)); - memcpy(&(IStorageCompObj.byUnknown1), pCompObjUnknown1, sizeof(pCompObjUnknown1)); - memcpy(&(IStorageCompObj.byUnknown2), pCompObjUnknown2, sizeof(pCompObjUnknown2)); + memcpy(IStorageCompObj.byUnknown1, pCompObjUnknown1, sizeof(pCompObjUnknown1)); + memcpy(IStorageCompObj.byUnknown2, pCompObjUnknown2, sizeof(pCompObjUnknown2));
/* Create a CompObj stream if it doesn't exist */ diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 8d7b382..9918fbc 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -84,7 +84,7 @@ struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) sm->oxid_info.ipidRemUnknown.Data2 = 0xffff; sm->oxid_info.ipidRemUnknown.Data3 = 0xffff; assert(sizeof(sm->oxid_info.ipidRemUnknown.Data4) == sizeof(apt->oxid)); - memcpy(&sm->oxid_info.ipidRemUnknown.Data4, &apt->oxid, sizeof(OXID)); + memcpy(sm->oxid_info.ipidRemUnknown.Data4, &apt->oxid, sizeof(OXID)); sm->oxid_info.dwAuthnHint = RPC_C_AUTHN_LEVEL_NONE; sm->oxid_info.psa = NULL /* FIXME */;