ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: When comparing monikers use the abData field of MInterfacePointer 

as ulCntData doesn't include the size of its own field.
This commit is contained in:
Robert Shearman 2006-08-09 18:15:46 +01:00 committed by Alexandre Julliard
parent f589ec8081
commit 8f513e3576
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/ole32/moniker.c
View File

@ -448,7 +448,7 @@ RunningObjectTableImpl_IsRunning( IRunningObjectTable* iface, IMoniker *pmkObjec
LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
{ {
if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && 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; hr = S_OK;
break; break;
@ -494,7 +494,7 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface,
LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
{ {
if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && 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; IStream *pStream;
hr = create_stream_on_mip_ro(rot_entry->object, &pStream); hr = create_stream_on_mip_ro(rot_entry->object, &pStream);
@ -585,7 +585,7 @@ RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* iface,
LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
{ {
if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && 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; *pfiletime = rot_entry->last_modified;
hr = S_OK; hr = S_OK;