Robert Shearman : ole32:
When comparing monikers use the abData field of MInterfacePointer
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Aug 9 16:18:45 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 8f513e35769a54aa3379e55f827a1fb3ebdc4bf3
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f513e35769a54aa3379e55f827a1fb3ebdc4bf3
Author: Robert Shearman <rob at codeweavers.com>
Date: Wed Aug 9 18:15:46 2006 +0100
ole32: When comparing monikers use the abData field of MInterfacePointer
as ulCntData doesn't include the size of its own field.
---
dlls/ole32/moniker.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 0498b7f..327038b 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -448,7 +448,7 @@ RunningObjectTableImpl_IsRunning( IRunni
LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
{
if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) &&
- !memcmp(moniker_data, rot_entry->moniker_data, moniker_data->ulCntData))
+ !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData))
{
hr = S_OK;
break;
@@ -494,7 +494,7 @@ RunningObjectTableImpl_GetObject( IRunni
LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
{
if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) &&
- !memcmp(moniker_data, rot_entry->moniker_data, 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);
@@ -585,7 +585,7 @@ RunningObjectTableImpl_GetTimeOfLastChan
LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
{
if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) &&
- !memcmp(moniker_data, rot_entry->moniker_data, moniker_data->ulCntData))
+ !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData))
{
*pfiletime = rot_entry->last_modified;
hr = S_OK;
More information about the wine-cvs
mailing list